Merge branch '6170' into prod

fys-admin/src/main/java/com/fuyuanshen/web/controller/CaptchaController.java

@@ -157,4 +157,4 @@ public class CaptchaController {
         return captchaVo;
     }
 
-}
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceController.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuyuanshen.common.core.domain.R;
 import com.fuyuanshen.common.core.domain.model.LoginUser;
 import com.fuyuanshen.common.core.utils.file.FileUtil;
-import com.fuyuanshen.common.mybatis.core.page.PageQuery;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.common.satoken.utils.LoginHelper;
 import com.fuyuanshen.common.web.core.BaseController;

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceRepairRecordsVo.java

@@ -1,6 +1,8 @@
 package com.fuyuanshen.equipment.domain.vo;
 
 import java.util.Date;
+
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fuyuanshen.common.tenant.core.TenantEntity;
 import com.fuyuanshen.equipment.domain.DeviceRepairRecords;
@@ -34,31 +36,39 @@ public class DeviceRepairRecordsVo extends TenantEntity implements Serializable
     /**
      * 维修记录ID
      */
-    @ExcelProperty(value = "维修记录ID")
+    // @ExcelProperty(value = "维修记录ID")
     private Long recordId;
 
     /**
      * 设备ID
      */
-    @ExcelProperty(value = "设备ID")
+    // @ExcelProperty(value = "设备ID")
     private String deviceId;
 
+    /**
+     * 设备名称
+     */
+    @ExcelProperty(value = "设备名称")
+    private String deviceName;
+
     /**
      * 维修时间
      */
     @ExcelProperty(value = "维修时间")
-    private Date repairTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ColumnWidth(20)
+    private String repairTime;
 
     /**
-     * 维修部位
+     * 损坏部位
      */
-    @ExcelProperty(value = "维修部位")
+    @ExcelProperty(value = "损坏部位")
     private String repairPart;
 
     /**
-     * 维修原因
+     * 损坏原因
      */
-    @ExcelProperty(value = "维修原因")
+    @ExcelProperty(value = "损坏原因")
     private String repairReason;
 
     /**
@@ -66,12 +76,8 @@ public class DeviceRepairRecordsVo extends TenantEntity implements Serializable
      */
     @ExcelProperty(value = "维修人员")
     private String repairPerson;
-    /**
-     * 维修人员
-     */
-    @ExcelProperty(value = "设备名称")
-    private String deviceName;
+
 
     private List<DeviceRepairImagesVo> images;
 
-}
+}

fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceFenceAccessRecordMapper.xml

@@ -48,8 +48,8 @@
         r.event_time, r.event_address,
         r.create_time
         FROM device_fence_access_record r
-        LEFT JOIN device_geo_fence f ON r.fence_id = f.id
-        LEFT JOIN device d ON r.device_id = d.id
+        INNER JOIN device_geo_fence f ON r.fence_id = f.id
+        INNER JOIN device d ON r.device_id = d.id
         <where>
             <if test="bo.fenceId != null">
                 AND r.fence_id = #{bo.fenceId}