Merge branch 'develop_migration' into 'develop_master'

Develop migration See merge request LiuChao/foton-slrs-system-rest!214
2021-11-01 18:03:47 +08:00
parent d42d9f34f4 8af54bab9c
commit 3cd3266899
16 changed files with 1315 additions and 45 deletions
@@ -639,15 +639,17 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
            }
            //编写预警信息
 //            writeWarnings(sarStandardsInfoEO);
+            // 处理属性表信息
+            if (StringUtils.isNotBlank(sarStandardsInfoEO.getSarStandAttrEOStr())) {
+                createStandAttrInfo(sarStandardsInfoEO);
+            }
+
            updateCiteStand(sarStandardsInfoEO, null, "YYBJ", "BYYBJ");
            updateCiteStand(sarStandardsInfoEO, null, "BFDTBZ", "BBFDTBZ");
 //            updateRelateStand(sarStandardsInfoEO, "CBBH");
            // 根据代替标准号修改被代替的标准的状态  修改为已修订状态
            replaseStandState(sarStandardsInfoEO);
-            // 处理属性表信息
-            if (StringUtils.isNotBlank(sarStandardsInfoEO.getSarStandAttrEOStr())) {
-                createStandAttrInfo(sarStandardsInfoEO);
-            }
+
            // 增加关联事件
            String number = sarStandardsInfoEO.getStandSort() + " " + sarStandardsInfoEO.getStandNumber();
            if (StringUtils.isNotBlank(sarStandardsInfoEO.getStandYear())) {