被驳回的委托单不用生成委托编号

cement-business/src/main/java/cn/wise/sc/cement/business/controller/EntrustController.java

@@ -722,6 +722,8 @@ public class EntrustController {
 				.stream()
 				.filter(arg -> arg.getCementCode().equals(arg.getParallelCode()) )
 				.forEach(arg -> {
+					arg.setName(arg.getName() == null?"":arg.getName());
+					arg.setSampleCode(arg.getSampleCode() == null?"":arg.getSampleCode());
 					/*List<SampleTeamGroupVo> teamVoList = arg.getSampleTeamGroupVoList();
 					teamVoList.forEach(args ->{
 						List<SampleDistributionTeamVo> teamVoList2 = args.getSampleDistributionTeamVoList();

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java

@@ -1451,6 +1451,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 
 
         } else if (query.getIsAgree() == 2) {  //驳回
+	        entrust.setEntrustCode(null);
             entrust.setStatus(2);
             logsService.saveLog(SysLogs.ObjType.ENTRUST_LOG, entrust.getId(), "修改评审状态为“驳回”", null);