终端周期检测代码调整

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/CheckDeviceParam.java

@@ -43,4 +43,10 @@ public class CheckDeviceParam extends BaseParam implements Serializable {
     @ApiModelProperty(value = "描述")
     private String description;
 
+    @ApiModelProperty(value = "本次定检时间")
+    private String nowCheckTime;
+
+    @ApiModelProperty(value = "状态 0：未处理 1：已处理")
+    private Integer state;
+
 }

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/CheckDevice.java

@@ -36,11 +36,17 @@ public class CheckDevice extends BaseEntity implements Serializable {
     private String deviceId;
 
     /**
-     * 定检时间
+     * 原来定检时间
      */
     @MppMultiId("check_time")
     private LocalDate checkTime;
 
+    /**
+     * 本次定检时间
+     */
+    @MppMultiId("now_check_time")
+    private LocalDate nowCheckTime;
+
     /**
      * 逾期天数
      */
@@ -66,6 +72,11 @@ public class CheckDevice extends BaseEntity implements Serializable {
      */
     private Integer status;
 
+    /**
+     * 状态 0：未处理 1：已处理
+     */
+    private Integer state;
+
     /**
      * 描述
      */

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/CheckDeviceVo.java

@@ -1,11 +1,13 @@
 package com.njcn.supervision.pojo.vo.device;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.njcn.db.bo.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 
 /**
  * <p>
@@ -36,6 +38,14 @@ public class CheckDeviceVo extends BaseEntity implements Serializable {
     @ApiModelProperty("装置名称")
     private String deviceName;
 
+    @ApiModelProperty("本次定检时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate thisTimeCheck;
+
+    @ApiModelProperty("下次定检时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate nextTimeCheck;
+
     @ApiModelProperty("逾期天数")
     private Integer overdueDay;