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
56bedfd3
Commit
56bedfd3
authored
Jan 06, 2022
by
龙于生
Committed by
284718418@qq.com
Mar 30, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改审批bug
parent
417a7ad6
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
src/main/java/cn/timer/api/controller/spmk/SpmkController.java
+1
-4
src/main/java/cn/timer/api/dto/spmk/Relation.java
+1
-1
src/main/java/cn/timer/api/dto/spmk/User.java
+0
-2
src/main/java/cn/timer/api/utils/router/RouterUtils.java
+6
-1
No files found.
src/main/java/cn/timer/api/controller/spmk/SpmkController.java
View file @
56bedfd3
...
...
@@ -777,10 +777,7 @@ public class SpmkController {
redisUtil
.
set
(
asId
.
toString
(),
0
,
500
);
return
ResultUtil
.
error
(
"您已审批过!"
);
}
Integer
integer
=
spmkExecutorMapper
.
selectCount
(
new
QueryWrapper
<
SpmkExecutor
>().
lambda
()
.
eq
(
SpmkExecutor:
:
getId
,
approvingDto
.
getExecutorId
())
.
eq
(
SpmkExecutor:
:
getEmpNum
,
userBean
.
getEmpNum
())
.
eq
(
SpmkExecutor:
:
getSts
,
ExecutorSts
.
IN_EXECUTION
.
ordinal
()));
if
(
spmkExecutorMapper
.
selectCount
(
new
QueryWrapper
<
SpmkExecutor
>().
lambda
()
.
eq
(
SpmkExecutor:
:
getId
,
approvingDto
.
getExecutorId
())
.
eq
(
SpmkExecutor:
:
getEmpNum
,
userBean
.
getEmpNum
())
...
...
src/main/java/cn/timer/api/dto/spmk/Relation.java
View file @
56bedfd3
...
...
@@ -49,7 +49,7 @@ public class Relation implements Serializable{
private
List
<
User
>
users
;
/**
*
主管
是否手签 1是 0否
* 是否手签 1是 0否
*/
private
Integer
signature
;
...
...
src/main/java/cn/timer/api/dto/spmk/User.java
View file @
56bedfd3
...
...
@@ -26,6 +26,4 @@ public class User implements Serializable{
private
String
headUrl
;
private
Integer
signature
;
}
src/main/java/cn/timer/api/utils/router/RouterUtils.java
View file @
56bedfd3
...
...
@@ -616,7 +616,6 @@ public class RouterUtils {
.
build
()
.
updateById
();
listUser
.
get
(
i_user
).
setExecute
(
EXECUTED
);
}
// 历史审批人
...
...
@@ -625,6 +624,7 @@ public class RouterUtils {
.
historyApprover
(
listUser
.
get
(
i_user
).
getName
())
.
build
()
.
updateById
();
//拒绝处理
// 0未执行 1执行中 2同意 3拒绝 4 转派
if
(
sts
==
ExecutorSts
.
REFUSE
.
ordinal
())
{
...
...
@@ -652,6 +652,11 @@ public class RouterUtils {
n_user
=
listUser
.
size
();
// System.out.println(listUser);
}
}
}
else
if
(
UNEXECUTED
.
equals
(
listUser
.
get
(
i_user
).
getExecute
()))
{
SpmkExecutor
.
builder
()
.
approveExecuteRecordId
(
executeRecordId
)
...
...
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