diff --git a/src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java b/src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java index dee3cbc..7fcdd3a 100644 --- a/src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java +++ b/src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java @@ -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; } diff --git a/src/main/java/cn/timer/api/dto/spmk/SpmkApproveDetailDto.java b/src/main/java/cn/timer/api/dto/spmk/SpmkApproveDetailDto.java index 4d6f47e..fe4b458 100644 --- a/src/main/java/cn/timer/api/dto/spmk/SpmkApproveDetailDto.java +++ b/src/main/java/cn/timer/api/dto/spmk/SpmkApproveDetailDto.java @@ -46,5 +46,7 @@ public class SpmkApproveDetailDto { private Integer empNum; private Integer sts; + + private Integer executeEmpNum;//当前审批中 当前执行人的id }