提交

yq-system/src/main/java/yq/system/domain/MineHealth.java

@@ -48,13 +48,15 @@ public class MineHealth {
     private Integer temperature;
     @Excel(name = "是否允许上岗 0：否 1：是")
     private Integer isWork;
-    @Excel(name = "创建时间", width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "处理时间", width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
 
     private Long userId;
+    @Excel(name = "处理人")
+    private String userName;
     private Long warningId;
 
     private Long deptId;

yq-system/src/main/java/yq/system/domain/vo/MineHealthVo.java

@@ -55,6 +55,7 @@ public class MineHealthVo {
 
 
     private Long userId;
+    private Long warningId;
 
     private Long deptId;
 

yq-system/src/main/resources/mapper/system/MineHealthMapper.xml

@@ -18,6 +18,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="faceName"    column="face_name"    />
         <result property="facePhone"    column="face_phone"    />
         <result property="deptId"    column="dept_id"    />
+        <result property="warningId"    column="warning_id"    />
+        <result property="userName"    column="user_name"    />
+        <result property="userId"    column="user_id"    />
         <result property="deptName"    column="dept_name"    />
         <result property="age"    column="age"    />
     </resultMap>
@@ -34,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             mh.is_work,
             mh.create_time,
             mh.user_id,
+            mh.user_name,
             mh.warning_id,
             mf.face_name,
             mf.face_phone ,
@@ -61,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="hr != null "> and mh.hr = #{hr}</if>
             <if test="hrv != null "> and mh.hrv = #{hrv}</if>
             <if test="userId != null "> and mh.user_id = #{userId}</if>
+            <if test="userName != null  and userName != ''"> and mh.user_name like concat('%', #{userName}, '%')</if>
             <if test="warningId != null "> and mh.waring_id = #{warningId}</if>
             <if test="temperature != null  and temperature != ''"> and mh.temperature = #{temperature}</if>
             <if test="isWork != null "> and mf.is_work = #{isWork}</if>