'重点单位信息-消防整改审核-列表查询接口新增整改单生成时间和状态变更时间两个数据字段'

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/DemFireReformVO.java

@@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -55,8 +56,18 @@ public class DemFireReformVO  implements Serializable {
      */
     private Integer companyNature;
 
+    /**
+     * 整改单生成时间
+     */
+    private String createTime;
+
     /**
      * 整改状态（1 已接收、2 整改中、3 整改完成、4 审核不通过、5 审核通过）
      */
     private Integer reformStatus;
+
+    /**
+     * 状态变更时间
+     */
+    private String statusTime;
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/DemReformReviewVO.java

@@ -39,12 +39,12 @@ public class DemReformReviewVO  implements Serializable{
     /**
      * 发出时间
      */
-    private LocalDateTime sendTime;
+    private String sendTime;
 
     /**
      * 整改时间
      */
-    private LocalDateTime reformTime;
+    private String reformTime;
 
     /**
      * 整改相关图片或文件路径1
@@ -74,6 +74,6 @@ public class DemReformReviewVO  implements Serializable{
     /**
      * 审核时间
      */
-    private LocalDateTime reviewTime;
+    private String reviewTime;
 
 }

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemFireReformMapper.xml

@@ -20,11 +20,14 @@
         c.fire_duty_name AS fireDutyName,
         c.fire_manage_name AS fireManageName,
         b.company_nature AS companyNature,
-        a.reform_status AS reformStatus
+        DATE_FORMAT(a.send_time,'%Y-%m-%d %H:%i:%s') AS createTime,
+        a.reform_status AS reformStatus,
+        DATE_FORMAT((CASE a.reform_status WHEN '1' THEN a.send_time WHEN '2' THEN '' WHEN '3' THEN d.reform_time ELSE d.review_time END),'%Y-%m-%d %H:%i:%s') AS statusTime
         FROM
         dem_fire_reform AS a
         LEFT JOIN base_company AS b ON a.company_id = b.company_id
         LEFT JOIN base_company_person AS c ON a.company_id = c.company_id
+        LEFT JOIN dem_reform_review AS d ON a.id = d.reform_id
         <where>
             <if test="companyName != null and companyName != ''">
                 and b.company_name LIKE CONCAT(CONCAT('%',#{companyName}),'%')
@@ -45,14 +48,14 @@
         SELECT
             a.id AS reFormId,
             a.reform_part AS reformPart,
-            a.send_time AS sendTime,
-            b.reform_time AS reformTime,
+            DATE_FORMAT(a.send_time,'%Y-%m-%d %H:%i:%s') AS sendTime,
+            DATE_FORMAT(b.reform_time,'%Y-%m-%d %H:%i:%s') AS reformTime,
             b.reform_path1 AS reformPath1,
             b.reform_path2 AS reformPath2,
             b.reform_path3 AS reformPath3,
             b.reform_path4 AS reformPath4,
             b.reform_path5 AS reformPath5,
-            b.review_time AS reviewTime
+            DATE_FORMAT(b.review_time,'%Y-%m-%d %H:%i:%s') AS reviewTime
         FROM
         dem_fire_reform AS a
         LEFT JOIN dem_reform_review AS b ON a.id = b.reform_id