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_master

Browse Source
This commit is contained in:
yuezhihang
2022-01-24 22:22:39 +08:00
parent d2dfa6b2b0 b992c47c94
commit 3c295a6e3e
10 changed files with 430 additions and 7 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
+4
View File
@@ -199,8 +199,11 @@ public class ActSarItemsEOService {
List<SarStandardsInfo> standlist = sarStandardsInfoEOService.selectStandardsByStandnumber(standnumber, sarStandardsInfoEO.getStandType());
if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "INLAND".equals(sarStandardsInfoEO.getStandType())) {
sarStandardsInfoEO.setMenuId("64df1d5522bb49c09af2");
sarStandardsInfoEO.setMenuIds("64df1d5522bb49c09af2,"+sarStandardsInfoEO.getMenuIds());
sarStandardsInfoEO.setCountry("CN");
} else if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "FOREIGN".equals(sarStandardsInfoEO.getStandType())) {
sarStandardsInfoEO.setMenuIds("22179d54d4e640098e29,"+sarStandardsInfoEO.getMenuIds());
sarStandardsInfoEO.setMenuId("22179d54d4e640098e29");
}
//此处判断是否是带入的标准
@@ -1109,6 +1112,7 @@ public class ActSarItemsEOService {
case "standSort": sarStandardsInfoEO.setStandSort(valueStr); break;
case "standState": sarStandardsInfoEO.setStandState(valueStr); break;
case "menuId": sarStandardsInfoEO.setMenuId(valueStr); break;
case "menuIds": sarStandardsInfoEO.setMenuIds(valueStr); break;
case "textStatus": sarStandardsInfoEO.setTextStatus(valueStr); break;
case "synopsis": sarStandardsInfoEO.setSynopsis(valueStr); break;
case "fileWord":