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
62b0fc00
Commit
62b0fc00
authored
3 years ago
by
Your Name
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新部门下不能新增岗位员工
parent
977d9af2
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
23 deletions
+18
-23
src/main/java/cn/timer/api/controller/spmk/SpmkController.java
+2
-2
src/main/java/cn/timer/api/controller/spmk/service/SpmkService.java
+1
-2
src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java
+15
-19
No files found.
src/main/java/cn/timer/api/controller/spmk/SpmkController.java
View file @
62b0fc00
...
@@ -1000,7 +1000,7 @@ public class SpmkController {
...
@@ -1000,7 +1000,7 @@ public class SpmkController {
*/
*/
@PostMapping
(
value
=
"/approved_addDetail"
)
@PostMapping
(
value
=
"/approved_addDetail"
)
@ApiOperation
(
value
=
"A审核详情数据转换"
,
httpMethod
=
"POST"
,
notes
=
""
)
@ApiOperation
(
value
=
"A审核详情数据转换"
,
httpMethod
=
"POST"
,
notes
=
""
)
public
void
addApproveDetail
(){
public
void
addApproveDetail
(
String
status
){
spmkService
.
addApproveDetail
();
spmkService
.
addApproveDetail
(
status
);
}
}
}
}
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/spmk/service/SpmkService.java
View file @
62b0fc00
...
@@ -5,7 +5,6 @@ import java.util.List;
...
@@ -5,7 +5,6 @@ import java.util.List;
import
cn.timer.api.bean.spmk.SpmkApprovalG
;
import
cn.timer.api.bean.spmk.SpmkApprovalG
;
import
cn.timer.api.config.annotation.UserBean
;
import
cn.timer.api.config.annotation.UserBean
;
import
cn.timer.api.dto.spmk.SpmkApproveDetailDto
;
import
cn.timer.api.dto.spmk.SpmkApproveDetailDto
;
import
com.fasterxml.jackson.core.JsonProcessingException
;
public
interface
SpmkService
{
public
interface
SpmkService
{
...
@@ -15,7 +14,7 @@ public interface SpmkService {
...
@@ -15,7 +14,7 @@ public interface SpmkService {
List
<
SpmkApprovalG
>
selectListAg
(
UserBean
userBean
);
List
<
SpmkApprovalG
>
selectListAg
(
UserBean
userBean
);
void
addApproveDetail
();
void
addApproveDetail
(
String
status
);
}
}
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java
View file @
62b0fc00
...
@@ -11,7 +11,6 @@ import cn.timer.api.dao.spmk.*;
...
@@ -11,7 +11,6 @@ import cn.timer.api.dao.spmk.*;
import
cn.timer.api.dto.spmk.FlowChildren
;
import
cn.timer.api.dto.spmk.FlowChildren
;
import
cn.timer.api.dto.spmk.Router
;
import
cn.timer.api.dto.spmk.Router
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
javafx.scene.text.Text
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
@@ -153,56 +152,53 @@ public class SpmkServiceImpl implements SpmkService{
...
@@ -153,56 +152,53 @@ public class SpmkServiceImpl implements SpmkService{
/**
/**
* 审核汇总详情数据转换
* 审核汇总详情数据转换
* @param status
*/
*/
@Override
@Override
public
void
addApproveDetail
(
)
{
public
void
addApproveDetail
(
String
status
)
{
if
(
"1"
.
equals
(
status
))
{
QueryWrapper
queryWrapper
=
new
QueryWrapper
<
SpmkApproveDetail
>().
select
(
"id,approve_summary_id"
,
"name"
,
"department_name"
,
"request_data"
,
"froms"
,
"router"
,
"flow_children"
);
QueryWrapper
queryWrapper
=
new
QueryWrapper
<
SpmkApproveDetail
>().
select
(
"id,approve_summary_id"
,
"name"
,
"department_name"
,
"request_data"
,
"froms"
,
"router"
,
"flow_children"
);
List
<
SpmkApproveDetail
>
spmkApproveDetails
=
spmkApproveDetailMapper
.
selectList
(
queryWrapper
);
List
<
SpmkApproveDetail
>
spmkApproveDetails
=
spmkApproveDetailMapper
.
selectList
(
queryWrapper
);
spmkApproveDetails
.
forEach
(
t
->
{
spmkApproveDetails
.
forEach
(
t
->
{
SpmkApproveDetailSummary
spmkApproveDetailSummary
=
new
SpmkApproveDetailSummary
();
SpmkApproveDetailSummary
spmkApproveDetailSummary
=
new
SpmkApproveDetailSummary
();
spmkApproveDetailSummary
.
setApproveSummaryId
(
t
.
getApproveSummaryId
());
spmkApproveDetailSummary
.
setApproveSummaryId
(
t
.
getApproveSummaryId
());
spmkApproveDetailSummary
.
setDepartmentName
(
t
.
getDepartmentName
());
spmkApproveDetailSummary
.
setDepartmentName
(
t
.
getDepartmentName
());
spmkApproveDetailSummary
.
setName
(
t
.
getName
());
spmkApproveDetailSummary
.
setName
(
t
.
getName
());
SpmkApproveDetailSummary
sca
=
SpmkApproveDetailSummary
.
builder
().
build
();
try
{
try
{
Object
deserialize2
=
ObjectUtil
.
deserialize
(
t
.
getFlowChildren
());
Object
deserialize2
=
ObjectUtil
.
deserialize
(
t
.
getFlowChildren
());
String
flowChidren
=
JSON
.
toJSONString
(
deserialize2
);
String
flowChidren
=
JSON
.
toJSONString
(
deserialize2
);
spmkApproveDetailSummary
.
setFlowChildren
(
flowChidren
);
spmkApproveDetailSummary
.
setFlowChildren
(
flowChidren
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
}
finally
{
}
finally
{
try
{
try
{
Object
deserialize1
=
ObjectUtil
.
deserialize
(
t
.
getFroms
());
Object
deserialize1
=
ObjectUtil
.
deserialize
(
t
.
getFroms
());
String
froms
=
JSON
.
toJSONString
(
deserialize1
);
String
froms
=
JSON
.
toJSONString
(
deserialize1
);
spmkApproveDetailSummary
.
setFroms
(
froms
);
spmkApproveDetailSummary
.
setFroms
(
froms
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
}
finally
{
}
finally
{
try
{
try
{
Object
deserialize
=
ObjectUtil
.
deserialize
(
t
.
getRequestData
());
Object
deserialize
=
ObjectUtil
.
deserialize
(
t
.
getRequestData
());
String
s
=
JSON
.
toJSONString
(
deserialize
);
String
s
=
JSON
.
toJSONString
(
deserialize
);
spmkApproveDetailSummary
.
setRequestData
(
s
);
spmkApproveDetailSummary
.
setRequestData
(
s
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
}
finally
{
}
finally
{
try
{
try
{
Router
router
=
ObjectUtil
.
deserialize
(
t
.
getRouter
());
Router
router
=
ObjectUtil
.
deserialize
(
t
.
getRouter
());
String
s
=
JSON
.
toJSONString
(
router
);
String
s
=
JSON
.
toJSONString
(
router
);
spmkApproveDetailSummary
.
setRouter
(
s
);
spmkApproveDetailSummary
.
setRouter
(
s
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
}
}
finally
{
finally
{
spmkApproveDetailSummary
.
insert
();
BeanUtil
.
copyProperties
(
spmkApproveDetailSummary
,
sca
,
"id"
);
sca
.
insert
();
}
}
}
}
}
}
}
}
});
});
}
}
}
}
}
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