5.审批 副标题

src/main/java/cn/timer/api/controller/spmk/SpmkController.java

@@ -958,10 +958,10 @@ public class SpmkController {
 				e.printStackTrace();
 				e.printStackTrace();
 			}
 			}
 //				Logoutput(requerstr);
 //				Logoutput(requerstr);
-			if(!StringUtils.isEmpty(sp.getDigest())){
-				requerstr = requerstr+","+sp.getDigest();
+			/*if(!StringUtils.isEmpty(sp.getDigest())){
+				requerstr = requerstr+" "+sp.getDigest();
 			}
 			}
-			sp.setDigest(requerstr);
+			sp.setDigest(requerstr);*/
 		}
 		}
 
 
 		return ResultUtil.data(pageAs, listAs);
 		return ResultUtil.data(pageAs, listAs);

src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java

@@ -101,7 +101,7 @@ public class SpmkServiceImpl implements SpmkService{
 		//审批汇总
 		//审批汇总
 		SpmkApproveSummary sum = null;
 		SpmkApproveSummary sum = null;
 		if(ad != null) {
 		if(ad != null) {
-			sum = SpmkApproveSummary.builder().build().selectOne(new QueryWrapper<SpmkApproveSummary>().lambda().select(SpmkApproveSummary::getId,SpmkApproveSummary::getEmpNum,SpmkApproveSummary::getSts,SpmkApproveSummary::getCreateTime)
+			sum = SpmkApproveSummary.builder().build().selectOne(new QueryWrapper<SpmkApproveSummary>().lambda().select(SpmkApproveSummary::getId,SpmkApproveSummary::getEmpNum,SpmkApproveSummary::getSts,SpmkApproveSummary::getCreateTime,SpmkApproveSummary::getDigest)
 					.eq(SpmkApproveSummary::getId, ad.getApproveSummaryId()));
 					.eq(SpmkApproveSummary::getId, ad.getApproveSummaryId()));
 		}
 		}
 		
 		
@@ -134,6 +134,7 @@ public class SpmkServiceImpl implements SpmkService{
 			adD.setEmpNum(sum.getEmpNum());
 			adD.setEmpNum(sum.getEmpNum());
 			adD.setSts(sum.getSts());
 			adD.setSts(sum.getSts());
 			adD.setLaunchTime(sum.getCreateTime());
 			adD.setLaunchTime(sum.getCreateTime());
+			adD.setDigest(sum.getDigest());
 			SpmkExecutor exe= null;
 			SpmkExecutor exe= null;
 			
 			
 			SpmkApproveExecuteRecord exere = SpmkApproveExecuteRecord.builder().build()
 			SpmkApproveExecuteRecord exere = SpmkApproveExecuteRecord.builder().build()

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

@@ -26,6 +26,9 @@ public class SpmkApproveDetailDto {
 	@ApiModelProperty(value = "标题 ", example = "标题")
 	@ApiModelProperty(value = "标题 ", example = "标题")
 	private String name;
 	private String name;
 
 
+	@ApiModelProperty(value = "副标题 ", example = "副标题")
+	private String digest;
+
 	@ApiModelProperty(value = "所在部门名称 ", example = "所在部门名称")
 	@ApiModelProperty(value = "所在部门名称 ", example = "所在部门名称")
 	private String departmentName;
 	private String departmentName;