Merge remote-tracking branch 'origin/developer' into developer

0389268e · kongfm · 7c4403bb · 2d4f83f6 · 0389268e
Commit 0389268e authored Oct 11, 2021 by kongfm
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

AlertCalledMapper.xml ...e-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml +4 -1

No files found.
--- a/amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml
+++ b/amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml
@@ -25,7 +25,10 @@
        a.alert_stage alertStage,
        a.call_time callTime,
        a.rescue_grid rescueGrid,
-        a.alert_type alertType,
+--         a.alert_type alertType,
+
+
+        CONCAT('【',a.alert_type,'】',IFNULL((select  field_value from  jc_alert_form_value  where jc_alert_form_value.alert_called_id =a.sequence_nbr and jc_alert_form_value.field_code='remark'),"")) alertType,
        a.alert_type_code alarmTypeCode,
        a.unit_involved unitInvolved,
        a.trapped_num trappedNum,