Merge branch 'develop_3' into 'develop_master'

Develop 3

See merge request LiuChao/foton-slrs-system-rest!390

adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java

@@ -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":

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java

@@ -186,6 +186,9 @@ public class SarStandardsInfo extends BaseEntity {
     private String sarStandAttrEOStr; //新增修改时属性表信息
     @TableField(exist = false)
     private String menuId; //目录ID
+
+    @TableField(exist = false)
+    private String menuIds; //目录ID
     @TableField(exist = false)
     private int upReplaceNumFlag; //记录是否修改了替代文件号
     @TableField(exist = false)

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java

@@ -814,13 +814,16 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         sarStandardsInfoEO.setCreationTime(new Date());
         sarStandardsInfoEO.setModifyTime(new Date());
         //根据新建标准所在目录，确定此处是否需要在标准目录关联表中插入数据
-        if (StringUtils.isNotEmpty(sarStandardsInfoEO.getMenuId())) {
+        if (StringUtils.isNotEmpty(sarStandardsInfoEO.getMenuIds())) {
-            SarStandMenu sarStandMenuEO = new SarStandMenu();
+
-            sarStandMenuEO.setStandId(sarStandardsInfoEO.getId());
+            for (String menuId : sarStandardsInfoEO.getMenuIds().split(",")) {
-            sarStandMenuEO.setMenuId(sarStandardsInfoEO.getMenuId());
+                SarStandMenu sarStandMenuEO = new SarStandMenu();
-            sarStandMenuEO.setValidFlag(ValueStateEnum.VALUE_TRUE.getValue());
+                sarStandMenuEO.setStandId(sarStandardsInfoEO.getId());
-            sarStandMenuEO.setId(UUIDUtils.randomUUID20());
+                sarStandMenuEO.setMenuId(menuId);
-            sarStandMenuEODao.insert(sarStandMenuEO);
+                sarStandMenuEO.setValidFlag(ValueStateEnum.VALUE_TRUE.getValue());
+                sarStandMenuEO.setId(UUIDUtils.randomUUID20());
+                sarStandMenuEODao.insert(sarStandMenuEO);
+            }
         }
         // 根据其他字段，生成标准状态
         updateStandState(sarStandardsInfoEO, null);
@@ -1408,6 +1411,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         sarStandardsInfoEO.setStandState(resultState);
     }
 
+    @Autowired
+    private ISarStandardsInfoService sarStandardsInfoEOService;
+
+
     /***
      * @Description: 修改标准
      * @Author: yangxuenan
@@ -1458,6 +1465,27 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         // 修改属性表数据
         sarStandAttrInfoEODao.deleteStandAttrByStandId(standId);
         createStandAttrInfo(sarStandardsInfoEO);
+        /**
+         * 编辑体系目录
+         */
+
+        if (StringUtils.isNotEmpty(sarStandardsInfoEO.getMenuIds())) {
+
+            for (String menuId : sarStandardsInfoEO.getMenuIds().split(",")) {
+                SarStandardsInfoEOPage standardsInfoEO = new SarStandardsInfoEOPage();
+                standardsInfoEO.setMenuId(menuId);
+                standardsInfoEO.setIdlist(new String[]{sarStandardsInfoEO.getId()});
+
+
+                try {
+                    sarStandardsInfoEOService.updateStandardsMenu(standardsInfoEO);
+                }catch (NullPointerException e){
+                    sarStandardsInfoEOService.updateStandInfo(standardsInfoEO);
+                }
+            }
+        }
+
+
         //编写预警信息
 //        writeWarnings(sarStandardsInfoEO);
         //修改标准过程中，重新修改代替标准号对应的标准的被代替标准号