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
74d5229a
Commit
74d5229a
authored
3 years ago
by
Your Name
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新部门下不能新增岗位员工
parent
6e98a6a3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
6 deletions
+9
-6
src/main/java/cn/timer/api/controller/spmk/SpmkController.java
+3
-4
src/main/java/cn/timer/api/controller/spmk/service/SpmkService.java
+1
-1
src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java
+5
-1
No files found.
src/main/java/cn/timer/api/controller/spmk/SpmkController.java
View file @
74d5229a
...
@@ -73,8 +73,7 @@ import io.swagger.annotations.ApiOperation;
...
@@ -73,8 +73,7 @@ import io.swagger.annotations.ApiOperation;
@Api
(
tags
=
"3.0审批模块"
)
@Api
(
tags
=
"3.0审批模块"
)
@RestController
@RestController
@Transactional
@Transactional
@RequestMapping
(
value
=
"/spmk"
,
@RequestMapping
(
value
=
"/spmk"
,
produces
=
{
"application/json"
,
"multipart/form-data"
})
produces
=
{
"application/json"
,
"multipart/form-data"
})
public
class
SpmkController
{
public
class
SpmkController
{
@Autowired
@Autowired
...
@@ -998,7 +997,7 @@ public class SpmkController {
...
@@ -998,7 +997,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
(
String
status
){
public
String
addApproveDetail
(
String
status
){
spmkService
.
addApproveDetail
(
status
);
return
spmkService
.
addApproveDetail
(
status
);
}
}
}
}
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/spmk/service/SpmkService.java
View file @
74d5229a
...
@@ -14,6 +14,6 @@ public interface SpmkService {
...
@@ -14,6 +14,6 @@ public interface SpmkService {
List
<
SpmkApprovalG
>
selectListAg
(
UserBean
userBean
);
List
<
SpmkApprovalG
>
selectListAg
(
UserBean
userBean
);
void
addApproveDetail
(
String
status
);
String
addApproveDetail
(
String
status
);
}
}
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java
View file @
74d5229a
...
@@ -155,7 +155,7 @@ public class SpmkServiceImpl implements SpmkService{
...
@@ -155,7 +155,7 @@ public class SpmkServiceImpl implements SpmkService{
* @param status
* @param status
*/
*/
@Override
@Override
public
void
addApproveDetail
(
String
status
)
{
public
String
addApproveDetail
(
String
status
)
{
if
(
"1"
.
equals
(
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
);
...
@@ -199,6 +199,10 @@ public class SpmkServiceImpl implements SpmkService{
...
@@ -199,6 +199,10 @@ public class SpmkServiceImpl implements SpmkService{
}
}
}
}
});
});
}
else
{
return
"失败"
;
}
}
return
"成功"
;
}
}
}
}
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