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
f8a7efb0
Commit
f8a7efb0
authored
May 12, 2023
by
翁国栋
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改审核内容
parent
6bffda18
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
4 deletions
+16
-4
src/main/java/cn/timer/api/controller/spmk/SpmkController.java
+16
-4
No files found.
src/main/java/cn/timer/api/controller/spmk/SpmkController.java
View file @
f8a7efb0
...
@@ -5,6 +5,8 @@ import java.io.Serializable;
...
@@ -5,6 +5,8 @@ import java.io.Serializable;
import
java.util.*
;
import
java.util.*
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
import
cn.hutool.db.sql.SqlBuilder
;
import
cn.timer.api.bean.crm.CrmBusinessGroupMember
;
import
cn.timer.api.bean.crm.CrmClientContacts
;
import
cn.timer.api.bean.crm.CrmClientContacts
;
import
cn.timer.api.bean.sche.ScheduleTask
;
import
cn.timer.api.bean.sche.ScheduleTask
;
import
cn.timer.api.bean.spmk.*
;
import
cn.timer.api.bean.spmk.*
;
...
@@ -1507,10 +1509,10 @@ public class SpmkController {
...
@@ -1507,10 +1509,10 @@ public class SpmkController {
SpmkApproveExecuteRecord
spmkApproveExecuteRecord
=
spmkApproveExecuteRecordMapper
.
selectExecuteRecordById
(
Integer
.
parseInt
(
currentUser
.
getId
()),
spmkApproveDetailSummary
.
getApproveSummaryId
());
SpmkApproveExecuteRecord
spmkApproveExecuteRecord
=
spmkApproveExecuteRecordMapper
.
selectExecuteRecordById
(
Integer
.
parseInt
(
currentUser
.
getId
()),
spmkApproveDetailSummary
.
getApproveSummaryId
());
//删除操作人记录
//删除操作人记录
if
(
spmkApproveExecuteRecord
!=
null
)
{
if
(
spmkApproveExecuteRecord
!=
null
)
{
SpmkExecutor
spmkExecutor
=
SpmkExecutor
.
builder
().
build
().
selectOne
(
new
LambdaQueryWrapper
<
SpmkExecutor
>()
SpmkExecutor
spmkExecutor
=
SpmkExecutor
.
builder
().
build
().
selectOne
(
new
LambdaQueryWrapper
<
SpmkExecutor
>()
.
eq
(
SpmkExecutor:
:
getApproveExecuteRecordId
,
spmkApproveExecuteRecord
.
getId
()).
eq
(
SpmkExecutor:
:
getEmpNum
,
currentUser
.
getId
()));
.
eq
(
SpmkExecutor:
:
getApproveExecuteRecordId
,
spmkApproveExecuteRecord
.
getId
()).
eq
(
SpmkExecutor:
:
getEmpNum
,
currentUser
.
getId
()));
if
(
onlyOne
)
{
if
(
onlyOne
)
{
if
(
spmkExecutor
.
getSts
()!=
4
)
{
if
(
spmkExecutor
.
getSts
()
!=
4
)
{
spmkApproveExecuteRecordMapper
.
delExecuteRecordByRecordIds
(
spmkApproveExecuteRecord
.
getId
(),
Integer
.
parseInt
(
currentUser
.
getId
()));
spmkApproveExecuteRecordMapper
.
delExecuteRecordByRecordIds
(
spmkApproveExecuteRecord
.
getId
(),
Integer
.
parseInt
(
currentUser
.
getId
()));
}
}
}
else
{
}
else
{
...
@@ -1602,7 +1604,7 @@ public class SpmkController {
...
@@ -1602,7 +1604,7 @@ public class SpmkController {
listFlowChildren
.
get
(
spmkApproveDetailDto
.
getIndex
()).
getRelation
().
get
(
0
).
getUsers
().
removeIf
(
u
->
u
==
currentUser
);
listFlowChildren
.
get
(
spmkApproveDetailDto
.
getIndex
()).
getRelation
().
get
(
0
).
getUsers
().
removeIf
(
u
->
u
==
currentUser
);
}
}
//如果是最终执行人
//如果是最终执行人
if
(
isFinal
&&
isNext
&&
isExecute
)
{
if
(
isFinal
&&
isNext
&&
isExecute
)
{
SpmkApproveSummary
.
builder
().
id
(
spmkApproveDetailSummary
.
getApproveSummaryId
()).
currentApprover
(
CommonEnum
.
NULL_STR
.
getDesc
()).
endTime
(
new
Date
()).
sts
(
ApproveSummarySts
.
FINISH
.
ordinal
()).
build
().
updateById
();
SpmkApproveSummary
.
builder
().
id
(
spmkApproveDetailSummary
.
getApproveSummaryId
()).
currentApprover
(
CommonEnum
.
NULL_STR
.
getDesc
()).
endTime
(
new
Date
()).
sts
(
ApproveSummarySts
.
FINISH
.
ordinal
()).
build
().
updateById
();
}
}
SpmkApproveDetailSummary
.
builder
().
id
(
spmkApproveDetailDto
.
getId
())
SpmkApproveDetailSummary
.
builder
().
id
(
spmkApproveDetailDto
.
getId
())
...
@@ -1799,5 +1801,15 @@ public class SpmkController {
...
@@ -1799,5 +1801,15 @@ public class SpmkController {
return
ResultUtil
.
data
(
"删除附件成功"
);
return
ResultUtil
.
data
(
"删除附件成功"
);
}
}
@PostMapping
(
value
=
"/update_spmk_content"
)
@ApiOperation
(
value
=
"更新审批文本内容"
,
httpMethod
=
"POST"
,
notes
=
"更新审批文本内容"
)
@Log
(
title
=
"更新审批文本内容"
,
businessType
=
BusinessType
.
OTHER
)
public
Result
<
Object
>
update_spmk_content
(
@CurrentUser
UserBean
userBean
,
@RequestBody
SpmkApproveDetailDto
sq
)
{
SpmkApproveSummary
.
builder
().
id
(
sq
.
getId
()).
digest
(
sq
.
getDigest
()).
build
().
updateById
();
SpmkApproveDetailSummary
spmks
=
SpmkApproveDetailSummary
.
builder
().
build
().
selectOne
(
new
LambdaQueryWrapper
<
SpmkApproveDetailSummary
>().
eq
(
SpmkApproveDetailSummary:
:
getApproveSummaryId
,
sq
.
getId
()));
spmks
.
setRequestData
(
sq
.
getRequestData
().
toString
());
spmks
.
updateById
();
return
ResultUtil
.
data
(
"更新成功"
);
}
}
}
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