Procházet zdrojové kódy

导出数据bugfix

lengfaqiang před 2 roky
rodič
revize
91bf3d64c2

+ 3 - 3
slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/service/KwsAlarmService.java

@@ -802,7 +802,7 @@ public class KwsAlarmService {
         }
         KwsAlarm kwsAlarm = alarmMapper.selectById(detailList.get(0).getAlarmId());
         Map<String, SystemDict> dictByDictCode = commonService.getDictByDictCode(DictEnum.MODEL_PART);
-        Map<String, SystemDict> alarmType = commonService.getDictByDictCode(DictEnum.ALARM_TYPE);
+        Map<String, SystemDict> alarmType = commonService.getDictByDictCode(DictEnum.THRESHOLD_LEVEL);
         if ("1".equals(kwsAlarm.getType())) {
 
         } else {
@@ -814,8 +814,8 @@ public class KwsAlarmService {
                 }
                 ThresholdRecordDetailExportVO vo = new ThresholdRecordDetailExportVO();
                 vo.setId(detail.getId());
-                vo.setAlarmLevel(kwsAlarm.getType() == null ? null :
-                        (alarmType == null ? String.valueOf(kwsAlarm.getType()) : alarmType.get(String.valueOf(kwsAlarm.getType())).getLabel()));
+                vo.setAlarmLevel(kwsAlarm.getLevel() == null ? null :
+                        (alarmType == null ? String.valueOf(kwsAlarm.getLevel()) : alarmType.get(String.valueOf(kwsAlarm.getLevel())).getLabel()));
                 vo.setType(kwsThreshold == null ? null : (kwsThreshold.getItemName() == null ? null :
                         (dictByDictCode == null ? kwsThreshold.getItemName() :
                                 (dictByDictCode.get(kwsThreshold.getItemName()) == null ? kwsThreshold.getItemName() : dictByDictCode.get(kwsThreshold.getItemName()).getLabel()))));