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-06-06 18:11:33 +08:00
parent 01a4a19a2f
commit 531344edf1
4 changed files with 102 additions and 56 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
+20 -20
View File
@@ -586,26 +586,26 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
.collect(Collectors.toList());
// 在研稿件
String strUsNew = newMap.getOrDefault("CA", "").toString()+
","+newMap.getOrDefault("GLWJ", "").toString()+
","+newMap.getOrDefault("XGD", "").toString()+
","+newMap.getOrDefault("BPG", "").toString()+
","+newMap.getOrDefault("ZQYJG", "").toString()+
","+newMap.getOrDefault("SSG", "").toString()+
","+newMap.getOrDefault("JDWJ", "").toString()+
","+newMap.getOrDefault("KWJ", "").toString()+
","+newMap.getOrDefault("XDB", "").toString()+
","+newMap.getOrDefault("ZBJBD", "").toString();
String strUsOld = oldMap.getOrDefault("CA", "").toString()+
","+oldMap.getOrDefault("GLWJ", "").toString()+
","+oldMap.getOrDefault("XGD", "").toString()+
","+oldMap.getOrDefault("BPG", "").toString()+
","+oldMap.getOrDefault("ZQYJG", "").toString()+
","+oldMap.getOrDefault("SSG", "").toString()+
","+oldMap.getOrDefault("JDWJ", "").toString()+
","+oldMap.getOrDefault("KWJ", "").toString()+
","+oldMap.getOrDefault("XDB", "").toString()+
","+oldMap.getOrDefault("ZBJBD", "").toString();
String strUsNew = verifyObj(newMap.getOrDefault("CA", "")).toString()+
","+ verifyObj(newMap.getOrDefault("GLWJ", "")).toString()+
","+ verifyObj(newMap.getOrDefault("XGD", "")).toString()+
","+ verifyObj(newMap.getOrDefault("BPG", "")).toString()+
","+ verifyObj(newMap.getOrDefault("ZQYJG", "")).toString()+
","+ verifyObj(newMap.getOrDefault("SSG", "")).toString()+
","+ verifyObj(newMap.getOrDefault("JDWJ", "")).toString()+
","+ verifyObj(newMap.getOrDefault("KWJ", "")).toString()+
","+ verifyObj(newMap.getOrDefault("XDB", "")).toString()+
","+ verifyObj(newMap.getOrDefault("ZBJBD", "")).toString();
String strUsOld = verifyObj(oldMap.getOrDefault("CA", "")).toString()+
","+ verifyObj(oldMap.getOrDefault("GLWJ", "")).toString()+
","+ verifyObj(oldMap.getOrDefault("XGD", "")).toString()+
","+ verifyObj(oldMap.getOrDefault("BPG", "")).toString()+
","+ verifyObj(oldMap.getOrDefault("ZQYJG", "")).toString()+
","+ verifyObj(oldMap.getOrDefault("SSG", "")).toString()+
","+ verifyObj(oldMap.getOrDefault("JDWJ", "")).toString()+
","+ verifyObj(oldMap.getOrDefault("KWJ", "")).toString()+
","+ verifyObj(oldMap.getOrDefault("XDB", "")).toString()+
","+ verifyObj(oldMap.getOrDefault("ZBJBD", "")).toString();
List<String> usNew = Arrays.stream(strUsNew.split(","))
.map(String::trim).collect(Collectors.toList());
List<String> usOld = Arrays.stream(strUsOld.split(","))
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+20 -20
View File
@@ -1987,26 +1987,26 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
filterDisunityFbg = filterDisunityFbg.stream().filter(s -> !s.equals("")).collect(Collectors.toList());
// 在研稿件
String strUsNew = newMap.getOrDefault("CA", "").toString()+
","+newMap.getOrDefault("GLWJ", "").toString()+
","+newMap.getOrDefault("XGD", "").toString()+
","+newMap.getOrDefault("BPG", "").toString()+
","+newMap.getOrDefault("ZQYJG", "").toString()+
","+newMap.getOrDefault("SSG", "").toString()+
","+newMap.getOrDefault("JDWJ", "").toString()+
","+newMap.getOrDefault("KWJ", "").toString()+
","+newMap.getOrDefault("XDB", "").toString()+
","+newMap.getOrDefault("ZBJBD", "").toString();
String strUsOld = oldMap.getOrDefault("CA", "").toString()+
","+oldMap.getOrDefault("GLWJ", "").toString()+
","+oldMap.getOrDefault("XGD", "").toString()+
","+oldMap.getOrDefault("BPG", "").toString()+
","+oldMap.getOrDefault("ZQYJG", "").toString()+
","+oldMap.getOrDefault("SSG", "").toString()+
","+oldMap.getOrDefault("JDWJ", "").toString()+
","+oldMap.getOrDefault("KWJ", "").toString()+
","+oldMap.getOrDefault("XDB", "").toString()+
","+oldMap.getOrDefault("ZBJBD", "").toString();
String strUsNew = verifyObj(newMap.getOrDefault("CA", "")).toString()+
","+ verifyObj(newMap.getOrDefault("GLWJ", "")).toString()+
","+ verifyObj(newMap.getOrDefault("XGD", "")).toString()+
","+ verifyObj(newMap.getOrDefault("BPG", "")).toString()+
","+ verifyObj(newMap.getOrDefault("ZQYJG", "")).toString()+
","+ verifyObj(newMap.getOrDefault("SSG", "")).toString()+
","+ verifyObj(newMap.getOrDefault("JDWJ", "")).toString()+
","+ verifyObj(newMap.getOrDefault("KWJ", "")).toString()+
","+ verifyObj(newMap.getOrDefault("XDB", "")).toString()+
","+ verifyObj(newMap.getOrDefault("ZBJBD", "")).toString();
String strUsOld = verifyObj(oldMap.getOrDefault("CA", "")).toString()+
","+ verifyObj(oldMap.getOrDefault("GLWJ", "")).toString()+
","+ verifyObj(oldMap.getOrDefault("XGD", "")).toString()+
","+ verifyObj(oldMap.getOrDefault("BPG", "")).toString()+
","+ verifyObj(oldMap.getOrDefault("ZQYJG", "")).toString()+
","+ verifyObj(oldMap.getOrDefault("SSG", "")).toString()+
","+ verifyObj(oldMap.getOrDefault("JDWJ", "")).toString()+
","+ verifyObj(oldMap.getOrDefault("KWJ", "")).toString()+
","+ verifyObj(oldMap.getOrDefault("XDB", "")).toString()+
","+ verifyObj(oldMap.getOrDefault("ZBJBD", "")).toString();
List<String> usNew = Arrays.stream(strUsNew.split(","))
.map(String::trim).collect(Collectors.toList());
List<String> usOld = Arrays.stream(strUsOld.split(","))