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
12a71464
Commit
12a71464
authored
a year ago
by
翁国栋
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
审批bug
parent
078aabd0
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
1 deletions
+9
-1
src/main/java/cn/timer/api/controller/spmk/SpmkController.java
+9
-1
No files found.
src/main/java/cn/timer/api/controller/spmk/SpmkController.java
View file @
12a71464
...
...
@@ -1257,8 +1257,15 @@ public class SpmkController {
if
(!
listFlowChildren
.
get
(
currentIndex
).
getExecute
().
equals
(
"1"
)
&&
!
listFlowChildren
.
get
(
currentIndex
).
getExecute
().
equals
(
"0"
))
{
//如果当前索引下的都要变更为0未执行
FlowChildren
flowChildren
=
listFlowChildren
.
get
(
spmkApproveDetailDto
.
getIndex
());
SpmkApproveExecuteRecord
spmkApproveExecuteRecord
=
null
;
//如果有执行记录
if
(
spmkApproveDetailDto
.
getApproveExecuteRecordId
()>
0
){
spmkApproveExecuteRecord
=
spmkApproveExecuteRecordMapper
.
selectById
(
spmkApproveDetailDto
.
getApproveExecuteRecordId
());
}
else
{
User
user
=
flowChildren
.
getRelation
().
get
(
0
).
getUsers
().
get
(
spmkApproveDetailDto
.
getUserIndex
());
SpmkApproveExecuteRecord
spmkApproveExecuteRecord
=
spmkApproveExecuteRecordMapper
.
selectExecuteRecordById
(
Integer
.
parseInt
(
user
.
getId
()),
spmkApproveDetailSummary
.
getApproveSummaryId
());
spmkApproveExecuteRecord
=
spmkApproveExecuteRecordMapper
.
selectExecuteRecordById
(
Integer
.
parseInt
(
user
.
getId
()),
spmkApproveDetailSummary
.
getApproveSummaryId
());
}
//删除审批过的人记录
if
(
spmkApproveExecuteRecord
!=
null
)
{
spmkApproveExecuteRecordMapper
.
delExecuteRecord
(
spmkApproveExecuteRecord
.
getId
(),
spmkApproveDetailSummary
.
getApproveSummaryId
());
...
...
@@ -1305,6 +1312,7 @@ public class SpmkController {
SpmkApproveDetailSummary
.
builder
().
id
(
spmkApproveDetailDto
.
getId
())
.
flowChildren
(
JSONArray
.
fromObject
(
listFlowChildren
).
toString
()).
build
().
updateById
();
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
return
ResultUtil
.
error
(
e
);
}
...
...
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