报警信息查询

module_tpm/src/main/java/org/jeecg/modules/tpmMessageAlarm/entity/TpmMessageAlarm.java

@@ -113,7 +113,8 @@ public class TpmMessageAlarm implements Serializable {
     @ApiModelProperty(value = "处理日期")
     private java.util.Date handletime;
 	/**处理人*/
-	@Excel(name = "处理人", width = 15)
+    @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
+    @Excel(name = "处理人", width = 15)
     @ApiModelProperty(value = "处理人")
     private java.lang.String handleuser;
 	/**处理信息*/

module_tpm/src/main/java/org/jeecg/modules/tpmMessageAlarm/mapper/xml/TpmMessageAlarmMapper.xml

@@ -48,11 +48,12 @@
         from tpm_message_alarm as s
         left join tpm_equipment as e on s.equipmentid=e.id
         <where>
-            <if test="tpmMessageAlarm.equipmentname != null and tpmMessageAlarm.equipmentname != ''"> and e.equipmentname like concat('%', #{equipmentname}, '%')</if>
-            <if test="tpmMessageAlarm.alarmtime != null "> and s.day = DATE_FORMAT(#{alarmtime}, '%Y-%m-%d')</if>
-            <if test="tpmMessageAlarm.alarmtype != null  and tpmMessageAlarm.alarmtype != ''"> and s.alarmtype = #{alarmtype}</if>
-            <if test="tpmMessageAlarm.alarmlevel != null  and tpmMessageAlarm.alarmlevel != ''"> and s.alarmlevel = #{alarmlevel}</if>
-            <if test="tpmMessageAlarm.status != null"> and s.status = #{status}</if>
+            <if test="tpmMessageAlarm.equipmentname != null and tpmMessageAlarm.equipmentname != ''"> and e.equipmentname like concat('%', #{tpmMessageAlarm.equipmentname}, '%')</if>
+            <if test="tpmMessageAlarm.equipmentid != null and tpmMessageAlarm.equipmentid != ''"> and e.id = #{tpmMessageAlarm.equipmentid}</if>
+            <if test="tpmMessageAlarm.alarmtime != null "> and s.day = DATE_FORMAT(#{tpmMessageAlarm.alarmtime}, '%Y-%m-%d')</if>
+            <if test="tpmMessageAlarm.alarmtype != null  and tpmMessageAlarm.alarmtype != ''"> and s.alarmtype = #{tpmMessageAlarm.alarmtype}</if>
+            <if test="tpmMessageAlarm.alarmlevel != null  and tpmMessageAlarm.alarmlevel != ''"> and s.alarmlevel = #{tpmMessageAlarm.alarmlevel}</if>
+            <if test="tpmMessageAlarm.status != null"> and s.status = #{tpmMessageAlarm.status}</if>
         </where> order by s.alarmtime  desc
     </select>
 </mapper>