FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 入库接口地址清理非本项目内的代码逻辑

Browse Source
This commit is contained in:
zyd
2022-07-19 11:11:45 +08:00
parent 76686f95b8
commit e5d7a67307
2 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java
+12 -12
View File
@@ -176,13 +176,13 @@ public class ActSarItemsEOService {
} }
String standFoUser = ""; String standFoUser = "";
List<Map<String,Object>> itemData = new ArrayList<>(); List<Map<String,Object>> itemData = new ArrayList<>();
if (breakVal != null) { // if (breakVal != null) {
//取出taskbreak中的部分标准信息放到map中，如fo,svpps,责任部门，项目评估角色 // //取出taskbreak中的部分标准信息放到map中，如fo,svpps,责任部门，项目评估角色
String valueStr = String.valueOf(breakVal); // String valueStr = String.valueOf(breakVal);
jsonArray = JSONArray.parseArray(valueStr,String.class); // jsonArray = JSONArray.parseArray(valueStr,String.class);
// 处理在标准、条款中的SVPPS、项目评估角色、责任部门、FO // // 处理在标准、条款中的SVPPS、项目评估角色、责任部门、FO
handleStandCollectData(attInfoMap,jsonArray,itemData); // handleStandCollectData(attInfoMap,jsonArray,itemData);
} // }
//处理文件 //处理文件
//此处需要处理之前的文件信息，防止文件丢失 //此处需要处理之前的文件信息，防止文件丢失
// attInfoMap = saveFileMsg(attInfoMap,sarStandardsInfoEO.getFileIds(),sarStandardsInfoEO.getTextStatus()); // attInfoMap = saveFileMsg(attInfoMap,sarStandardsInfoEO.getFileIds(),sarStandardsInfoEO.getTextStatus());
@@ -273,12 +273,12 @@ public class ActSarItemsEOService {
// 编辑相关流程 // 编辑相关流程
sarStandAttrInfoEOService.updateStandInfo(sarStandardsInfoEO.getId(),"XGLC",prcNum); sarStandAttrInfoEOService.updateStandInfo(sarStandardsInfoEO.getId(),"XGLC",prcNum);
} }
List<SarStandItems> allItems = new ArrayList<>(); // List<SarStandItems> allItems = new ArrayList<>();
//开始处理条款数据，从去重后的结果中直接处理即可 //开始处理条款数据，从去重后的结果中直接处理即可
if(itemData!=null && !itemData.isEmpty()){ // if(itemData!=null && !itemData.isEmpty()){
// allItems = // // allItems =
saveStandItemsData(itemData, sarStandardsInfoEO); // saveStandItemsData(itemData, sarStandardsInfoEO);
} // }
//技术评估结果入库 重构技术评估结果入库内容 //技术评估结果入库 重构技术评估结果入库内容
// if ("0".equals(isJudge)) { // if ("0".equals(isJudge)) {
// saveCompStatusInfo(sarStandardsInfoEO,breakVal,allItems,prcNum); // saveCompStatusInfo(sarStandardsInfoEO,breakVal,allItems,prcNum);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+1 -4
View File
@@ -1935,17 +1935,14 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
if (StringUtils.isNotEmpty(sarStandardsInfoEO.getMenuIds())) { if (StringUtils.isNotEmpty(sarStandardsInfoEO.getMenuIds())) {
for (String menuId : sarStandardsInfoEO.getMenuIds().split(",")) { for (String menuId : sarStandardsInfoEO.getMenuIds().split(",")) {
SarStandardsInfoEOPage standardsInfoEO = new SarStandardsInfoEOPage(); SarStandardsInfoEOPage standardsInfoEO = new SarStandardsInfoEOPage();
standardsInfoEO.setMenuId(menuId); standardsInfoEO.setMenuId(menuId);
standardsInfoEO.setIdlist(new String[]{sarStandardsInfoEO.getId()}); standardsInfoEO.setIdlist(new String[]{sarStandardsInfoEO.getId()});
try { try {
updateStandardsMenu(standardsInfoEO); updateStandardsMenu(standardsInfoEO);
} catch (NullPointerException e) { } catch (NullPointerException e) {
updateStandInfo(standardsInfoEO); logger.error(e.getMessage(),e);
} }
} }
} }