Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
bailuntec-cost
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
huluobin
bailuntec-cost
Commits
ec36f072
Commit
ec36f072
authored
Jan 23, 2021
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
# update
parent
1208b568
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
15 deletions
+8
-15
CostLogServiceImpl.java
...lt/other/module/cost/service/impl/CostLogServiceImpl.java
+0
-6
DepartmentCheckState.java
...ule/cost/service/impl/costcheck/DepartmentCheckState.java
+1
-1
FinalCheckState.java
...r/module/cost/service/impl/costcheck/FinalCheckState.java
+1
-1
FinancialCheckState.java
...dule/cost/service/impl/costcheck/FinancialCheckState.java
+1
-1
HrCheckState.java
...ther/module/cost/service/impl/costcheck/HrCheckState.java
+5
-6
No files found.
cost-service/src/main/java/com/blt/other/module/cost/service/impl/CostLogServiceImpl.java
View file @
ec36f072
...
...
@@ -7,8 +7,6 @@ import com.blt.other.module.auth.dao.OaUserMapper;
import
com.blt.other.module.auth.dao.UserDao
;
import
com.blt.other.module.auth.model.OaUser
;
import
com.blt.other.module.cost.dao.CostCompanyDao
;
import
com.blt.other.module.cost.dao.CostCurrentReviewerMapper
;
import
com.blt.other.module.cost.dao.CostDao
;
import
com.blt.other.module.cost.dao.CostLogDao
;
import
com.blt.other.module.cost.model.CostDomain
;
import
com.blt.other.module.cost.service.CostLogService
;
...
...
@@ -62,10 +60,6 @@ public class CostLogServiceImpl implements CostLogService {
@Resource
OaUserMapper
oaUserMapper
;
@Resource
CostDao
costDao
;
@Resource
CostCurrentReviewerMapper
costCurrentReviewerMapper
;
@Resource
CostCompanyDao
costCompanyDao
;
@Resource
CostService
costService
;
...
...
cost-service/src/main/java/com/blt/other/module/cost/service/impl/costcheck/DepartmentCheckState.java
View file @
ec36f072
...
...
@@ -224,6 +224,6 @@ public class DepartmentCheckState extends CostState {
log
.
info
(
"更新当前审核人为部门审核人:{}"
,
departmentReviewerNames
);
costCurrentReviewerService
.
updateByCostNoAndReviewer
(
costDomain
.
getCostNo
(),
costReviewerList
);
costLogService
.
save
(
costDomain
.
getCostNo
(),
costContext
.
currentUserId
,
"部门审核人:"
+
departmentReviewerNames
);
//
costLogService.save(costDomain.getCostNo(), costContext.currentUserId, "部门审核人:" + departmentReviewerNames);
}
}
cost-service/src/main/java/com/blt/other/module/cost/service/impl/costcheck/FinalCheckState.java
View file @
ec36f072
...
...
@@ -147,7 +147,7 @@ public class FinalCheckState extends CostState {
.
eq
(
CostReviewer:
:
getType
,
CostReviewer
.
finalReviewer
));
costCurrentReviewerService
.
updateByCostNoAndReviewer
(
costDomain
.
getCostNo
(),
costReviewerList
);
costLogService
.
save
(
costDomain
.
getCostNo
(),
costContext
.
currentUserId
,
"最终审核人:"
+
costReviewerList
.
stream
().
map
(
CostReviewer:
:
getReviewerUserName
).
collect
(
Collectors
.
joining
(
","
)));
//
costLogService.save(costDomain.getCostNo(), costContext.currentUserId, "最终审核人:" + costReviewerList.stream().map(CostReviewer::getReviewerUserName).collect(Collectors.joining(",")));
}
}
cost-service/src/main/java/com/blt/other/module/cost/service/impl/costcheck/FinancialCheckState.java
View file @
ec36f072
...
...
@@ -123,7 +123,7 @@ public class FinancialCheckState extends CostState {
.
eq
(
CostReviewer:
:
getType
,
CostReviewer
.
financialReviewer
));
costCurrentReviewerService
.
updateByCostNoAndReviewer
(
costDomain
.
getCostNo
(),
costReviewerList
);
costLogService
.
save
(
costDomain
.
getCostNo
(),
costContext
.
currentUserId
,
"财务审核人:"
+
costReviewerList
.
stream
().
map
(
CostReviewer:
:
getReviewerUserName
).
collect
(
Collectors
.
joining
(
","
)));
//
costLogService.save(costDomain.getCostNo(), costContext.currentUserId, "财务审核人:" + costReviewerList.stream().map(CostReviewer::getReviewerUserName).collect(Collectors.joining(",")));
}
...
...
cost-service/src/main/java/com/blt/other/module/cost/service/impl/costcheck/HrCheckState.java
View file @
ec36f072
...
...
@@ -2,22 +2,21 @@ package com.blt.other.module.cost.service.impl.costcheck;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.blt.other.common.exception.BizRuntimeException
;
import
com.blt.other.database.model.CostCompanyDomain
;
import
com.blt.other.database.model.CostLogDomain
;
import
com.blt.other.module.auth.dao.OaDepartmentMapper
;
import
com.blt.other.module.auth.dao.OaUserMapper
;
import
com.blt.other.module.sys.model.CostReviewer
;
import
com.blt.other.module.auth.model.OaUser
;
import
com.blt.other.module.cost.dao.CostCompanyDao
;
import
com.blt.other.module.cost.model.CostDomain
;
import
com.blt.other.module.cost.model.CostTemplate
;
import
com.blt.other.database.model.CostCompanyDomain
;
import
com.blt.other.database.model.CostLogDomain
;
import
com.blt.other.module.sys.model.CostReviewer
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
import
javax.annotation.Resource
;
import
java.time.LocalDateTime
;
import
java.util.List
;
import
java.util.stream.Collectors
;
/**
* <p>
...
...
@@ -124,8 +123,8 @@ public class HrCheckState extends CostState {
.
eq
(
CostReviewer:
:
getReferId
,
costCompanyDomain
.
getId
())
.
eq
(
CostReviewer:
:
getType
,
CostReviewer
.
hrReviewer
));
costCurrentReviewerService
.
updateByCostNoAndReviewer
(
costDomain
.
getCostNo
(),
costReviewerList
);
costLogService
.
save
(
costDomain
.
getCostNo
(),
costContext
.
currentUserId
,
"行政审核人:"
+
costReviewerList
.
stream
().
map
(
CostReviewer:
:
getReviewerUserName
).
collect
(
Collectors
.
joining
(
","
)));
costCurrentReviewerService
.
updateByCostNoAndReviewer
(
costDomain
.
getCostNo
(),
costReviewerList
);
//
costLogService.save(costDomain.getCostNo(), costContext.currentUserId, "行政审核人:" + costReviewerList.stream().map(CostReviewer::getReviewerUserName).collect(Collectors.joining(",")));
}
...
...
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