调整脚本运行顺序

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java

@@ -2055,18 +2055,22 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
                 Map<String, Object> resultMap = new HashMap<>();
                 if (SystemTypeEnum.fireWaterSys.getCode().equals(String.valueOf(x.get("systemTypeCode")))) {
                     resultMap.put("name", SystemTypeEnum.fireWaterSys.getDesc());
+                    resultMap.put("code", SystemTypeEnum.fireWaterSys.getCode());
                     resultMap.put("total", x.get("sysNum"));
                     resultMap.put("alarmNum", alarmNumMap.get("waterSysNum"));
                 } else if (SystemTypeEnum.fireCAFSSys.getCode().equals(String.valueOf(x.get("systemTypeCode")))) {
                     resultMap.put("name", SystemTypeEnum.fireCAFSSys.getDesc());
+                    resultMap.put("code", SystemTypeEnum.fireCAFSSys.getCode());
                     resultMap.put("total", x.get("sysNum"));
                     resultMap.put("alarmNum", alarmNumMap.get("cafsSysNum"));
                 } else if (SystemTypeEnum.fireAlarmSys.getCode().equals(String.valueOf(x.get("systemTypeCode")))) {
                     resultMap.put("name", SystemTypeEnum.fireAlarmSys.getDesc());
+                    resultMap.put("code", SystemTypeEnum.fireAlarmSys.getCode());
                     resultMap.put("total", x.get("sysNum"));
                     resultMap.put("alarmNum", alarmNumMap.get("fireAlarmSysNum"));
                 } else {
                     resultMap.put("name", SystemTypeEnum.fireONLSys.getDesc());
+                    resultMap.put("code", SystemTypeEnum.fireONLSys.getCode());
                     resultMap.put("total", x.get("sysNum"));
                     resultMap.put("alarmNum", alarmNumMap.get("onlSysNum"));
                 }

amos-boot-system-equip/src/main/resources/changelog/wl-3.0.1.xml

@@ -3062,15 +3062,4 @@
             REPLACE INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES (133000000323, 'longitude', '经度', 'String', 132828674817, 'eq', b'0', 'r_fireControlRoom', 2581805, '2022-03-01 12:04:47');
         </sql>
     </changeSet>
-    <changeSet author="keyong" id="1668587039">
-        <preConditions onFail="MARK_RAN">
-            <tableExists tableName="wl_equipment_specific_alarm_log" />
-        </preConditions>
-        <comment>sync field</comment>
-        <sql>
-            UPDATE wl_equipment_specific_alarm_log wesal
-            SET wesal.biz_org_name = ( SELECT biz_org_name FROM wl_equipment_specific wes WHERE wes.id = wesal.equipment_specific_id ),
-                wesal.biz_org_code = ( SELECT biz_org_code FROM wl_equipment_specific wes WHERE wes.id = wesal.equipment_specific_id );
-        </sql>
-    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml

@@ -395,4 +395,15 @@
             ALTER TABLE `wl_equipment_specific_alarm_log` ADD COLUMN `biz_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机构编码' AFTER `biz_org_name`;
         </sql>
     </changeSet>
+    <changeSet author="keyong" id="1668587039">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="wl_equipment_specific_alarm_log" />
+        </preConditions>
+        <comment>sync field</comment>
+        <sql>
+            UPDATE wl_equipment_specific_alarm_log wesal
+            SET wesal.biz_org_name = ( SELECT biz_org_name FROM wl_equipment_specific wes WHERE wes.id = wesal.equipment_specific_id ),
+                wesal.biz_org_code = ( SELECT biz_org_code FROM wl_equipment_specific wes WHERE wes.id = wesal.equipment_specific_id );
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file