From 759bbb8ee99665382a689fa90277a9b2279238da Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Fri, 19 Aug 2022 19:04:02 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDivideDetail.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 50 insertions(+), 8 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDivideDetail.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDivideDetail.java
index 3d99f43..d28e720 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDivideDetail.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDivideDetail.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;
/**
* 目标指标分解详情(TargetDivideDetail)表实体类
*
* @author xurui
- * @since 2022-08-03 09:25:40
+ * @since 2022-08-17 11:22:35
*/
@SuppressWarnings("serial")
@TableName("target_divide_detail")
@@ -28,7 +29,7 @@
}
//关联的目标指标/外键
- private Long targetId;
+ private Long targetId;
public Long getTargetId() {
return targetId;
@@ -38,7 +39,7 @@
this.targetId = targetId;
}
//考核指标值
- private String value;
+ private String value;
public String getValue() {
return value;
@@ -48,7 +49,8 @@
this.value = value;
}
//制定日期
- private Timestamp makeDate;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp makeDate;
public Timestamp getMakeDate() {
return makeDate;
@@ -58,7 +60,7 @@
this.makeDate = makeDate;
}
//责任部门/外键
- private Long dutyDepartmentId;
+ private Long dutyDepartmentId;
public Long getDutyDepartmentId() {
return dutyDepartmentId;
@@ -68,7 +70,7 @@
this.dutyDepartmentId = dutyDepartmentId;
}
//制定人部门/外键
- private Long makerDepartmentId;
+ private Long makerDepartmentId;
public Long getMakerDepartmentId() {
return makerDepartmentId;
@@ -78,7 +80,7 @@
this.makerDepartmentId = makerDepartmentId;
}
//上报人/外键
- private Long commitPersonId;
+ private Long commitPersonId;
public Long getCommitPersonId() {
return commitPersonId;
@@ -88,7 +90,7 @@
this.commitPersonId = commitPersonId;
}
//上报人名称
- private String commitPersonName;
+ private String commitPersonName;
public String getCommitPersonName() {
return commitPersonName;
@@ -97,5 +99,45 @@
public void setCommitPersonName(String commitPersonName) {
this.commitPersonName = commitPersonName;
}
+ //目标分类/外键
+ private Long targetTypeId;
+
+ public Long getTargetTypeId() {
+ return targetTypeId;
+ }
+
+ public void setTargetTypeId(Long targetTypeId) {
+ this.targetTypeId = targetTypeId;
+ }
+ //责任人/外键
+ private Long dutyPersonId;
+
+ public Long getDutyPersonId() {
+ return dutyPersonId;
+ }
+
+ public void setDutyPersonId(Long dutyPersonId) {
+ this.dutyPersonId = dutyPersonId;
+ }
+ //责任人名称
+ private String dutyPersonName;
+
+ public String getDutyPersonName() {
+ return dutyPersonName;
+ }
+
+ public void setDutyPersonName(String dutyPersonName) {
+ this.dutyPersonName = dutyPersonName;
+ }
+ //计划措施
+ private String planDesc;
+
+ public String getPlanDesc() {
+ return planDesc;
+ }
+
+ public void setPlanDesc(String planDesc) {
+ this.planDesc = planDesc;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.2