From 0414ddb0b2b3a7199ae6181a770f97ac140dbd73 Mon Sep 17 00:00:00 2001
From: zhangf <1603559716@qq.com>
Date: 星期三, 08 五月 2024 16:46:22 +0800
Subject: [PATCH] spi统计

---
 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentRepairDetailQueryCriteria.java |   72 ++++++++++++++++++++++--------------
 1 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentRepairDetailQueryCriteria.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentRepairDetailQueryCriteria.java
index ceed9a3..f0ac251 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentRepairDetailQueryCriteria.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentRepairDetailQueryCriteria.java
@@ -1,47 +1,63 @@
 package com.gkhy.safePlatform.equipment.model.dto.req;
 
 import java.sql.Timestamp;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gkhy.safePlatform.equipment.annotation.Query;
 
 public class EquipmentRepairDetailQueryCriteria {
-        
+
     @Query()
     private Long id;
-    //具体类型(页面左侧的导航栏使用) 0:仪器仪表信息 1:生产设备设施 2:安全设备设施  3:重点监管装置/设备    
+    //具体类型(页面左侧的导航栏使用) 0:仪器仪表信息 1:生产设备设施 2:安全设备设施  3:重点监管装置/设备
     @Query()
     private Integer infoTpe;
-    //设备ID/外键    
+    //设备ID/外键
     @Query()
     private Long equipmentId;
-    //维修负责人/外键    
+    //维修负责人/外键
     @Query()
     private Long repairPersonId;
-    //维修开始日期    
+    //维修开始日期
     @Query()
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Timestamp repairStartDate;
-    //维修结束日期    
+    //维修结束日期
     @Query()
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Timestamp repairEndDate;
-    //维修负责人单位/外键    
+    //维修负责人单位/外键
     @Query()
     private Long repairPersonDepartmentId;
-    //维修情况    
+    //维修情况
     @Query()
     private String repairMemo;
-    //维修状态  1:维修中 2:已修好    
+    //维修状态  1:维修中 2:已修好
     @Query()
-    private Integer repairStatus;
-    //设施异常项    
+    private Byte repairStatus;
+    //设施异常项
     @Query()
     private String exceptionInfo;
-    //创建日期    
+    //创建日期
     @Query()
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Timestamp createTime;
-    //更新日期    
+    //更新日期
     @Query()
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Timestamp updateTime;
+    //是否删除 0:未删除 1:删除
+    @Query()
+    private Integer delFlag = 0;
+    public Integer getDelFlag() {
+        return delFlag;
+    }
 
-            
+    public void setDelFlag(Integer delFlag) {
+        this.delFlag = delFlag;
+    }
+
+
     public Long getId() {
         return id;
     }
@@ -49,7 +65,7 @@
     public void setId(Long id) {
         this.id = id;
     }
-    //具体类型(页面左侧的导航栏使用) 0:仪器仪表信息 1:生产设备设施 2:安全设备设施  3:重点监管装置/设备        
+    //具体类型(页面左侧的导航栏使用) 0:仪器仪表信息 1:生产设备设施 2:安全设备设施  3:重点监管装置/设备
     public Integer getInfoTpe() {
         return infoTpe;
     }
@@ -57,7 +73,7 @@
     public void setInfoTpe(Integer infoTpe) {
         this.infoTpe = infoTpe;
     }
-    //设备ID/外键        
+    //设备ID/外键
     public Long getEquipmentId() {
         return equipmentId;
     }
@@ -65,7 +81,7 @@
     public void setEquipmentId(Long equipmentId) {
         this.equipmentId = equipmentId;
     }
-    //维修负责人/外键        
+    //维修负责人/外键
     public Long getRepairPersonId() {
         return repairPersonId;
     }
@@ -73,7 +89,7 @@
     public void setRepairPersonId(Long repairPersonId) {
         this.repairPersonId = repairPersonId;
     }
-    //维修开始日期        
+    //维修开始日期
     public Timestamp getRepairStartDate() {
         return repairStartDate;
     }
@@ -81,7 +97,7 @@
     public void setRepairStartDate(Timestamp repairStartDate) {
         this.repairStartDate = repairStartDate;
     }
-    //维修结束日期        
+    //维修结束日期
     public Timestamp getRepairEndDate() {
         return repairEndDate;
     }
@@ -89,7 +105,7 @@
     public void setRepairEndDate(Timestamp repairEndDate) {
         this.repairEndDate = repairEndDate;
     }
-    //维修负责人单位/外键        
+    //维修负责人单位/外键
     public Long getRepairPersonDepartmentId() {
         return repairPersonDepartmentId;
     }
@@ -97,7 +113,7 @@
     public void setRepairPersonDepartmentId(Long repairPersonDepartmentId) {
         this.repairPersonDepartmentId = repairPersonDepartmentId;
     }
-    //维修情况        
+    //维修情况
     public String getRepairMemo() {
         return repairMemo;
     }
@@ -105,15 +121,15 @@
     public void setRepairMemo(String repairMemo) {
         this.repairMemo = repairMemo;
     }
-    //维修状态  1:维修中 2:已修好        
-    public Integer getRepairStatus() {
+    //维修状态  1:维修中 2:已修好
+    public Byte getRepairStatus() {
         return repairStatus;
     }
 
-    public void setRepairStatus(Integer repairStatus) {
+    public void setRepairStatus(Byte repairStatus) {
         this.repairStatus = repairStatus;
     }
-    //设施异常项        
+    //设施异常项
     public String getExceptionInfo() {
         return exceptionInfo;
     }
@@ -121,7 +137,7 @@
     public void setExceptionInfo(String exceptionInfo) {
         this.exceptionInfo = exceptionInfo;
     }
-    //创建日期        
+    //创建日期
     public Timestamp getCreateTime() {
         return createTime;
     }
@@ -129,7 +145,7 @@
     public void setCreateTime(Timestamp createTime) {
         this.createTime = createTime;
     }
-    //更新日期        
+    //更新日期
     public Timestamp getUpdateTime() {
         return updateTime;
     }
@@ -137,4 +153,4 @@
     public void setUpdateTime(Timestamp updateTime) {
         this.updateTime = updateTime;
     }
-}
\ No newline at end of file
+}

--
Gitblit v1.9.2