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

feat: 标准入库

Browse Source
This commit is contained in:
super_liu
2021-06-22 18:07:08 +08:00
parent c3f912eefb
commit 12d9bd7b51
2 changed files with 15 additions and 13 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
+8 -6
View File
@@ -102,7 +102,7 @@ public class ActSarItemsEOService {
String prcNum = String.valueOf(standMap.get("prcNum")); String prcNum = String.valueOf(standMap.get("prcNum"));
String prcName = String.valueOf(standMap.get("prcName")); String prcName = String.valueOf(standMap.get("prcName"));
String standType = String.valueOf(standMap.get("standType")); String standType = String.valueOf(standMap.get("standType"));
String isJudge = String.valueOf(standMap.get("ifIn")); //是否经过技术评估 // String isJudge = String.valueOf(standMap.get("ifIn")); //是否经过技术评估
SarStandardsInfo sarStandardsInfoEO = new SarStandardsInfo(); SarStandardsInfo sarStandardsInfoEO = new SarStandardsInfo();
// if(standMap.containsKey("standId")) { // if(standMap.containsKey("standId")) {
// if (standMap.get("standId") != null && !standMap.get("standId").toString().equals("")) { // if (standMap.get("standId") != null && !standMap.get("standId").toString().equals("")) {
@@ -244,12 +244,13 @@ public class ActSarItemsEOService {
List<SarStandItems> allItems = new ArrayList<>(); List<SarStandItems> allItems = new ArrayList<>();
//开始处理条款数据，从去重后的结果中直接处理即可 //开始处理条款数据，从去重后的结果中直接处理即可
if(itemData!=null && !itemData.isEmpty()){ if(itemData!=null && !itemData.isEmpty()){
allItems = saveStandItemsData(itemData, sarStandardsInfoEO); // allItems =
saveStandItemsData(itemData, sarStandardsInfoEO);
} }
//技术评估结果入库 重构技术评估结果入库内容 //技术评估结果入库 重构技术评估结果入库内容
if ("0".equals(isJudge)) { // if ("0".equals(isJudge)) {
saveCompStatusInfo(sarStandardsInfoEO,breakVal,allItems,prcNum); // saveCompStatusInfo(sarStandardsInfoEO,breakVal,allItems,prcNum);
} // }
} }
} }
@@ -1089,7 +1090,8 @@ public class ActSarItemsEOService {
if (StringUtils.isNotBlank(sarStandardsInfoEO.getFileIds()) && StringUtils.isNotBlank(valueStr)) { if (StringUtils.isNotBlank(sarStandardsInfoEO.getFileIds()) && StringUtils.isNotBlank(valueStr)) {
valueStr = sarStandardsInfoEO.getFileIds() + "," + valueStr; valueStr = sarStandardsInfoEO.getFileIds() + "," + valueStr;
} }
sarStandardsInfoEO.setFileIds(valueStr); break; sarStandardsInfoEO.setFileIds(valueStr);
break;
default: break; default: break;
} }
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+7 -7
View File
@@ -352,9 +352,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
sarStandAttrInfoEODao.deleteStandAttrByStandId(sarStandardsInfoEO.getId()); sarStandAttrInfoEODao.deleteStandAttrByStandId(sarStandardsInfoEO.getId());
//编写预警信息 //编写预警信息
// writeWarnings(sarStandardsInfoEO); // writeWarnings(sarStandardsInfoEO);
updateCiteStand(sarStandardsInfoEO,null,"DTBJH","BDTBZBH"); // updateCiteStand(sarStandardsInfoEO,null,"DTBJH","BDTBZBH");
updateCiteStand(sarStandardsInfoEO,null,"YYBJ","BYYBJ"); // updateCiteStand(sarStandardsInfoEO,null,"YYBJ","BYYBJ");
updateRelateStand(sarStandardsInfoEO,"CBBH"); // updateRelateStand(sarStandardsInfoEO,"CBBH");
// 根据代替标准号修改被代替的标准的状态 修改为已修订状态 // 根据代替标准号修改被代替的标准的状态 修改为已修订状态
replaseStandState(sarStandardsInfoEO); replaseStandState(sarStandardsInfoEO);
// 处理属性表信息 // 处理属性表信息
@@ -366,7 +366,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
if (StringUtils.isNotBlank(sarStandardsInfoEO.getStandYear())) { if (StringUtils.isNotBlank(sarStandardsInfoEO.getStandYear())) {
number += "-" + sarStandardsInfoEO.getStandYear(); number += "-" + sarStandardsInfoEO.getStandYear();
} }
String content = "新增" + number + " 《" + sarStandardsInfoEO.getStandName() + "》"; String content = "新增" + number + " 《" + sarStandardsInfoEO.getStandName() + "》";
sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(),sarStandardsInfoEO.getStandType()+"_STAND",content); sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(),sarStandardsInfoEO.getStandType()+"_STAND",content);
// if(elasflag) { // if(elasflag) {
// // 消息队列 // // 消息队列
@@ -913,10 +913,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
//修改标准过程中，重新修改代替标准号对应的标准的被代替标准号 //修改标准过程中，重新修改代替标准号对应的标准的被代替标准号
// updateReplacedNumber(sarStandardsInfoEO,beforeSarStandardsInfo); // updateReplacedNumber(sarStandardsInfoEO,beforeSarStandardsInfo);
// 根据引用标准修改其他被引用标准 // 根据引用标准修改其他被引用标准
updateCiteStand(sarStandardsInfoEO,beforeSarStandardsInfo,"DTBJH","BDTBZBH"); // updateCiteStand(sarStandardsInfoEO,beforeSarStandardsInfo,"DTBJH","BDTBZBH");
updateCiteStand(sarStandardsInfoEO,beforeSarStandardsInfo,"YYBJ","BYYBJ"); // updateCiteStand(sarStandardsInfoEO,beforeSarStandardsInfo,"YYBJ","BYYBJ");
// 根据对应其他标准修改其他对应其他标准 // 根据对应其他标准修改其他对应其他标准
updateRelateStand(sarStandardsInfoEO,"CBBH"); // updateRelateStand(sarStandardsInfoEO,"CBBH");
// 根据代替标准号修改被代替的标准的状态 修改为已修订状态 // 根据代替标准号修改被代替的标准的状态 修改为已修订状态
replaseStandState(sarStandardsInfoEO); replaseStandState(sarStandardsInfoEO);
// 记录修改日志 // 记录修改日志