Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
dc-cost-system
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bltdc
dc-cost-system
Commits
dd9d1615
Commit
dd9d1615
authored
Nov 19, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hr check
parent
597c3f71
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
2 deletions
+4
-2
CostController.java
...blt/other/module/cost/controller/cost/CostController.java
+1
-1
AbstractCostService.java
...er/module/cost/service/impl/cost/AbstractCostService.java
+2
-0
HrCheckState.java
...ther/module/cost/service/impl/costcheck/HrCheckState.java
+1
-1
No files found.
bailuntec-cost-core/src/main/java/com/blt/other/module/cost/controller/cost/CostController.java
View file @
dd9d1615
...
...
@@ -311,7 +311,7 @@ public class CostController {
}
@GetMapping
(
"/check/hrCheckRefuse"
)
@ApiOperation
(
"
最终审核人
驳回"
)
@ApiOperation
(
"
行政审核
驳回"
)
public
CostResult
<
Void
>
hrCheckRefuse
(
@RequestParam
String
costNo
,
@RequestParam
Integer
userid
,
@RequestParam
String
rejectReason
)
{
...
...
bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/impl/cost/AbstractCostService.java
View file @
dd9d1615
...
...
@@ -125,6 +125,8 @@ public abstract class AbstractCostService implements CostService {
costDomain
.
setCanAudit
(
costReviewerMapper
.
queryOne
(
costCompany
.
getId
(),
CostReviewer
.
financialReviewer
,
currentUserId
)
!=
null
);
}
else
if
(
costDomain
.
getCostStatus
().
equals
(
CostDomain
.
STATUS_FINAL_CHECK
))
{
costDomain
.
setCanAudit
(
costReviewerMapper
.
queryOne
(
costCompany
.
getId
(),
CostReviewer
.
finalReviewer
,
currentUserId
)
!=
null
);
}
else
if
(
costDomain
.
getCostStatus
().
equals
(
CostDomain
.
STATUS_HR_CHECK
))
{
costDomain
.
setCanAudit
(
costReviewerMapper
.
queryOne
(
costCompany
.
getId
(),
CostReviewer
.
hrReviewer
,
currentUserId
)
!=
null
);
}
else
{
costDomain
.
setCanAudit
(
false
);
}
...
...
bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/impl/costcheck/HrCheckState.java
View file @
dd9d1615
...
...
@@ -47,7 +47,7 @@ public class HrCheckState extends CostState {
}
//如果不需要审核 直接通过
if
(!
costTemplate
.
shouldHrCheck
(
costDomain
)
{
if
(!
costTemplate
.
shouldHrCheck
(
costDomain
)
)
{
costDomain
.
setCostStatus
(
CostDomain
.
STATUS_FINANCIAL_CHECK
);
costDao
.
updateById
(
costDomain
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment