From da981624e169b181b170e5d92986e190b9ff8052 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 22 八月 2022 10:33:24 +0800
Subject: [PATCH] 目标fix

---
 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java |   48 ++++++++++++++++++++++++++++--------------------
 1 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java
index bd836e3..f703c92 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java
@@ -1,18 +1,17 @@
 package com.gkhy.safePlatform.targetDuty.entity;
 
 import java.sql.Timestamp;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gkhy.safePlatform.targetDuty.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;
 
 /**
  * 目标指标(TargetMng)表实体类
  *
  * @author xurui
- * @since 2022-07-20 11:49:22
+ * @since 2022-08-22 10:14:22
  */
 @SuppressWarnings("serial")
 @TableName("target_mng")
@@ -30,18 +29,17 @@
     }
 
                 //安全目标指标
-    private String qName;
-
-    public String getqName() {
+            private String qName;
+        
+    public String getQName() {
         return qName;
     }
 
-    public void setqName(String qName) {
+    public void setQName(String qName) {
         this.qName = qName;
     }
-
-    //目标指标编号
-    private String indexNum;
+                //目标指标编号
+            private String indexNum;
         
     public String getIndexNum() {
         return indexNum;
@@ -51,7 +49,7 @@
         this.indexNum = indexNum;
     }
                 //年度
-    private String year;
+            private String year;
         
     public String getYear() {
         return year;
@@ -61,7 +59,7 @@
         this.year = year;
     }
                 //指标值
-    private String value;
+            private String value;
         
     public String getValue() {
         return value;
@@ -71,7 +69,7 @@
         this.value = value;
     }
                 //指标级别 1:公司级 2:部门分厂级 3:工段班组级
-    private Integer level;
+            private Integer level;
         
     public Integer getLevel() {
         return level;
@@ -81,8 +79,8 @@
         this.level = level;
     }
                 //完成期限
-                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Timestamp completeDate;
+            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+        private Timestamp completeDate;
         
     public Timestamp getCompleteDate() {
         return completeDate;
@@ -92,7 +90,7 @@
         this.completeDate = completeDate;
     }
                 //备注信息
-    private String memo;
+            private String memo;
         
     public String getMemo() {
         return memo;
@@ -101,8 +99,8 @@
     public void setMemo(String memo) {
         this.memo = memo;
     }
-                //指标类型 1:年指标 2:月指标
-    private Integer targetType;
+                //指标类型 1:年指标 2:月指标 3:半年 4:季度
+            private Integer targetType;
         
     public Integer getTargetType() {
         return targetType;
@@ -112,7 +110,7 @@
         this.targetType = targetType;
     }
                 //分解状态 1:已分解 2:未分解
-    private Integer divideStatus;
+            private Integer divideStatus;
         
     public Integer getDivideStatus() {
         return divideStatus;
@@ -121,5 +119,15 @@
     public void setDivideStatus(Integer divideStatus) {
         this.divideStatus = divideStatus;
     }
-            
+                        //目标制定部门
+            private Long makerDepartmentId;
+        
+    public Long getMakerDepartmentId() {
+        return makerDepartmentId;
+    }
+
+    public void setMakerDepartmentId(Long makerDepartmentId) {
+        this.makerDepartmentId = makerDepartmentId;
+    }
+    
 }
\ No newline at end of file

--
Gitblit v1.9.2