From b854d8d7604329dcf99584d15f83ff02076d9e07 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期四, 01 九月 2022 10:52:04 +0800
Subject: [PATCH] 假删除fix

---
 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentRepairDetail.java |   43 ++++++++++++++++++++++++++-----------------
 1 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentRepairDetail.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentRepairDetail.java
index 2568acd..572afcb 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentRepairDetail.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentRepairDetail.java
@@ -1,18 +1,17 @@
 package com.gkhy.safePlatform.equipment.entity;
 
 import java.sql.Timestamp;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gkhy.safePlatform.equipment.entity.BaseDomain;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
  * 设备维修明细(EquipmentRepairDetail)表实体类
  *
  * @author xurui
- * @since 2022-08-03 11:17:00
+ * @since 2022-08-29 08:37:54
  */
 @SuppressWarnings("serial")
 @TableName("equipment_repair_detail")
@@ -30,7 +29,7 @@
     }
 
                 //具体类型(页面左侧的导航栏使用) 0:仪器仪表信息 1:生产设备设施 2:安全设备设施  3:重点监管装置/设备
-    private Integer infoTpe;
+            private Integer infoTpe;
         
     public Integer getInfoTpe() {
         return infoTpe;
@@ -40,7 +39,7 @@
         this.infoTpe = infoTpe;
     }
                 //设备ID/外键
-    private Long equipmentId;
+            private Long equipmentId;
         
     public Long getEquipmentId() {
         return equipmentId;
@@ -50,7 +49,7 @@
         this.equipmentId = equipmentId;
     }
                 //维修负责人/外键
-    private Long repairPersonId;
+            private Long repairPersonId;
         
     public Long getRepairPersonId() {
         return repairPersonId;
@@ -60,7 +59,7 @@
         this.repairPersonId = repairPersonId;
     }
                 //维修负责人名称
-    private String repairPersonName;
+            private String repairPersonName;
         
     public String getRepairPersonName() {
         return repairPersonName;
@@ -70,8 +69,8 @@
         this.repairPersonName = repairPersonName;
     }
                 //维修开始日期
-                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Timestamp repairStartDate;
+            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+        private Timestamp repairStartDate;
         
     public Timestamp getRepairStartDate() {
         return repairStartDate;
@@ -81,8 +80,8 @@
         this.repairStartDate = repairStartDate;
     }
                 //维修结束日期
-                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Timestamp repairEndDate;
+            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+        private Timestamp repairEndDate;
         
     public Timestamp getRepairEndDate() {
         return repairEndDate;
@@ -92,7 +91,7 @@
         this.repairEndDate = repairEndDate;
     }
                 //维修负责人单位/外键
-    private Long repairPersonDepartmentId;
+            private Long repairPersonDepartmentId;
         
     public Long getRepairPersonDepartmentId() {
         return repairPersonDepartmentId;
@@ -102,7 +101,7 @@
         this.repairPersonDepartmentId = repairPersonDepartmentId;
     }
                 //维修负责人单位名称
-    private String repairPersonDepartmentName;
+            private String repairPersonDepartmentName;
         
     public String getRepairPersonDepartmentName() {
         return repairPersonDepartmentName;
@@ -112,7 +111,7 @@
         this.repairPersonDepartmentName = repairPersonDepartmentName;
     }
                 //维修情况
-    private String repairMemo;
+            private String repairMemo;
         
     public String getRepairMemo() {
         return repairMemo;
@@ -122,7 +121,7 @@
         this.repairMemo = repairMemo;
     }
                 //维修状态  1:维修中 2:已修好
-    private Integer repairStatus;
+            private Integer repairStatus;
         
     public Integer getRepairStatus() {
         return repairStatus;
@@ -132,7 +131,7 @@
         this.repairStatus = repairStatus;
     }
                 //设施异常项
-    private String exceptionInfo;
+            private String exceptionInfo;
         
     public String getExceptionInfo() {
         return exceptionInfo;
@@ -141,5 +140,15 @@
     public void setExceptionInfo(String exceptionInfo) {
         this.exceptionInfo = exceptionInfo;
     }
-            
+                        //是否删除 0:未删除 1:删除
+            private Integer delFlag;
+        
+    public Integer getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(Integer delFlag) {
+        this.delFlag = delFlag;
+    }
+    
 }
\ No newline at end of file

--
Gitblit v1.9.2