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/TargetExamineDto.java | 94 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 85 insertions(+), 9 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..9065579 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;
@@ -8,6 +11,7 @@
import java.util.List;
public class TargetExamineDto implements Serializable {
+
private Long id;
//安全目标指标
private String qName;
@@ -17,8 +21,31 @@
private String year;
//指标值
private String value;
- //关联的考核数据列表
- private List<TargetExamineDivideDto> examineList = new ArrayList<>();
+ //指标级别 1:公司级 2:部门分厂级 3:工段班组级
+ private Integer level;
+ //完成期限
+ private Timestamp completeDate;
+ //备注信息
+ private String memo;
+ //指标类型 1:年指标 2:月指标
+ private Integer targetType;
+ //分解状态 1:已分解 2:未分解
+ private Integer divideStatus;
+
+ private Timestamp createTime;
+
+ private Timestamp updateTime;
+
+ //目标指标分解列表
+ private List<TargetDivideDetailDto> targetDivideDetailList = new ArrayList<>();
+
+ public List<TargetDivideDetailDto> getTargetDivideDetailList() {
+ return targetDivideDetailList;
+ }
+
+ public void setTargetDivideDetailList(List<TargetDivideDetailDto> targetDivideDetailList) {
+ this.targetDivideDetailList = targetDivideDetailList;
+ }
public Long getId() {
return id;
@@ -36,6 +63,7 @@
this.qName = qName;
}
+ //目标指标编号
public String getIndexNum() {
return indexNum;
}
@@ -43,7 +71,7 @@
public void setIndexNum(String indexNum) {
this.indexNum = indexNum;
}
-
+ //年度
public String getYear() {
return year;
}
@@ -51,7 +79,7 @@
public void setYear(String year) {
this.year = year;
}
-
+ //指标值
public String getValue() {
return value;
}
@@ -59,12 +87,60 @@
public void setValue(String value) {
this.value = value;
}
-
- public List<TargetExamineDivideDto> getExamineList() {
- return examineList;
+ //指标级别 1:公司级 2:部门分厂级 3:工段班组级
+ public Integer getLevel() {
+ return level;
}
- public void setExamineList(List<TargetExamineDivideDto> examineList) {
- this.examineList = examineList;
+ public void setLevel(Integer level) {
+ this.level = level;
+ }
+ //完成期限
+ public Timestamp getCompleteDate() {
+ return completeDate;
+ }
+
+ public void setCompleteDate(Timestamp completeDate) {
+ this.completeDate = completeDate;
+ }
+ //备注信息
+ public String getMemo() {
+ return memo;
+ }
+
+ public void setMemo(String memo) {
+ this.memo = memo;
+ }
+ //指标类型 1:年指标 2:月指标
+ public Integer getTargetType() {
+ return targetType;
+ }
+
+ public void setTargetType(Integer targetType) {
+ this.targetType = targetType;
+ }
+ //分解状态 1:已分解 2:未分解
+ public Integer getDivideStatus() {
+ return divideStatus;
+ }
+
+ public void setDivideStatus(Integer divideStatus) {
+ this.divideStatus = divideStatus;
+ }
+
+ public Timestamp getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Timestamp createTime) {
+ this.createTime = createTime;
+ }
+
+ public Timestamp getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Timestamp updateTime) {
+ this.updateTime = updateTime;
}
}
\ No newline at end of file
--
Gitblit v1.9.2