From 2595c1008bfe2d0d5e01f3b6b035faa7ccb8a2b8 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 19 八月 2022 17:46:03 +0800
Subject: [PATCH] 目标考核

---
 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetExamineDto.java |  195 ++++++++++++++++++++++--------------------------
 1 files changed, 90 insertions(+), 105 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 eaa5287..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
@@ -11,7 +11,42 @@
 import java.util.List;
 
 public class TargetExamineDto implements Serializable {
+
     private Long id;
+    //安全目标指标
+    private String qName;
+    //目标指标编号
+    private String indexNum;
+    //年度
+    private String year;
+    //指标值
+    private String value;
+    //指标级别 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;
     }
@@ -20,142 +55,92 @@
         this.id = id;
     }
 
-    //关联的目标指标/外键
-    private Long targetId;
-
-    public Long getTargetId() {
-        return targetId;
+    public String getqName() {
+        return qName;
     }
 
-    public void setTargetId(Long targetId) {
-        this.targetId = targetId;
-    }
-    //责任部门id/外键
-    private Long dutyDepartmentId;
-
-    public Long getDutyDepartmentId() {
-        return dutyDepartmentId;
+    public void setqName(String qName) {
+        this.qName = qName;
     }
 
-    public void setDutyDepartmentId(Long dutyDepartmentId) {
-        this.dutyDepartmentId = dutyDepartmentId;
+    //目标指标编号
+    public String getIndexNum() {
+        return indexNum;
     }
 
-    //责任部门名称
-    private String dutyDepartmentName;
-
-    //考核指标
-    private String examineValue;
-
-    public String getExamineValue() {
-        return examineValue;
+    public void setIndexNum(String indexNum) {
+        this.indexNum = indexNum;
+    }
+    //年度
+    public String getYear() {
+        return year;
     }
 
-    public void setExamineValue(String examineValue) {
-        this.examineValue = examineValue;
+    public void setYear(String year) {
+        this.year = year;
     }
-    //制定部门id/外键
-    private Long makerDepartmentId;
-
-    public Long getMakerDepartmentId() {
-        return makerDepartmentId;
+    //指标值
+    public String getValue() {
+        return value;
     }
 
-    public void setMakerDepartmentId(Long makerDepartmentId) {
-        this.makerDepartmentId = makerDepartmentId;
+    public void setValue(String value) {
+        this.value = value;
+    }
+    //指标级别 1:公司级 2:部门分厂级 3:工段班组级
+    public Integer getLevel() {
+        return level;
     }
 
-    //制定部门名称
-    private String makerDepartmentName;
-
-    //制定日期
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Timestamp makeDate;
-
-    public Timestamp getMakeDate() {
-        return makeDate;
+    public void setLevel(Integer level) {
+        this.level = level;
+    }
+    //完成期限
+    public Timestamp getCompleteDate() {
+        return completeDate;
     }
 
-    public void setMakeDate(Timestamp makeDate) {
-        this.makeDate = makeDate;
+    public void setCompleteDate(Timestamp completeDate) {
+        this.completeDate = completeDate;
     }
-    //上报值
-    private String uploadValue;
-
-    public String getUploadValue() {
-        return uploadValue;
+    //备注信息
+    public String getMemo() {
+        return memo;
     }
 
-    public void setUploadValue(String uploadValue) {
-        this.uploadValue = uploadValue;
+    public void setMemo(String memo) {
+        this.memo = memo;
     }
-    //上报时间
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Timestamp uploadDate;
-
-    public Timestamp getUploadDate() {
-        return uploadDate;
+    //指标类型 1:年指标 2:月指标
+    public Integer getTargetType() {
+        return targetType;
     }
 
-    public void setUploadDate(Timestamp uploadDate) {
-        this.uploadDate = uploadDate;
+    public void setTargetType(Integer targetType) {
+        this.targetType = targetType;
     }
-    //考核结果 1:合格 2:不合格
-    private Integer examineResult;
-
-    public Integer getExamineResult() {
-        return examineResult;
+    //分解状态 1:已分解 2:未分解
+    public Integer getDivideStatus() {
+        return divideStatus;
     }
 
-    public void setExamineResult(Integer examineResult) {
-        this.examineResult = examineResult;
-    }
-    //考核人ID/外键
-    private Long examinePersonId;
-
-    public Long getExaminePersonId() {
-        return examinePersonId;
+    public void setDivideStatus(Integer divideStatus) {
+        this.divideStatus = divideStatus;
     }
 
-    public void setExaminePersonId(Long examinePersonId) {
-        this.examinePersonId = examinePersonId;
-    }
-    //考核人名称
-    private String examinePersonName;
-
-    public String getExaminePersonName() {
-        return examinePersonName;
+    public Timestamp getCreateTime() {
+        return createTime;
     }
 
-    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 setCreateTime(Timestamp createTime) {
+        this.createTime = createTime;
     }
 
-    public void setExamineDate(Timestamp examineDate) {
-        this.examineDate = examineDate;
+    public Timestamp getUpdateTime() {
+        return updateTime;
     }
 
-    public String getDutyDepartmentName() {
-        return dutyDepartmentName;
+    public void setUpdateTime(Timestamp updateTime) {
+        this.updateTime = updateTime;
     }
-
-    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