From 233fb69fa9d1694e97337d74fa3da72cacda04c1 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Thu, 18 Aug 2022 17:25:33 +0800
Subject: [PATCH] 目标统计
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetExamineDto.java | 153 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 122 insertions(+), 31 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetExamineDto.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetExamineDto.java
index 2505295..eaa5287 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetExamineDto.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetExamineDto.java
@@ -1,5 +1,8 @@
package com.gkhy.safePlatform.targetDuty.model.dto.resp;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.gkhy.safePlatform.targetDuty.entity.TargetExamine;
import java.sql.Timestamp;
@@ -9,17 +12,6 @@
public class TargetExamineDto implements Serializable {
private Long id;
- //安全目标指标
- private String qName;
- //目标指标编号
- private String indexNum;
- //年度
- private String year;
- //指标值
- private String value;
- //关联的考核数据列表
- private List<TargetExamineDivideDto> examineList = new ArrayList<>();
-
public Long getId() {
return id;
}
@@ -28,43 +20,142 @@
this.id = id;
}
- public String getqName() {
- return qName;
+ //关联的目标指标/外键
+ private Long targetId;
+
+ public Long getTargetId() {
+ return targetId;
}
- public void setqName(String qName) {
- this.qName = qName;
+ public void setTargetId(Long targetId) {
+ this.targetId = targetId;
+ }
+ //责任部门id/外键
+ private Long dutyDepartmentId;
+
+ public Long getDutyDepartmentId() {
+ return dutyDepartmentId;
}
- public String getIndexNum() {
- return indexNum;
+ public void setDutyDepartmentId(Long dutyDepartmentId) {
+ this.dutyDepartmentId = dutyDepartmentId;
}
- public void setIndexNum(String indexNum) {
- this.indexNum = indexNum;
+ //责任部门名称
+ private String dutyDepartmentName;
+
+ //考核指标
+ private String examineValue;
+
+ public String getExamineValue() {
+ return examineValue;
}
- public String getYear() {
- return year;
+ public void setExamineValue(String examineValue) {
+ this.examineValue = examineValue;
+ }
+ //制定部门id/外键
+ private Long makerDepartmentId;
+
+ public Long getMakerDepartmentId() {
+ return makerDepartmentId;
}
- public void setYear(String year) {
- this.year = year;
+ public void setMakerDepartmentId(Long makerDepartmentId) {
+ this.makerDepartmentId = makerDepartmentId;
}
- public String getValue() {
- return value;
+ //制定部门名称
+ private String makerDepartmentName;
+
+ //制定日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp makeDate;
+
+ public Timestamp getMakeDate() {
+ return makeDate;
}
- public void setValue(String value) {
- this.value = value;
+ public void setMakeDate(Timestamp makeDate) {
+ this.makeDate = makeDate;
+ }
+ //上报值
+ private String uploadValue;
+
+ public String getUploadValue() {
+ return uploadValue;
}
- public List<TargetExamineDivideDto> getExamineList() {
- return examineList;
+ public void setUploadValue(String uploadValue) {
+ this.uploadValue = uploadValue;
+ }
+ //上报时间
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp uploadDate;
+
+ public Timestamp getUploadDate() {
+ return uploadDate;
}
- public void setExamineList(List<TargetExamineDivideDto> examineList) {
- this.examineList = examineList;
+ 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;
+ }
+
+ public String getDutyDepartmentName() {
+ return dutyDepartmentName;
+ }
+
+ public void setDutyDepartmentName(String dutyDepartmentName) {
+ this.dutyDepartmentName = dutyDepartmentName;
+ }
+
+ public String getMakerDepartmentName() {
+ return makerDepartmentName;
+ }
+
+ public void setMakerDepartmentName(String makerDepartmentName) {
+ this.makerDepartmentName = makerDepartmentName;
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.2