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
fd43b4a2
Commit
fd43b4a2
authored
3 years ago
by
Your Name
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新部门下不能新增岗位员工
parent
4da34bfc
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
+5
-6
src/main/java/cn/timer/api/controller/spmk/SpmkController.java
+2
-1
src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java
+3
-5
No files found.
src/main/java/cn/timer/api/controller/spmk/SpmkController.java
View file @
fd43b4a2
...
...
@@ -10,6 +10,7 @@ import java.util.Set;
import
cn.timer.api.bean.spmk.*
;
import
cn.timer.api.dao.spmk.*
;
import
cn.timer.api.dto.spmk.*
;
import
net.sf.json.JSONArray
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.transaction.annotation.Transactional
;
...
...
@@ -599,7 +600,7 @@ public class SpmkController {
adm
.
setRequestData
(
spmkApproveSummaryDto
.
getRequestData
().
toString
());
adm
.
setFroms
(
spmkApproveSummaryDto
.
getFroms
().
toString
());
adm
.
setRouter
(
listRouter
.
get
(
0
).
toJSONString
());
adm
.
setFlowChildren
(
listFlowChildren
.
toString
());
adm
.
setFlowChildren
(
JSONArray
.
fromObject
(
listFlowChildren
)
.
toString
());
try
{
spmkApproveDetailSummaryMapper
.
insert
(
adm
);
}
catch
(
Exception
e
){
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java
View file @
fd43b4a2
package
cn
.
timer
.
api
.
controller
.
spmk
.
service
;
import
java.lang.reflect.Type
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.List
;
...
...
@@ -12,7 +13,7 @@ import cn.timer.api.dao.spmk.*;
import
cn.timer.api.dto.spmk.FlowChildren
;
import
cn.timer.api.dto.spmk.Router
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fast
json.JSONArray
;
import
net.sf.
json.JSONArray
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
...
...
@@ -116,10 +117,7 @@ public class SpmkServiceImpl implements SpmkService{
adD
.
setRouter
(
jsonObject
.
parseObject
(
ad
.
getRouter
(),
Router
.
class
));
}
if
(
ad
.
getFlowChildren
()!=
null
)
{
adD
.
setFlowChildren
(
jsonObject
.
parseArray
(
ad
.
getFroms
(),
FlowChildren
.
class
));
/*List<String> strsToList1= Arrays.asList(ad.getFlowChildren().split("FlowChildren"));
System.out.println(strsToList1);*/
adD
.
setFlowChildren
(
jsonObject
.
parseArray
(
ad
.
getFlowChildren
(),
FlowChildren
.
class
));
}
adD
.
setApproveExecuteRecord
(
listAer
);
if
(
sum
!=
null
)
{
...
...
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