diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index afb729bc..19ac146d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -2318,12 +2318,30 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 0){ throw new AdcDaBaseException("当前企标标准号和企标名称已存在"); } + String standCode = ""; if(StringUtils.isNotBlank(sarBussionessStand.getStandCode()) && !"null".equals(sarBussionessStand.getStandCode())){ standCode = sarBussionessStand.getStandCode(); @@ -2403,24 +2422,24 @@ public class SarBussionessStandServiceImpl extends ServiceImpl processSet = new HashSet<>(); - for(String sData:processSplit){ - processSet.add(sData); - } - processSet.add(prcNum); - relatePro = StringUtils.join(processSet.toArray(), ","); - } else { - relatePro = prcNum; - } +// String relatePro = sarBussStandAttrInfoService.selectFieldValByStandId("XGLC",sarBussionessStand.getId()); +// if (StringUtils.isNotBlank(relatePro)) { +// String[] processSplit = relatePro.split(","); +// Set processSet = new HashSet<>(); +// for(String sData:processSplit){ +// processSet.add(sData); +// } +// //processSet.add(prcNum); +// relatePro = StringUtils.join(processSet.toArray(), ","); +// }// else { +// relatePro = prcNum; +// } // 编辑标准 iSarBussionessStandService.updateSarBussionessStand(sarBussionessStand); // 编辑相关流程 - sarBussStandAttrInfoService.updateStandInfo(sarBussionessStand.getId(),"XGLC",relatePro); - String content = "新增一条相关流程:" +prcName+" "+prcNum; - sarUpdLogEOService.createBaseProcessLog(sarBussionessStand.getId(),"BUSINESS",content,prcCreateUser); + // sarBussStandAttrInfoService.updateStandInfo(sarBussionessStand.getId(),"XGLC",relatePro); + // String content = "新增一条相关流程:" +standName; + // sarUpdLogEOService.createBaseProcessLog(sarBussionessStand.getId(),"BUSINESS",content,standName); }else if (lawsList != null && !lawsList.isEmpty()) {//Id不存在,但是标准号存在的情况 String standId = lawsList.get(0).getId(); bussId = lawsList.get(0).getId(); @@ -2434,28 +2453,28 @@ public class SarBussionessStandServiceImpl extends ServiceImpl processSet = new HashSet<>(); - for(String sData:processSplit){ - processSet.add(sData); - } - processSet.add(prcNum); - relatePro = StringUtils.join(processSet.toArray(), ","); - } else { - relatePro = prcNum; - } +// String relatePro = sarBussStandAttrInfoService.selectFieldValByStandId("XGLC",standId); +// if (StringUtils.isNotBlank(relatePro)) { +// String[] processSplit = relatePro.split(","); +// Set processSet = new HashSet<>(); +// for(String sData:processSplit){ +// processSet.add(sData); +// } +// //processSet.add(prcNum); +// relatePro = StringUtils.join(processSet.toArray(), ","); +// }// else { +// relatePro = prcNum; +// } // 编辑标准 sarBussionessStand.setId(standId); iSarBussionessStandService.updateSarBussionessStand(sarBussionessStand); // 编辑相关流程 - sarBussStandAttrInfoService.updateStandInfo(standId,"XGLC",relatePro); - String content = "新增一条相关流程:" +prcName+" "+prcNum; - sarUpdLogEOService.createBaseProcessLog(standId,"BUSINESS",content,prcCreateUser); +// sarBussStandAttrInfoService.updateStandInfo(standId,"XGLC",relatePro); +// String content = "新增一条相关流程:" +standName; +// sarUpdLogEOService.createBaseProcessLog(standId,"BUSINESS",content,standName); } else {//标准号、ID都不存在的情况 // 新增方法 - sarBussionessStand.setPrcCreateUser(prcCreateUser); + sarBussionessStand.setStandCode(standCode); ResponseMessage responseMessage = iSarBussionessStandService.createSarBussionessStand(sarBussionessStand); if(responseMessage.isOk()){ SarBussionessStand bussionessStand = responseMessage.getData(); @@ -2463,7 +2482,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl allItems = new ArrayList<>(); //开始处理条款数据,从去重后的结果中直接处理即可