//修复bug2542 by kongfm

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -18,7 +18,7 @@
         </if>
     </select>
 
-
+    <!-- //判断是否航空器救援 如果为航空器救援则保存冗余字段 response_level_code bug2542 bykongfm  -->
     <select id="alertCalledListByAlertStatus" resultType="com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledZhDto">
         SELECT
         a.sequence_nbr sequenceNbr,
@@ -34,9 +34,9 @@
         a.coordinate_x longitude,
         a.coordinate_y latitude,
         CASE a.response_level_code
-        WHEN '243' THEN '一级'
-        WHEN '244' THEN '二级'
-        WHEN '245' THEN '三级'
+        WHEN '1164' THEN '紧急出动'
+        WHEN '1165' THEN '紧急集结'
+        WHEN '1166' THEN '原地待命'
         ELSE '' END responseLevelCode
         FROM jc_alert_called a
         where a.is_delete=0

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java

@@ -219,6 +219,16 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
             } else {
                 alertCalled.setType("1");
             }
+            // 动态表单
+            List<AlertFormValue> alertFormValuelist = alertCalledObjsDto.getAlertFormValue();
+            //判断是否航空器救援 如果为航空器救援则保存冗余字段 response_level_code bug2542 bykongfm
+            if(AlertStageEnums.HKJY.getCode().equals(alertCalled.getAlertTypeCode())) {
+                alertFormValuelist.stream().forEach(alertFormValue -> {
+                    if(alertFormValue.getFieldCode().equals("responseLevel")){
+                        alertCalled.setResponseLevelCode(alertFormValue.getFieldValueCode());
+                    }
+                });
+            }
 
             // 判断是否归并警情
             if (alertCalled.getFatherAlert() != null) {
@@ -228,8 +238,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
                 alertCalled.setAlarmType(AlertStageEnums.JQGB.getValue());
                 alertCalled.setAlarmTypeCode(AlertStageEnums.JQGB.getCode());
                 this.save(alertCalled);
-                // 动态表单
-                List<AlertFormValue> alertFormValuelist = alertCalledObjsDto.getAlertFormValue();
+
                 // 填充警情主键
                 alertFormValuelist.stream().forEach(alertFormValue -> {
                     alertFormValue.setAlertCalledId(alertCalled.getSequenceNbr());
@@ -246,9 +255,6 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
                 alertCalled.setAlarmType(AlertStageEnums.JQCB.getValue());
                 alertCalled.setAlarmTypeCode(AlertStageEnums.JQCB.getCode());
                 this.save(alertCalled);
-
-                // 动态表单
-                List<AlertFormValue> alertFormValuelist = alertCalledObjsDto.getAlertFormValue();
                 // 填充警情主键
                 alertFormValuelist.stream().forEach(alertFormValue -> {
                     alertFormValue.setAlertCalledId(alertCalled.getSequenceNbr());