Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!370

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.SpmkApproveExecuteRecord;
 import cn.timer.api.bean.spmk.SpmkApproveSummary;
 import cn.timer.api.bean.spmk.SpmkApproveSummary;
 import cn.timer.api.bean.spmk.SpmkCustomApproval;
 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.config.annotation.UserBean;
 import cn.timer.api.controller.zzgl.service.ZzglBmgwMService;
 import cn.timer.api.controller.zzgl.service.ZzglBmgwMService;
 import cn.timer.api.dao.spmk.SpmkApprovalGMapper;
 import cn.timer.api.dao.spmk.SpmkApprovalGMapper;
@@ -112,7 +113,18 @@ public class SpmkServiceImpl implements SpmkService{
 		if(sum != null) {
 		if(sum != null) {
 			adD.setEmpNum(sum.getEmpNum());
 			adD.setEmpNum(sum.getEmpNum());
 			adD.setSts(sum.getSts());
 			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;
 		return adD;
 	}
 	}
 
 

src/main/java/cn/timer/api/dto/spmk/SpmkApproveDetailDto.java

@@ -46,5 +46,7 @@ public class SpmkApproveDetailDto {
 	private Integer empNum;
 	private Integer empNum;
 	
 	
 	private Integer sts;
 	private Integer sts;
+	
+	private Integer executeEmpNum;//当前审批中 当前执行人的id
 
 
 }
 }