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
0cf3713d
Commit
0cf3713d
authored
4 years ago
by
tangzhaoqian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
审批转派
parent
48c095c8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletions
+5
-1
src/main/java/cn/timer/api/utils/router/RouterUtils.java
+4
-0
src/main/java/cn/timer/api/utils/router/business/ReissueACardBusiness.java
+1
-1
No files found.
src/main/java/cn/timer/api/utils/router/RouterUtils.java
View file @
0cf3713d
...
...
@@ -550,10 +550,14 @@ public class RouterUtils {
//在 原审批人 列表中 插入 一个被转派人(审批人)
}
else
if
(
sts
==
ExecutorSts
.
REDEPLOY
.
ordinal
())
{
List
<
User
>
users1
=
CollectionUtil
.
sub
(
listUser
,
0
,
i_user
+
1
);
redeployUser
.
setExecute
(
UNEXECUTED
);
users1
.
add
(
redeployUser
);
List
<
User
>
users2
=
CollectionUtil
.
sub
(
listUser
,
i_user
+
1
,
listUser
.
size
());
System
.
out
.
println
(
users1
);
System
.
out
.
println
(
users2
);
listUser
=
ListUtils
.
union
(
users1
,
users2
);
n_user
=
listUser
.
size
();
System
.
out
.
println
(
listUser
);
}
}
else
if
(
UNEXECUTED
.
equals
(
listUser
.
get
(
i_user
).
getExecute
()))
{
SpmkExecutor
.
builder
()
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/utils/router/business/ReissueACardBusiness.java
View file @
0cf3713d
...
...
@@ -39,7 +39,7 @@ public class ReissueACardBusiness extends SpmkAssoBusiness {
String
PatchCardTime
=
ObjectUtil
.
isNull
(
jsonObj
.
get
(
"__PatchCardTime"
,
FromData
.
class
))
?
null
:
jsonObj
.
get
(
"__PatchCardTime"
,
FromData
.
class
).
getValue
();
// 缺卡原因
String
cardShortage
=
ObjectUtil
.
isNull
(
jsonObj
.
get
(
"cardShortage"
,
FromData
.
class
))
?
null
:
jsonObj
.
get
(
"cardShortage"
,
FromData
.
class
).
getValue
();
// 缺卡时段-上班、下班-前端未改
String
cardSupplementType
=
ObjectUtil
.
isNull
(
jsonObj
.
get
(
"__CardSupplementType"
,
FromData
.
class
))
?
null
:
jsonObj
.
get
(
"__CardSupplementType"
,
FromData
.
class
).
getValue
();
...
...
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