From fabd08d87d00bfdf1aacf473fd905fdd3c903ed3 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 02 九月 2022 10:10:14 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java | 56 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 12 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 7013024..1f678ee 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
@@ -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;
/**
* 目标指标(TargetMng)表实体类
*
* @author xurui
- * @since 2022-07-20 11:49:22
+ * @since 2022-08-29 08:41:36
*/
@SuppressWarnings("serial")
@TableName("target_mng")
@@ -28,7 +29,7 @@
}
//安全目标指标
- private String qName;
+ private String qName;
public String getqName() {
return qName;
@@ -39,7 +40,7 @@
}
//目标指标编号
- private String indexNum;
+ private String indexNum;
public String getIndexNum() {
return indexNum;
@@ -49,7 +50,7 @@
this.indexNum = indexNum;
}
//年度
- private String year;
+ private String year;
public String getYear() {
return year;
@@ -59,7 +60,7 @@
this.year = year;
}
//指标值
- private String value;
+ private String value;
public String getValue() {
return value;
@@ -68,8 +69,18 @@
public void setValue(String value) {
this.value = value;
}
+ //1:大于 2：等于 3：小于
+ private Integer valueSign;
+
+ public Integer getValueSign() {
+ return valueSign;
+ }
+
+ public void setValueSign(Integer valueSign) {
+ this.valueSign = valueSign;
+ }
//指标级别 1:公司级 2:部门分厂级 3:工段班组级
- private Integer level;
+ private Integer level;
public Integer getLevel() {
return level;
@@ -79,7 +90,8 @@
this.level = level;
}
//完成期限
- private Timestamp completeDate;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp completeDate;
public Timestamp getCompleteDate() {
return completeDate;
@@ -89,7 +101,7 @@
this.completeDate = completeDate;
}
//备注信息
- private String memo;
+ private String memo;
public String getMemo() {
return memo;
@@ -98,8 +110,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;
@@ -109,7 +121,7 @@
this.targetType = targetType;
}
//分解状态 1:已分解 2:未分解
- private Integer divideStatus;
+ private Integer divideStatus;
public Integer getDivideStatus() {
return divideStatus;
@@ -118,5 +130,25 @@
public void setDivideStatus(Integer divideStatus) {
this.divideStatus = divideStatus;
}
-
+ //目标制定部门
+ private Long makerDepartmentId;
+
+ public Long getMakerDepartmentId() {
+ return makerDepartmentId;
+ }
+
+ public void setMakerDepartmentId(Long makerDepartmentId) {
+ this.makerDepartmentId = makerDepartmentId;
+ }
+ //是否删除 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