From 1305d0aa469fe7330fd2f8e9fbb10d95042571be Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期一, 10 十月 2022 12:33:36 +0800
Subject: [PATCH] 应急系统和事故管理统计接口

---
 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineMng.java |   46 +++++++++++++++++++++++++++++-----------------
 1 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineMng.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineMng.java
index fa211c7..e2e97fc 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineMng.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineMng.java
@@ -5,12 +5,13 @@
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
  * 绩效考核管理-安全考核管理(ExamineMng)表实体类
  *
  * @author xurui
- * @since 2022-08-03 10:05:37
+ * @since 2022-08-29 08:41:36
  */
 @SuppressWarnings("serial")
 @TableName("examine_mng")
@@ -28,7 +29,7 @@
     }
 
                 //绩效考核模板ID/外键
-    private Long examineTemplateId;
+            private Long examineTemplateId;
         
     public Long getExamineTemplateId() {
         return examineTemplateId;
@@ -38,7 +39,7 @@
         this.examineTemplateId = examineTemplateId;
     }
                 //考核标题
-    private String title;
+            private String title;
         
     public String getTitle() {
         return title;
@@ -48,7 +49,7 @@
         this.title = title;
     }
                 //考核项目
-    private String itemDetail;
+            private String itemDetail;
         
     public String getItemDetail() {
         return itemDetail;
@@ -58,7 +59,8 @@
         this.itemDetail = itemDetail;
     }
                 //考核日期
-    private Timestamp examineDate;
+            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+        private Timestamp examineDate;
         
     public Timestamp getExamineDate() {
         return examineDate;
@@ -68,7 +70,7 @@
         this.examineDate = examineDate;
     }
                 //总分
-    private String examineTotalNumber;
+            private String examineTotalNumber;
         
     public String getExamineTotalNumber() {
         return examineTotalNumber;
@@ -78,7 +80,7 @@
         this.examineTotalNumber = examineTotalNumber;
     }
                 //考核说明
-    private String memo;
+            private String memo;
         
     public String getMemo() {
         return memo;
@@ -88,7 +90,7 @@
         this.memo = memo;
     }
                 //考核人ID/外键
-    private Long examinePersonId;
+            private Long examinePersonId;
         
     public Long getExaminePersonId() {
         return examinePersonId;
@@ -98,7 +100,7 @@
         this.examinePersonId = examinePersonId;
     }
                 //考核人名称
-    private String examinePersonName;
+            private String examinePersonName;
         
     public String getExaminePersonName() {
         return examinePersonName;
@@ -108,7 +110,7 @@
         this.examinePersonName = examinePersonName;
     }
                 //被考核人ID/外键（可能有多个，用逗号隔开）
-    private String beExaminedPersonId;
+            private String beExaminedPersonId;
         
     public String getBeExaminedPersonId() {
         return beExaminedPersonId;
@@ -117,8 +119,8 @@
     public void setBeExaminedPersonId(String beExaminedPersonId) {
         this.beExaminedPersonId = beExaminedPersonId;
     }
-                //被考核人名称
-    private String beExaminedPersonName;
+                //被考核人名称（可能有多个，用逗号隔开）
+            private String beExaminedPersonName;
         
     public String getBeExaminedPersonName() {
         return beExaminedPersonName;
@@ -128,7 +130,7 @@
         this.beExaminedPersonName = beExaminedPersonName;
     }
                 //考核部门ID/外键（可能有多个，用逗号隔开）
-    private Long examineDepartmentId;
+            private Long examineDepartmentId;
         
     public Long getExamineDepartmentId() {
         return examineDepartmentId;
@@ -138,7 +140,7 @@
         this.examineDepartmentId = examineDepartmentId;
     }
                 //被考核部门ID/外键
-    private Long beExaminedDepartmentId;
+            private Long beExaminedDepartmentId;
         
     public Long getBeExaminedDepartmentId() {
         return beExaminedDepartmentId;
@@ -148,7 +150,7 @@
         this.beExaminedDepartmentId = beExaminedDepartmentId;
     }
                 //附件
-    private String extraFile;
+            private String extraFile;
         
     public String getExtraFile() {
         return extraFile;
@@ -158,7 +160,7 @@
         this.extraFile = extraFile;
     }
                 //各个考核项目的具体得分，json格式。
-    private String numberDetailJson;
+            private String numberDetailJson;
         
     public String getNumberDetailJson() {
         return numberDetailJson;
@@ -167,5 +169,15 @@
     public void setNumberDetailJson(String numberDetailJson) {
         this.numberDetailJson = numberDetailJson;
     }
-            
+                        //是否删除 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