1.园区接口完成

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/upload/RUploadWorkOrderParam.java

@@ -3,6 +3,7 @@ package com.njcn.harmonic.pojo.param.upload;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.web.pojo.param.BaseParam;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -174,8 +175,16 @@ public class RUploadWorkOrderParam {
 
 
     @Data
+    @EqualsAndHashCode(callSuper = true)
     public static class RUploadWorkOrderQuery extends BaseParam {
 
+        private String orderStatus;
+
+        /**
+         * 运维单位ID
+         */
+        private String maintainerId;
+
     }
 
 

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/RUploadWorkOrderPO.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -97,26 +99,31 @@ public class RUploadWorkOrderPO {
     /**
      * 事件时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate eventTime;
 
     /**
      * 下发时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime distributeTime;
 
     /**
      * 闭环时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate closedLoopTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime ctime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime mtime;
 
     /**
      * 0.删除 1.正常
      */
-    private Boolean isDeleted;
+    private Integer isDeleted;
 
     /**
      * 3-省，4-市
@@ -136,6 +143,7 @@ public class RUploadWorkOrderPO {
     /**
      * 反馈时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate feedbackTime;
 
     /**
@@ -146,6 +154,7 @@ public class RUploadWorkOrderPO {
     /**
      * 接收时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime receiveTime;
 
     /**
@@ -161,6 +170,7 @@ public class RUploadWorkOrderPO {
     /**
      * 上报时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate uploadTime;
 
     /**
@@ -171,6 +181,7 @@ public class RUploadWorkOrderPO {
     /**
      * 要求整改时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate planRectificationTime;