diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java index a279368a..518000ac 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java @@ -176,13 +176,13 @@ public class ActSarItemsEOService { } String standFoUser = ""; List> itemData = new ArrayList<>(); - if (breakVal != null) { - //取出taskbreak中的部分标准信息放到map中,如fo,svpps,责任部门,项目评估角色 - String valueStr = String.valueOf(breakVal); - jsonArray = JSONArray.parseArray(valueStr,String.class); - // 处理在标准、条款中的SVPPS、项目评估角色、责任部门、FO - handleStandCollectData(attInfoMap,jsonArray,itemData); - } +// if (breakVal != null) { +// //取出taskbreak中的部分标准信息放到map中,如fo,svpps,责任部门,项目评估角色 +// String valueStr = String.valueOf(breakVal); +// jsonArray = JSONArray.parseArray(valueStr,String.class); +// // 处理在标准、条款中的SVPPS、项目评估角色、责任部门、FO +// handleStandCollectData(attInfoMap,jsonArray,itemData); +// } //处理文件 //此处需要处理之前的文件信息,防止文件丢失 // attInfoMap = saveFileMsg(attInfoMap,sarStandardsInfoEO.getFileIds(),sarStandardsInfoEO.getTextStatus()); @@ -273,12 +273,12 @@ public class ActSarItemsEOService { // 编辑相关流程 sarStandAttrInfoEOService.updateStandInfo(sarStandardsInfoEO.getId(),"XGLC",prcNum); } - List allItems = new ArrayList<>(); +// List allItems = new ArrayList<>(); //开始处理条款数据,从去重后的结果中直接处理即可 - if(itemData!=null && !itemData.isEmpty()){ - // allItems = - saveStandItemsData(itemData, sarStandardsInfoEO); - } +// if(itemData!=null && !itemData.isEmpty()){ +// // allItems = +// saveStandItemsData(itemData, sarStandardsInfoEO); +// } //技术评估结果入库 重构技术评估结果入库内容 // if ("0".equals(isJudge)) { // saveCompStatusInfo(sarStandardsInfoEO,breakVal,allItems,prcNum); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index f2c1a0fc..23de453a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -1935,17 +1935,14 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl