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
bf00aab5
Commit
bf00aab5
authored
Jun 01, 2023
by
jianshuqin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
--story=1010443 --user=简曙勤 【费用系统】调整主体嗜嗜煲的审核流程
https://www.tapd.cn/55346466/s/1013186
parent
76f3549c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
5 deletions
+15
-5
DepartmentCheckState.java
...ule/cost/service/impl/costcheck/DepartmentCheckState.java
+10
-0
GeneralManagerCheckState.java
...cost/service/impl/costcheck/GeneralManagerCheckState.java
+5
-5
No files found.
cost-service/src/main/java/com/blt/other/module/cost/service/impl/costcheck/DepartmentCheckState.java
View file @
bf00aab5
...
...
@@ -254,6 +254,16 @@ public class DepartmentCheckState extends CostState {
.
eq
(
CostReviewer:
:
getReferId
,
departmentReviewer
.
getId
())
.
eq
(
CostReviewer:
:
getType
,
CostReviewer
.
departmentReviewer
));
//嗜嗜煲的主体,遇到铭哥审批就换鹏哥 2023-06-01
if
(
"嗜嗜煲"
.
equals
(
costDomain
.
getCompanyName
()))
{
for
(
CostReviewer
costReviewer:
costReviewerList
)
{
if
(
costReviewer
.
getReviewerUserId
()
==
681
)
{
costReviewer
.
setReviewerUserId
(
720
);
costReviewer
.
setReviewerUserName
(
"赵鹏"
);
}
}
}
String
departmentReviewerNames
=
costReviewerList
.
stream
().
map
(
CostReviewer:
:
getReviewerUserName
).
collect
(
Collectors
.
joining
(
","
));
log
.
info
(
"更新当前审核人为部门审核人:{}"
,
departmentReviewerNames
);
...
...
cost-service/src/main/java/com/blt/other/module/cost/service/impl/costcheck/GeneralManagerCheckState.java
View file @
bf00aab5
...
...
@@ -82,8 +82,8 @@ public class GeneralManagerCheckState extends CostState {
}
if
(
currentUserId
!=
null
)
{
//目前限定铭哥能审核
if
(
currentUserId
==
681
||
currentUserId
==
2346
)
{
//目前限定铭哥能审核
或者主体是嗜嗜煲鹏哥能审核
if
(
currentUserId
==
681
||
(
"嗜嗜煲"
.
equals
(
costDomain
.
getCompanyName
())
&&
currentUserId
==
720
)
)
{
//大于等于5需要铭哥审批
if
(
costDomain
.
getAmountRmb
().
compareTo
(
new
BigDecimal
(
"5000"
))
>=
0
)
{
costDomain
.
setCostStatus
(
CostDomain
.
STATUS_FINANCIAL_CHECK
);
...
...
@@ -121,7 +121,7 @@ public class GeneralManagerCheckState extends CostState {
}
//人工审核拒绝
if
(
currentUserId
==
681
||
currentUserId
==
2346
)
{
if
(
currentUserId
==
681
||
currentUserId
==
4828
||
(
"嗜嗜煲"
.
equals
(
costDomain
.
getCompanyName
())
&&
currentUserId
==
720
)
)
{
ApprovalHistoryDomain
approvalHistoryDomain
=
ApprovalHistoryDomain
.
builder
()
.
approvalUserId
(
currentUserId
)
.
approvalTime
(
LocalDateTime
.
now
())
...
...
@@ -141,8 +141,8 @@ public class GeneralManagerCheckState extends CostState {
public
void
updateCurrentReviewer
()
{
CostDomain
costDomain
=
costContext
.
costDomain
;
//只查铭哥的ID
OaUser
user
=
oaUserMapper
.
selectByOaUserId
(
681
);
//只查铭哥的ID
,嗜嗜煲的主体,遇到铭哥审批就换鹏哥 2023-06-01
OaUser
user
=
oaUserMapper
.
selectByOaUserId
(
(
"嗜嗜煲"
.
equals
(
costDomain
.
getCompanyName
()))
?
720
:
681
);
List
<
CostReviewer
>
costReviewerList
=
new
ArrayList
<>();
costReviewerList
.
add
(
CostReviewer
.
builder
()
...
...
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