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
2b24737f
Commit
2b24737f
authored
5 years ago
by
tangzhaoqian
Committed by
chenzg
3 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
审批Router解析
parent
08422e2e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
2 deletions
+17
-2
src/main/java/cn/timer/api/controller/spmk/SpmkServiceImpl.java
+3
-1
src/main/java/cn/timer/api/utils/router/RouterUtils.java
+14
-1
No files found.
src/main/java/cn/timer/api/controller/spmk/SpmkServiceImpl.java
View file @
2b24737f
...
@@ -24,6 +24,7 @@ import cn.hutool.core.bean.BeanUtil;
...
@@ -24,6 +24,7 @@ import cn.hutool.core.bean.BeanUtil;
import
cn.hutool.core.collection.CollUtil
;
import
cn.hutool.core.collection.CollUtil
;
import
cn.hutool.core.lang.Console
;
import
cn.hutool.core.lang.Console
;
import
cn.hutool.core.util.ObjectUtil
;
import
cn.hutool.core.util.ObjectUtil
;
import
cn.hutool.core.util.StrUtil
;
import
cn.hutool.json.JSONObject
;
import
cn.hutool.json.JSONObject
;
import
cn.timer.api.bean.spmk.SpmkApprovalG
;
import
cn.timer.api.bean.spmk.SpmkApprovalG
;
import
cn.timer.api.bean.spmk.SpmkApprovalTemplate
;
import
cn.timer.api.bean.spmk.SpmkApprovalTemplate
;
...
@@ -380,7 +381,8 @@ public class SpmkServiceImpl {
...
@@ -380,7 +381,8 @@ public class SpmkServiceImpl {
listRouter
.
add
(
spmkApproveSummaryDto
.
getRouter
());
listRouter
.
add
(
spmkApproveSummaryDto
.
getRouter
());
JSONObject
jSONObject
=
spmkApproveSummaryDto
.
getRequestData
()
JSONObject
jSONObject
=
spmkApproveSummaryDto
.
getRequestData
()
.
put
(
"orgCode"
,
FromData
.
builder
().
value
(
String
.
valueOf
(
userBean
.
getOrgCode
())).
build
())
.
put
(
"orgCode"
,
FromData
.
builder
().
value
(
String
.
valueOf
(
userBean
.
getOrgCode
())).
build
())
.
put
(
"initiator"
,
FromData
.
builder
().
value
(
spmkApproveSummaryDto
.
getInitiator
()).
build
());
.
put
(
"initiator"
,
FromData
.
builder
().
value
(
spmkApproveSummaryDto
.
getInitiator
()).
build
())
.
put
(
"id"
,
FromData
.
builder
().
value
(
StrUtil
.
toString
(
userBean
.
getEmpNum
())).
build
());
RouterUtils
.
NextNode
(
listRouter
,
jSONObject
,
ISFIRST
);
RouterUtils
.
NextNode
(
listRouter
,
jSONObject
,
ISFIRST
);
List
<
FlowChildren
>
listFlowChildren
=
new
ArrayList
<
FlowChildren
>();
List
<
FlowChildren
>
listFlowChildren
=
new
ArrayList
<
FlowChildren
>();
RouterUtils
.
getIsFlowChildren
(
listRouter
,
listFlowChildren
);
RouterUtils
.
getIsFlowChildren
(
listRouter
,
listFlowChildren
);
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/utils/router/RouterUtils.java
View file @
2b24737f
...
@@ -65,7 +65,20 @@ public class RouterUtils {
...
@@ -65,7 +65,20 @@ public class RouterUtils {
Console
.
log
(
"发起人逻辑"
);
Console
.
log
(
"发起人逻辑"
);
router
.
setExecute
(
EXECUTED
);
router
.
setExecute
(
EXECUTED
);
router
.
setFlow
(
true
);
router
.
setFlow
(
true
);
router
.
getRelation
().
get
(
0
).
setName
(
obj
.
get
(
"initiator"
,
FromData
.
class
).
getValue
());
List
<
User
>
users
=
new
ArrayList
<
User
>();
User
userFirst
=
User
.
builder
()
.
name
(
obj
.
get
(
"initiator"
,
FromData
.
class
).
getValue
())
.
id
(
obj
.
get
(
"id"
,
FromData
.
class
).
getValue
())
.
execute
(
"0"
)
.
build
();
users
.
add
(
userFirst
);
List
<
Relation
>
relations
=
new
ArrayList
<
Relation
>();
Relation
relation
=
Relation
.
builder
().
type
(
"user"
).
users
(
users
).
build
();
relations
.
add
(
relation
);
router
.
setRelation
(
relations
);
// router.getRelation().get(0).setName(obj.get("initiator",FromData.class).getValue());
NextNode
(
router
.
getChildren
(),
obj
,
isFirse
,
isAuditNext
);
NextNode
(
router
.
getChildren
(),
obj
,
isFirse
,
isAuditNext
);
break
;
break
;
...
...
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