From f1f506172a3edff8d31e4db77b8940f115660919 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 20 九月 2022 16:25:43 +0800
Subject: [PATCH] fix
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetExamine.java | 91 ++++++++++++++++++---------------------------
1 files changed, 37 insertions(+), 54 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetExamine.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetExamine.java
index 5178188..2a24473 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetExamine.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetExamine.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;
/**
- * (TargetExamine)表实体类
+ * 安全目标考核(TargetExamine)表实体类
*
* @author xurui
- * @since 2022-07-22 09:30:01
+ * @since 2022-08-29 08:44:10
*/
@SuppressWarnings("serial")
@TableName("target_examine")
@@ -27,58 +28,18 @@
this.id = id;
}
- //关联的目标指标/外键
- private Long targetId;
+ //关联的目标分解/外键
+ private Long targetDivideDetailId;
- public Long getTargetId() {
- return targetId;
+ public Long getTargetDivideDetailId() {
+ return targetDivideDetailId;
}
- public void setTargetId(Long targetId) {
- this.targetId = targetId;
- }
- //责任部门id/外键
- private Long dutyDepartmentId;
-
- public Long getDutyDepartmentId() {
- return dutyDepartmentId;
- }
-
- public void setDutyDepartmentId(Long dutyDepartmentId) {
- this.dutyDepartmentId = dutyDepartmentId;
- }
- //考核指标
- private String examineValue;
-
- public String getExamineValue() {
- return examineValue;
- }
-
- public void setExamineValue(String examineValue) {
- this.examineValue = examineValue;
- }
- //制定部门/外键
- private Long makerDepartmentId;
-
- public Long getMakerDepartmentId() {
- return makerDepartmentId;
- }
-
- public void setMakerDepartmentId(Long makerDepartmentId) {
- this.makerDepartmentId = makerDepartmentId;
- }
- //制定日期
- private Timestamp makeDate;
-
- public Timestamp getMakeDate() {
- return makeDate;
- }
-
- public void setMakeDate(Timestamp makeDate) {
- this.makeDate = makeDate;
+ public void setTargetDivideDetailId(Long targetDivideDetailId) {
+ this.targetDivideDetailId = targetDivideDetailId;
}
//上报值
- private String uploadValue;
+ private String uploadValue;
public String getUploadValue() {
return uploadValue;
@@ -88,7 +49,8 @@
this.uploadValue = uploadValue;
}
//上报时间
- private Timestamp uploadDate;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp uploadDate;
public Timestamp getUploadDate() {
return uploadDate;
@@ -98,7 +60,7 @@
this.uploadDate = uploadDate;
}
//考核结果 1:合格 2：不合格
- private Integer examineResult;
+ private Integer examineResult;
public Integer getExamineResult() {
return examineResult;
@@ -108,7 +70,7 @@
this.examineResult = examineResult;
}
//考核人ID/外键
- private Long examinePersonId;
+ private Long examinePersonId;
public Long getExaminePersonId() {
return examinePersonId;
@@ -117,8 +79,19 @@
public void setExaminePersonId(Long examinePersonId) {
this.examinePersonId = examinePersonId;
}
+ //考核人名称
+ private String examinePersonName;
+
+ public String getExaminePersonName() {
+ return examinePersonName;
+ }
+
+ public void setExaminePersonName(String examinePersonName) {
+ this.examinePersonName = examinePersonName;
+ }
//考核时间
- private Timestamp examineDate;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp examineDate;
public Timestamp getExamineDate() {
return examineDate;
@@ -127,5 +100,15 @@
public void setExamineDate(Timestamp examineDate) {
this.examineDate = examineDate;
}
-
+ //是否删除 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