From 233fb69fa9d1694e97337d74fa3da72cacda04c1 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期四, 18 八月 2022 17:25:33 +0800
Subject: [PATCH] 目标统计
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetExamineSaveOrUpdate.java | 113 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 99 insertions(+), 14 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetExamineSaveOrUpdate.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetExamineSaveOrUpdate.java
index f295e23..41a2ec1 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetExamineSaveOrUpdate.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetExamineSaveOrUpdate.java
@@ -2,16 +2,16 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.gkhy.safePlatform.targetDuty.entity.ExamineItem;
import com.gkhy.safePlatform.targetDuty.entity.TargetExamine;
import java.io.Serializable;
+import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.List;
public class TargetExamineSaveOrUpdate implements Serializable {
-
-
@TableId(type = IdType.AUTO)
private Long id;
public Long getId() {
@@ -22,25 +22,110 @@
this.id = id;
}
- //关联的考核数据列表
- private List<TargetExamine> examineList = new ArrayList<>();
+ //关联的目标分解/外键
+ private Long targetDivideDetailId;
- public List<TargetExamine> getExamineList() {
- return examineList;
+ public Long getTargetDivideDetailId() {
+ return targetDivideDetailId;
}
- public void setExamineList(List<TargetExamine> examineList) {
- this.examineList = examineList;
+ public void setTargetDivideDetailId(Long targetDivideDetailId) {
+ this.targetDivideDetailId = targetDivideDetailId;
+ }
+ //上报值
+ private String uploadValue;
+
+ public String getUploadValue() {
+ return uploadValue;
}
- //要删除的id集合，多个用逗号隔开
- private String delIds;
+ public void setUploadValue(String uploadValue) {
+ this.uploadValue = uploadValue;
+ }
+ //上报时间
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp uploadDate;
- public String getDelIds() {
- return delIds;
+ public Timestamp getUploadDate() {
+ return uploadDate;
}
- public void setDelIds(String delIds) {
- this.delIds = delIds;
+ public void setUploadDate(Timestamp uploadDate) {
+ this.uploadDate = uploadDate;
}
+ //考核结果 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;
+ }
+
+
+//
+// @TableId(type = IdType.AUTO)
+// private Long id;
+// public Long getId() {
+// return id;
+// }
+//
+// public void setId(Long id) {
+// this.id = id;
+// }
+//
+// //关联的考核数据列表
+// private List<TargetExamine> examineList = new ArrayList<>();
+//
+// public List<TargetExamine> getExamineList() {
+// return examineList;
+// }
+//
+// public void setExamineList(List<TargetExamine> examineList) {
+// this.examineList = examineList;
+// }
+//
+// //要删除的id集合，多个用逗号隔开
+// private String delIds;
+//
+// public String getDelIds() {
+// return delIds;
+// }
+//
+// public void setDelIds(String delIds) {
+// this.delIds = delIds;
+// }
}
\ No newline at end of file
--
Gitblit v1.9.2