Merge branch 'develop_migration' into 'develop_master'

Develop migration

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

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/sync/StateSync.java

@@ -149,8 +149,8 @@ public class StateSync {
         }
     }
 
-    // 月末
-//    @Scheduled(cron="0 0 1 28-31 * ?")
+    // 月末 (逻辑和 月初 一样 月末需跑一次下整月 防止特殊原因导致遗漏)
+    @Scheduled(cron="0 0 1 28-31 * ?")
 //    @Scheduled(cron="*/5 * * * * ?")
     @Async
     public void StandScheduledJobMonthEnd(){

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

@@ -1187,6 +1187,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             newCiteStand = sarStandardsInfoEO.getRelateStand();
         } else if ("DTBJH".equals(upField)) {
             newCiteStand = sarStandardsInfoEO.getReplaceStandNum();
+        }else if ("DTBZH".equals(upField)) {
+            newCiteStand = sarStandardsInfoEO.getReplaceStandNum();
         }else if ("BFDTBZ".equals(upField)) {
             newCiteStand = sarStandardsInfoEO.getReplacePartStandNum();
         }
@@ -1576,6 +1578,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
 //        updateReplacedNumber(sarStandardsInfoEO,beforeSarStandardsInfo);
         // 根据引用标准修改其他被引用标准
         updateCiteStand(sarStandardsInfoEO, null, "YYBJ", "BYYBJ");
+        /**
+         * 新增代替标准号修改其他被代替标准号
+         */
+        updateCiteStand(sarStandardsInfoEO, null, "DTBZH", "BDTBZH");
         updateCiteStand(sarStandardsInfoEO, null, "BFDTBZ", "BBFDTBZ");
         // 根据对应其他标准修改其他对应其他标准
 //        updateRelateStand(sarStandardsInfoEO, "CBBH");