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

feat: There is no way the,

Browse Source
This commit is contained in:
super_liu
2022-01-12 23:58:15 +08:00
parent fe2949edd5
commit 2659f0a783
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java
+2 -2
View File
@@ -161,7 +161,7 @@ public class ActSarItemsBussEOService {
iSarBussionessStandService.attrInfoDetails(query); iSarBussionessStandService.attrInfoDetails(query);
Map<String, Object> attrInfoMap = query.getAttrInfoMap(); Map<String, Object> attrInfoMap = query.getAttrInfoMap();
if(attInfoMap!=null && !attInfoMap.isEmpty()){ if(attInfoMap!=null && !attInfoMap.isEmpty()){
updateStandFileFieldData(attInfoMap,attrInfoMap); // updateStandFileFieldData(attInfoMap,attrInfoMap);
resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue);
sarBussionessStand.setSarStandAttrEOStr(resData); sarBussionessStand.setSarStandAttrEOStr(resData);
} }
@@ -192,7 +192,7 @@ public class ActSarItemsBussEOService {
iSarBussionessStandService.attrInfoDetails(query); iSarBussionessStandService.attrInfoDetails(query);
Map<String, Object> attrInfoMap = query.getAttrInfoMap(); Map<String, Object> attrInfoMap = query.getAttrInfoMap();
if(attInfoMap!=null && !attInfoMap.isEmpty()){ if(attInfoMap!=null && !attInfoMap.isEmpty()){
updateStandFileFieldData(attInfoMap,attrInfoMap); // updateStandFileFieldData(attInfoMap,attrInfoMap);
resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue);
sarBussionessStand.setSarStandAttrEOStr(resData); sarBussionessStand.setSarStandAttrEOStr(resData);
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+11 -8
View File
@@ -473,15 +473,18 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
if (StringUtils.isNotBlank(attrStr)) { if (StringUtils.isNotBlank(attrStr)) {
newMap = JSONObject.fromObject(attrStr); newMap = JSONObject.fromObject(attrStr);
} }
newMap = changeMap(sarStandardsInfoEO,newMap); if(newMap != null && oldMap != null) {
oldMap = changeMap(beforeSarStandardsInfo,oldMap); newMap = changeMap(sarStandardsInfoEO,newMap);
String sortName = sysInfoEOService.getDicNamesByCodes(sarStandardsInfoEO.getStandSort()); oldMap = changeMap(beforeSarStandardsInfo,oldMap);
String number = sortName + " " + sarStandardsInfoEO.getStandCode(); String sortName = sysInfoEOService.getDicNamesByCodes(sarStandardsInfoEO.getStandSort());
if (StringUtils.isNotBlank(sarStandardsInfoEO.getStandYear())) { String number = sortName + " " + sarStandardsInfoEO.getStandCode();
number += "-" + sarStandardsInfoEO.getStandYear(); if (StringUtils.isNotBlank(sarStandardsInfoEO.getStandYear())) {
number += "-" + sarStandardsInfoEO.getStandYear();
}
String content = number + " 《" + sarStandardsInfoEO.getStandName() + "》";
sarUpdLogEOService.createUpdateLog(SarTypeEnum.BUSINESS.getValue(),sarStandardsInfoEO.getId(),oldMap,newMap,content);
} }
String content = number + " 《" + sarStandardsInfoEO.getStandName() + "》";
sarUpdLogEOService.createUpdateLog(SarTypeEnum.BUSINESS.getValue(),sarStandardsInfoEO.getId(),oldMap,newMap,content);
} }
public Map<String,Object> changeMap (SarBussionessStand sarStandardsInfoEO,Map<String,Object> map) { public Map<String,Object> changeMap (SarBussionessStand sarStandardsInfoEO,Map<String,Object> map) {