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
84aa917d
Commit
84aa917d
authored
Aug 01, 2020
by
ilal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交
parent
32512387
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
0 deletions
+14
-0
src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java
+12
-0
src/main/java/cn/timer/api/dto/spmk/SpmkApproveDetailDto.java
+2
-0
No files found.
src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java
View file @
84aa917d
...
...
@@ -18,6 +18,7 @@ import cn.timer.api.bean.spmk.SpmkApproveDetail;
import
cn.timer.api.bean.spmk.SpmkApproveExecuteRecord
;
import
cn.timer.api.bean.spmk.SpmkApproveSummary
;
import
cn.timer.api.bean.spmk.SpmkCustomApproval
;
import
cn.timer.api.bean.spmk.SpmkExecutor
;
import
cn.timer.api.config.annotation.UserBean
;
import
cn.timer.api.controller.zzgl.service.ZzglBmgwMService
;
import
cn.timer.api.dao.spmk.SpmkApprovalGMapper
;
...
...
@@ -112,7 +113,18 @@ public class SpmkServiceImpl implements SpmkService{
if
(
sum
!=
null
)
{
adD
.
setEmpNum
(
sum
.
getEmpNum
());
adD
.
setSts
(
sum
.
getSts
());
SpmkExecutor
exe
=
null
;
SpmkApproveExecuteRecord
exere
=
SpmkApproveExecuteRecord
.
builder
().
build
().
selectOne
(
new
QueryWrapper
<
SpmkApproveExecuteRecord
>().
lambda
().
eq
(
SpmkApproveExecuteRecord:
:
getApproveSummaryId
,
sum
.
getId
()));
if
(
exere
!=
null
)
{
exe
=
SpmkExecutor
.
builder
().
build
().
selectOne
(
new
QueryWrapper
<
SpmkExecutor
>().
lambda
().
eq
(
SpmkExecutor:
:
getApproveExecuteRecordId
,
exere
.
getId
()));
}
if
(
exe
!=
null
)
{
adD
.
setExecuteEmpNum
(
exe
.
getEmpNum
());
}
}
return
adD
;
}
...
...
src/main/java/cn/timer/api/dto/spmk/SpmkApproveDetailDto.java
View file @
84aa917d
...
...
@@ -46,5 +46,7 @@ public class SpmkApproveDetailDto {
private
Integer
empNum
;
private
Integer
sts
;
private
Integer
executeEmpNum
;
//当前审批中 当前执行人的id
}
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