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, 跑跑跑 跑数据 重置es

Browse Source
This commit is contained in:
super_liu
2022-03-08 16:33:33 +08:00
parent f1ac00a8dc
commit c1eeea3f1f
19 changed files with 2190 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+5 -5
View File
@@ -225,7 +225,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
createStandAttrInfo(sarBussionessStandEO);
}
// 增加关联事件
String sortName = sysInfoEOService.getDicNamesByCodes(sarBussionessStandEO.getStandSort());
String sortName = sysInfoEOService.getDicNamesByCodes(sarBussionessStandEO.getStandSort(),"JKSADFH564S");
String number = sortName + " " + sarBussionessStandEO.getStandCode();
if (StringUtils.isNotBlank(sarBussionessStandEO.getStandYear())) {
number += "-" + sarBussionessStandEO.getStandYear();
@@ -394,7 +394,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
}
} else {
List<String> valArr = Arrays.asList(value.split(","));
value = dicTypeEODao.getDicNamesByCodes(valArr);
value = dicTypeEODao.getDicNamesByCodes(valArr,"");
}
entry.setValue(value);
}
@@ -530,7 +530,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
if(newMap != null && oldMap != null) {
newMap = changeMap(sarStandardsInfoEO,newMap);
oldMap = changeMap(beforeSarStandardsInfo,oldMap);
String sortName = sysInfoEOService.getDicNamesByCodes(sarStandardsInfoEO.getStandSort());
String sortName = sysInfoEOService.getDicNamesByCodes(sarStandardsInfoEO.getStandSort(),"JKSADFH564S");
String number = sortName + " " + sarStandardsInfoEO.getStandCode();
if (StringUtils.isNotBlank(sarStandardsInfoEO.getStandYear())) {
number += "-" + sarStandardsInfoEO.getStandYear();
@@ -886,7 +886,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
}else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListBuss != null && InitStandAttrUtil.selectionFieldListBuss.size() > 0 && InitStandAttrUtil.selectionFieldListBuss.contains(name)) {
value = entry.getValue().toString();
List<String> valArr = Arrays.asList(value.split(","));
value = dicTypeEODao.getDicNamesByCodes(valArr);
value = dicTypeEODao.getDicNamesByCodes(valArr,"");
Optional.ofNullable(value)
.ifPresent(val->{
@@ -1124,7 +1124,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
valArr = Arrays.asList(value.split(","));
}
if(!valArr.isEmpty()){
value = dicTypeEODao.getDicNamesByCodes(valArr);
value = dicTypeEODao.getDicNamesByCodes(valArr,"");
}
}
entry.setValue(value);