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

Merge remote-tracking branch 'origin/develop_master' into develop_3

Browse Source
This commit is contained in:
zhaokaiyao@91isoft.com
2021-09-17 09:32:25 +08:00
parent 7bc2d8124a 69d5a15ce4
commit 76b61d5d07
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java
+6 -1
View File
@@ -335,7 +335,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
middle=messageList; middle=messageList;
for (SarFileSplitItemsEO mis:messageList) { for (SarFileSplitItemsEO mis:messageList) {
mis.setWorkFlowShow("1"); mis.setWorkFlowShow("1");
if (mis.getItemsNum().equals("1") || mis.getItemsNum().startsWith("1.") || mis.getItemsNum().equals("2") || mis.getItemsNum().startsWith("2.") || mis.getItemsNum().equals("3") || mis.getItemsNum().startsWith("3.")){ if (mis.getItemsNum().equals("2") || mis.getItemsNum().startsWith("2.") || mis.getItemsNum().equals("3") || mis.getItemsNum().startsWith("3.")){
mis.setWorkFlowShow("0"); mis.setWorkFlowShow("0");
} }
else { else {
@@ -349,6 +349,11 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
} }
} }
} }
messageList.forEach(sarFileSplitItemsEO -> {
if (sarFileSplitItemsEO.getItemsNum().equals("1")){
sarFileSplitItemsEO.setWorkFlowShow("1");
}
});
sarFileSplitMenuEODao.insertForeach(treeList); sarFileSplitMenuEODao.insertForeach(treeList);
sarFileSplitItemsEODao.insertForeach(messageList); sarFileSplitItemsEODao.insertForeach(messageList);
sarFileSplitItemsValEODao.insertForeach(itemValList); sarFileSplitItemsValEODao.insertForeach(itemValList);