巡检日报基础接口

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/DailyInspectionReport.java

@@ -27,7 +27,7 @@ public class DailyInspectionReport extends TenantEntity {
      * 记录唯一标识符
      */
     @TableId(value = "id")
-    private Long id;
+    private String id;
 
     /**
      * 项目名称
@@ -47,6 +47,7 @@ public class DailyInspectionReport extends TenantEntity {
     /**
      * 巡检时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date inspectionTime;
 
     /**
@@ -72,7 +73,7 @@ public class DailyInspectionReport extends TenantEntity {
     /**
      * 巡检情况
      */
-    private Long inspectionStatus;
+    private String inspectionStatus;
 
     /**
      * 平台在线率

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkOrderInfo.java

@@ -76,6 +76,9 @@ public class WorkOrderInfo extends TenantEntity {
      */
     private String repairerId;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date repairTime;
+
     /**
      * 是否事故 (0: 否, 1: 是)
      */

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/ContractInfoBo.java

@@ -14,7 +14,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 /**
  * 合同信息业务对象 contract_info
  *
- * @author Lion Li
+ * @author gejunhao
  * @date 2025-03-26
  */
 @Data

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/DailyInspectionReportBo.java

@@ -26,7 +26,7 @@ public class DailyInspectionReportBo extends BaseEntity {
      * 记录唯一标识符
      */
     @NotNull(message = "记录唯一标识符不能为空", groups = { EditGroup.class })
-    private Long id;
+    private String id;
 
     /**
      * 项目名称
@@ -44,12 +44,13 @@ public class DailyInspectionReportBo extends BaseEntity {
      * 类型
      */
     @NotNull(message = "类型不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long type;
+    private String type;
 
     /**
      * 巡检时间
      */
     @NotNull(message = "巡检时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date inspectionTime;
 
     /**
@@ -67,7 +68,7 @@ public class DailyInspectionReportBo extends BaseEntity {
     /**
      * 附件
      */
-    @NotBlank(message = "附件不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "附件不能为空", groups = { AddGroup.class, EditGroup.class })
     private String attachment;
 
     /**
@@ -80,7 +81,7 @@ public class DailyInspectionReportBo extends BaseEntity {
      * 巡检情况
      */
     @NotNull(message = "巡检情况不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long inspectionStatus;
+    private String inspectionStatus;
 
     /**
      * 平台在线率
@@ -97,7 +98,7 @@ public class DailyInspectionReportBo extends BaseEntity {
     /**
      * 巡检照片
      */
-    @NotBlank(message = "巡检照片不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "巡检照片不能为空", groups = { AddGroup.class, EditGroup.class })
     private String inspectionPhoto;
 
 

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkOrderInfoBo.java

@@ -2,6 +2,7 @@ package org.dromara.platform.domain.bo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
@@ -12,6 +13,8 @@ import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.platform.domain.WorkOrderInfo;
 
+import java.util.Date;
+
 /**
  * 工单信息业务对象 work_order_info
  *
@@ -43,11 +46,14 @@ public class WorkOrderInfoBo extends BaseEntity {
     private String repairer;
 
     /**
-     * 保修人员ID
+     * 报修人员ID
      */
-    @NotBlank(message = "保修人员ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "报修人员ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private String repairerId;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date repairTime;
+
     /**
      * 是否事故 (0: 否, 1: 是)
      */

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/DailyInspectionReportVo.java

@@ -34,7 +34,7 @@ public class DailyInspectionReportVo implements Serializable {
      * 记录唯一标识符
      */
     @ExcelProperty(value = "记录唯一标识符")
-    private Long id;
+    private String id;
 
     /**
      * 项目名称
@@ -52,12 +52,13 @@ public class DailyInspectionReportVo implements Serializable {
      * 类型
      */
     @ExcelProperty(value = "类型")
-    private Long type;
+    private String type;
 
     /**
      * 巡检时间
      */
     @ExcelProperty(value = "巡检时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date inspectionTime;
 
     /**
@@ -88,7 +89,7 @@ public class DailyInspectionReportVo implements Serializable {
      * 巡检情况
      */
     @ExcelProperty(value = "巡检情况")
-    private Long inspectionStatus;
+    private String inspectionStatus;
 
     /**
      * 平台在线率

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderInfoVo.java

@@ -1,5 +1,6 @@
 package org.dromara.platform.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.dromara.common.translation.annotation.Translation;
 import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.platform.domain.WorkOrderInfo;
@@ -51,9 +52,13 @@ public class WorkOrderInfoVo implements Serializable {
     /**
      * 保修人员ID
      */
-    @ExcelProperty(value = "保修人员ID")
+    @ExcelProperty(value = "报修人员ID")
     private String repairerId;
 
+    @ExcelProperty(value = "报修时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date repairTime;
+
     /**
      * 是否事故 (0: 否, 1: 是)
      */