隐患台账，导出功能

danger-manage-system/src/main/java/com/zehong/system/domain/TStaningBook.java

@@ -28,11 +28,15 @@ public class TStaningBook extends BaseEntity
     private String troubleName;
 
     /** 隐患类型 */
-    @Excel(name = "隐患类型")
     private Integer troubleType;
+    @Excel(name = "隐患类型")
+    private String troubleTypeName;
+
 
     /** 隐患等级 */
     @Excel(name = "隐患等级")
+    private String troubleLevelName;
+
     private Integer troubleLevel;
 
     /** 隐患描述 */
@@ -44,9 +48,10 @@ public class TStaningBook extends BaseEntity
     private String troubleHarm;
 
     /** 隐患上报人 */
-    @Excel(name = "隐患上报人")
+
     private Long escalation;
 
+    @Excel(name = "隐患上报人")
     private String escalationName;
 
     /** 隐患上报时间 */
@@ -60,7 +65,6 @@ public class TStaningBook extends BaseEntity
     private String picture;
 
     /** 隐患附件 */
-    @Excel(name = "隐患附件")
     private String enclosure;
 
     /** 整改建议 */
@@ -81,9 +85,8 @@ public class TStaningBook extends BaseEntity
     private String investmentMaterial;
 
     /** 整改人 */
-    @Excel(name = "整改人")
     private Long rectification;
-
+    @Excel(name = "整改人")
     private String rectificationName;
 
     /** 整改后图片 */
@@ -104,8 +107,8 @@ public class TStaningBook extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
-    /** 完成时间 */
-    @Excel(name = "完成时间")
+    /** 是否完成 */
+//    @Excel(name = "是否完成")
     private Long finishDay;
 
     /** 复查图片 */
@@ -123,23 +126,49 @@ public class TStaningBook extends BaseEntity
     private String inspectResult;
 
     /** 复查人 */
-    @Excel(name = "复查人")
-    private Long personLiable;
 
+    private Long personLiable;
+    @Excel(name = "复查人")
     private String personLiableName;
 
     /** 隐患状态  */
-    @Excel(name = "隐患状态 ")
+
     private Integer state;
 
+    public String getTroubleTypeName() {
+        return troubleTypeName;
+    }
+
+    public void setTroubleTypeName(String troubleTypeName) {
+        this.troubleTypeName = troubleTypeName;
+    }
+
+    public String getTroubleLevelName() {
+        return troubleLevelName;
+    }
+
+    public void setTroubleLevelName(String troubleLevelName) {
+        this.troubleLevelName = troubleLevelName;
+    }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
+
+    @Excel(name = "隐患状态 ")
+    private String stateName;
     /** 部门id */
-    @Excel(name = "部门id")
-    private Long deptId;
 
+    private Long deptId;
+    @Excel(name = "所属部门名称")
     private String deptName;
 
     /** 任务id */
-    @Excel(name = "任务id")
+//    @Excel(name = "任务id")
     private Long workId;
 
     /** 删除 0否 1是 */

danger-manage-system/src/main/resources/mapper/system/TStaningBookMapper.xml

@@ -40,6 +40,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createId" column="create_id" />
         <result property="isDel"    column="is_del"    />
         <result property="deptName"    column="deptName"    />
+        <result property="troubleLevelName"    column="troubleLevelName"    />
+        <result property="troubleTypeName"    column="troubleTypeName"    />
+        <result property="stateName"    column="stateName"    />
     </resultMap>
 
     <sql id="selectTStaningBookVo">
@@ -50,7 +53,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT b.*,s1.staff_name AS escalationName,
         s2.`staff_name` AS rectificationName,
         s3.`staff_name` AS personLiableName ,
-        d.`dept_name` AS deptName
+        d.`dept_name` AS deptName,
+        (select dict_label from sys_dict_data where dict_type='t_trouble_type' and dict_value=b.trouble_type) troubleTypeName,
+        (select dict_label from sys_dict_data where dict_type='t_trouble_level' and dict_value=b.trouble_level) troubleLevelName,
+        (case state when '0' then '待整改' when '1' then '待复查' when '2' then '已闭环' end) stateName
         FROM t_staning_book b
         LEFT JOIN sys_user s1 ON b.`escalation` = s1.`user_id`
         LEFT JOIN sys_user s2 ON b.`rectification` = s2.`user_id`