Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
8timerv2
8timerapiv200
Commits
a161fa0b
Commit
a161fa0b
authored
2 years ago
by
翁国栋
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
并序审核bug
parent
f32793c3
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
7 deletions
+12
-7
src/main/java/cn/timer/api/utils/router/RouterUtils.java
+12
-7
No files found.
src/main/java/cn/timer/api/utils/router/RouterUtils.java
View file @
a161fa0b
...
@@ -1001,7 +1001,7 @@ public class RouterUtils {
...
@@ -1001,7 +1001,7 @@ public class RouterUtils {
//执行中
//执行中
}
else
if
(
EXECUTING
.
equals
(
listUser
.
get
(
i_user
).
getExecute
()))
{
}
else
if
(
EXECUTING
.
equals
(
listUser
.
get
(
i_user
).
getExecute
()))
{
//判断当前节点审批人id 等于 操作用户id 则更新执行人信息:审批意见、状态(0未执行 1执行中 2同意 3拒接 4转派)
//判断当前节点审批人id 等于 操作用户id 则更新执行人信息:审批意见、状态(0未执行 1执行中 2同意 3拒接 4转派)
if
((
Integer
.
parseInt
(
redeployUser
.
getId
())
==
Integer
.
parseInt
(
listUser
.
get
(
i_user
).
getId
())
&&
num
==
0
)
||
(!
isExist
&&
num
==
0
)
){
if
((
Integer
.
parseInt
(
redeployUser
.
getId
())
==
Integer
.
parseInt
(
listUser
.
get
(
i_user
).
getId
())
&&
num
==
0
)){
num
++;
num
++;
SpmkExecutor
.
builder
()
SpmkExecutor
.
builder
()
.
id
(
executorId
)
.
id
(
executorId
)
...
@@ -1024,6 +1024,9 @@ public class RouterUtils {
...
@@ -1024,6 +1024,9 @@ public class RouterUtils {
//拒绝处理
//拒绝处理
// 0未执行 1执行中 2同意 3拒绝 4 转派
// 0未执行 1执行中 2同意 3拒绝 4 转派
if
(
sts
==
ExecutorSts
.
AGREE
.
ordinal
()){
}
if
(
sts
==
ExecutorSts
.
REFUSE
.
ordinal
())
{
if
(
sts
==
ExecutorSts
.
REFUSE
.
ordinal
())
{
// 更新 审批汇总 状态
// 更新 审批汇总 状态
SpmkApproveSummary
.
builder
().
id
(
asId
).
currentApprover
(
CommonEnum
.
NULL_STR
.
getDesc
()).
endTime
(
new
Date
()).
sts
(
sts
).
build
().
updateById
();
SpmkApproveSummary
.
builder
().
id
(
asId
).
currentApprover
(
CommonEnum
.
NULL_STR
.
getDesc
()).
endTime
(
new
Date
()).
sts
(
sts
).
build
().
updateById
();
...
@@ -1038,16 +1041,17 @@ public class RouterUtils {
...
@@ -1038,16 +1041,17 @@ public class RouterUtils {
return
;
return
;
//转派 处理
//转派 处理
//在 原审批人 列表中 插入 一个或多个被转派人(审批人)
//在 原审批人 列表中 插入 一个或多个被转派人(审批人)
}
else
if
(
sts
==
ExecutorSts
.
REDEPLOY
.
ordinal
())
{
}
List
<
User
>
users1
=
CollectionUtil
.
sub
(
listUser
,
0
,
i_user
+
1
);
else
if
(
sts
==
ExecutorSts
.
REDEPLOY
.
ordinal
())
{
List
<
User
>
users1
=
CollectionUtil
.
sub
(
listUser
,
userIndex
,
userIndex
+
1
);
//新增转派多个人功能
//新增转派多个人功能
//判断是走派多个人的 否则走旧逻辑
//判断是走派多个人的 否则走旧逻辑
if
(!
CollectionUtils
.
isEmpty
(
redeployUserList
)){
if
(!
CollectionUtils
.
isEmpty
(
redeployUserList
)){
//List<User> users1 = CollectionUtil.sub(listUser, 0, i_user+1); 第一次修改
//List<User> users1 = CollectionUtil.sub(listUser, 0, i_user+1); 第一次修改
//redeployUserList.add(users1.get(users1.size() - 1)); 第二次修改
//redeployUserList.add(users1.get(users1.size() - 1)); 第二次修改
flowChildren
.
getRelation
().
get
(
0
).
setName
(
users1
.
get
(
users1
.
size
()
-
1
).
getName
());
flowChildren
.
getRelation
().
get
(
0
).
setName
(
users1
.
get
(
0
).
getName
());
flowChildren
.
getRelation
().
get
(
0
).
getUsers
().
get
(
0
).
setName
(
users1
.
get
(
users1
.
size
()
-
1
).
getName
());
flowChildren
.
getRelation
().
get
(
0
).
getUsers
().
get
(
0
).
setName
(
users1
.
get
(
0
).
getName
());
flowChildren
.
getRelation
().
get
(
0
).
getUsers
().
get
(
0
).
setId
(
users1
.
get
(
users1
.
size
()
-
1
).
getId
());
flowChildren
.
getRelation
().
get
(
0
).
getUsers
().
get
(
0
).
setId
(
users1
.
get
(
0
).
getId
());
redeployIndex
=
i
;
redeployIndex
=
i
;
for
(
User
ruser:
redeployUserList
for
(
User
ruser:
redeployUserList
)
{
)
{
...
@@ -1092,7 +1096,8 @@ public class RouterUtils {
...
@@ -1092,7 +1096,8 @@ public class RouterUtils {
//break outloop;
//break outloop;
}
}
//未执行
//未执行
}
else
if
(
UNEXECUTED
.
equals
(
listUser
.
get
(
i_user
).
getExecute
()))
{
}
else
if
(
UNEXECUTED
.
equals
(
listUser
.
get
(
i_user
).
getExecute
()))
{
//新增执行人 执行状态为执行中
//新增执行人 执行状态为执行中
SpmkExecutor
.
builder
()
SpmkExecutor
.
builder
()
.
approveExecuteRecordId
(
executeRecordId
)
.
approveExecuteRecordId
(
executeRecordId
)
...
...
This diff is collapsed.
Click to expand it.
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