From 759bbb8ee99665382a689fa90277a9b2279238da Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 19 八月 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/model/dto/resp/TargetDivideDetailDto.java | 99 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 99 insertions(+), 0 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetDivideDetailDto.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetDivideDetailDto.java
index f7e4147..3cca7bf 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetDivideDetailDto.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetDivideDetailDto.java
@@ -1,5 +1,7 @@
package com.gkhy.safePlatform.targetDuty.model.dto.resp;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
import java.sql.Timestamp;
import java.io.Serializable;
@@ -30,6 +32,60 @@
private String dutyDepartmentName;
//制定人部门名称
private String makerDepartmentName;
+
+ //目标分类/外键
+ private Long targetTypeId;
+
+ public Long getTargetTypeId() {
+ return targetTypeId;
+ }
+
+ public void setTargetTypeId(Long targetTypeId) {
+ this.targetTypeId = targetTypeId;
+ }
+
+ //目标分类名称
+ private String targetTypeName;
+
+ public String getTargetTypeName() {
+ return targetTypeName;
+ }
+
+ public void setTargetTypeName(String targetTypeName) {
+ this.targetTypeName = targetTypeName;
+ }
+
+ //责任人/外键
+ 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;
+ }
+
public String getDutyDepartmentName() {
return dutyDepartmentName;
@@ -126,4 +182,47 @@
public void setUpdateTime(Timestamp updateTime) {
this.updateTime = updateTime;
}
+
+ //考核结果 1:合格 2：不合格
+ private Integer examineResult;
+
+ public Integer getExamineResult() {
+ return examineResult;
+ }
+
+ public void setExamineResult(Integer examineResult) {
+ this.examineResult = examineResult;
+ }
+
+ //考核人ID/外键
+ private Long examinePersonId;
+
+ public Long getExaminePersonId() {
+ return examinePersonId;
+ }
+
+ public void setExaminePersonId(Long examinePersonId) {
+ this.examinePersonId = examinePersonId;
+ }
+ //考核人名称
+ private String examinePersonName;
+
+ public String getExaminePersonName() {
+ return examinePersonName;
+ }
+
+ public void setExaminePersonName(String examinePersonName) {
+ this.examinePersonName = examinePersonName;
+ }
+ //考核时间
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp examineDate;
+
+ public Timestamp getExamineDate() {
+ return examineDate;
+ }
+
+ public void setExamineDate(Timestamp examineDate) {
+ this.examineDate = examineDate;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.2