fix

ruoyi-system/src/main/java/com/ruoyi/qdtl/domain/TlInspectionLocationLog.java

@@ -1,10 +1,12 @@
 package com.ruoyi.qdtl.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -29,7 +31,7 @@ public class TlInspectionLocationLog extends BaseEntity {
     /**
      * 巡检点名称
      */
-    @Excel(name = "巡检点名称")
+    @Excel(name = "巡检点名称", width = 32)
     private String checkpointName;
 
     @Excel(name = "区域")
@@ -91,6 +93,10 @@ public class TlInspectionLocationLog extends BaseEntity {
 
     private String endTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "巡检时间", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 20)
+    private Date createTime;
+
     public void setId(Long id) {
         this.id = id;
     }
@@ -238,4 +244,14 @@ public class TlInspectionLocationLog extends BaseEntity {
     public void setAreaIds(List<String> areaIds) {
         this.areaIds = areaIds;
     }
+
+    @Override
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    @Override
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
 }

ruoyi-system/src/main/resources/mapper/qdtl/TlIncidentMapper.xml

@@ -60,7 +60,7 @@
             <if test="acceptUser != null  and acceptUser != ''">and accept_user = #{acceptUser}</if>
             <if test="acceptUserName != null  and acceptUserName != ''">and accept_user_name like concat('%', #{acceptUserName}, '%')</if>
             <if test="createByName != null  and createByName != ''">and create_by_name like concat('%', #{createByName}, '%')</if>
-            <if test="createBy != null  and createBy != ''">and create_by = #{createByName}</if>
+            <if test="createBy != null  and createBy != ''">and create_by = #{createBy}</if>
             <if test="status != null  and status != ''">and status = #{status}</if>
             <if test="dealUser != null  and dealUser != ''">and deal_user = #{dealUser}</if>
             <if test="dealUserName != null  and dealUserName != ''">and deal_user_name like concat('%', #{dealUserName}, '%')</if>