Browse Source

化学品报警修改查询列表数据展示。添加日志

hanzhiwei 2 years ago
parent
commit
655bfa0c7d

+ 1 - 1
zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpUserecordServiceImpl.java

@@ -369,7 +369,7 @@ public class HxpUserecordServiceImpl implements IHxpUserecordService {
 
             Map<String,Object> subInfo = hxpUserecordMapper.selectSubInfoById(a.getSubId());
 
-            hxpAlarmRecord.setAlarmContent(subInfo.get("name") + ":化学品" + a.getChemicalName() + "领用超时未归还,请尽快确认处理。");
+            hxpAlarmRecord.setAlarmContent(subInfo.get("name") + ":化学品" + a.getChemicalName() + "领用超时未归还,请尽快确认处理111。");
             hxpAlarmRecord.setAlarmType(1);
             hxpAlarmRecord.setHasValid(1);
             hxpAlarmRecord.setAlarmMode(1);

+ 1 - 1
zd-modules/zd-chemical/src/main/resources/mapper/chemical/HxpAlarmRecordMapper.xml

@@ -63,7 +63,7 @@
     <select id="selectHxpAlarmRecordList" parameterType="com.zd.chemical.domain.vo.HxpAlarmRecordSearch"
             resultType="com.zd.chemical.domain.vo.HxpAlarmRecordVo">
         SELECT ard.`id`,ard.alarm_time alarmTime,ard.`alarm_content` alarmContent,CASE WHEN ard.alarm_mode=1 THEN '系统通知'
-        ELSE CASE WHEN ard.alarm_mode=2 THEN '声光报警' ELSE '短信通知' END END alarmMode,
+        WHEN ard.alarm_mode=2 THEN '声光报警' WHEN ard.alarm_mode=3 THEN '短信通知' ELSE '电话通知' END alarmMode,
         dt.dept_name as alarmDeptName,
         st.`name` as subName,
         ard.liable_user_ids,