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

优化企标导入

Browse Source
This commit is contained in:
SUNJIABIN
2023-03-28 18:18:41 +08:00
parent bfea9a313d
commit fdbd2a3336
3 changed files with 51 additions and 64 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
+31 -38
View File
@@ -193,13 +193,6 @@ public class ActSarItemsEOService {
String resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue);
sarStandardsInfoEO.setSarStandAttrEOStr(resData);
QueryWrapper<SarStandardsInfo> wrapper=new QueryWrapper<>();
wrapper.eq(null!=sarStandardsInfoEO.getStandName(),"STAND_NAME",sarStandardsInfoEO.getStandName())
.eq(null!=sarStandardsInfoEO.getStandNumber(),"STAND_NUMBER",sarStandardsInfoEO.getStandNumber());
Integer s=sarStandardsInfoEOService.count(wrapper);
if (s>0){
throw new AdcDaBaseException("当前标准编号和中文名称已存在");
}
// 根据标准号判断数据是否已存在
//2021年4月9日 此处检查当前是否存在standId
String standnumber = "";
@@ -254,37 +247,37 @@ public class ActSarItemsEOService {
sarStandAttrInfoEOService.updateStandInfo(sarStandardsInfoEO.getId(),"XGLC",relatePro);
String content = "新增一条相关流程:" +prcName+" "+prcNum;
sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(),standType+"_STAND",content);
}else if (standlist != null && !standlist.isEmpty()) {//Id不存在，但是标准号存在的情况
String standId = standlist.get(0).getId();
SarStandardsInfo query = new SarStandardsInfo();
query.setId(standId);
sarStandardsInfoEOService.attrInfoDetails(query);
Map<String, Object> attrInfoMap = query.getAttrInfoMap();
if(attInfoMap!=null && !attInfoMap.isEmpty()){
updateStandFileFieldData(attInfoMap,attrInfoMap);
resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue);
sarStandardsInfoEO.setSarStandAttrEOStr(resData);
}
// 查询原相关流程
String relatePro = sarStandAttrInfoEOService.selectFieldValByStandId("XGLC",standId);
if (StringUtils.isNotBlank(relatePro)) {
String[] processSplit = relatePro.split(",");
Set<String> processSet = new HashSet<>();
for(String sData:processSplit){
processSet.add(sData);
}
processSet.add(prcNum);
relatePro = StringUtils.join(processSet.toArray(), ",");
} else {
relatePro = prcNum;
}
// 编辑标准
sarStandardsInfoEO.setId(standId);
sarStandardsInfoEOService.updateSarStandardsInfo(sarStandardsInfoEO);
// 编辑相关流程
sarStandAttrInfoEOService.updateStandInfo(standId,"XGLC",relatePro);
String content = "新增一条相关流程:" +prcName+" "+prcNum;
sarUpdLogEOService.createBaseLog(standId,standType+"_STAND",content);
// }else if (standlist != null && !standlist.isEmpty()) {//Id不存在，但是标准号存在的情况
// String standId = standlist.get(0).getId();
// SarStandardsInfo query = new SarStandardsInfo();
// query.setId(standId);
// sarStandardsInfoEOService.attrInfoDetails(query);
// Map<String, Object> attrInfoMap = query.getAttrInfoMap();
// if(attInfoMap!=null && !attInfoMap.isEmpty()){
// updateStandFileFieldData(attInfoMap,attrInfoMap);
// resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue);
// sarStandardsInfoEO.setSarStandAttrEOStr(resData);
// }
// // 查询原相关流程
// String relatePro = sarStandAttrInfoEOService.selectFieldValByStandId("XGLC",standId);
// if (StringUtils.isNotBlank(relatePro)) {
// String[] processSplit = relatePro.split(",");
// Set<String> processSet = new HashSet<>();
// for(String sData:processSplit){
// processSet.add(sData);
// }
// processSet.add(prcNum);
// relatePro = StringUtils.join(processSet.toArray(), ",");
// } else {
// relatePro = prcNum;
// }
// // 编辑标准
// sarStandardsInfoEO.setId(standId);
// sarStandardsInfoEOService.updateSarStandardsInfo(sarStandardsInfoEO);
// // 编辑相关流程
// sarStandAttrInfoEOService.updateStandInfo(standId,"XGLC",relatePro);
// String content = "新增一条相关流程:" +prcName+" "+prcNum;
// sarUpdLogEOService.createBaseLog(standId,standType+"_STAND",content);
} else {//标准号、ID都不存在的情况
// 新增方法
sarStandardsInfoEOService.createSarStandardsInfo(sarStandardsInfoEO);