From 1f143d91c6f71d4bfe7bd628ffc152c32e238b12 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 16 八月 2022 14:28:09 +0800
Subject: [PATCH] fix

---
 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetApproveDivideDetailDto.java |  160 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java           |    2 
 2 files changed, 161 insertions(+), 1 deletions(-)

diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetApproveDivideDetailDto.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetApproveDivideDetailDto.java
new file mode 100644
index 0000000..3b0e4b9
--- /dev/null
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetApproveDivideDetailDto.java
@@ -0,0 +1,160 @@
+package com.gkhy.safePlatform.targetDuty.model.dto.resp;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+public class TargetApproveDivideDetailDto implements Serializable {
+        
+    private Long id;
+    //关联的目标指标/外键    
+    private Long targetId;
+    //考核指标值    
+    private String value;
+    //制定日期    
+    private Timestamp makeDate;
+    //责任部门/外键    
+    private Long dutyDepartmentId;
+    //制定人部门/外键    
+    private Long makerDepartmentId;
+    //上报人/外键    
+    private Long commitPersonId;
+        
+    private Timestamp createTime;
+        
+    private Timestamp updateTime;
+
+    //上报人名称
+    private String commitPersonName;
+
+    //责任部门名称
+    private String dutyDepartmentName;
+    //制定人部门名称
+    private String makerDepartmentName;
+
+    private String personId;
+
+    private String personName;
+
+    //上报值
+    private String commitValue;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getTargetId() {
+        return targetId;
+    }
+
+    public void setTargetId(Long targetId) {
+        this.targetId = targetId;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public Timestamp getMakeDate() {
+        return makeDate;
+    }
+
+    public void setMakeDate(Timestamp makeDate) {
+        this.makeDate = makeDate;
+    }
+
+    public Long getDutyDepartmentId() {
+        return dutyDepartmentId;
+    }
+
+    public void setDutyDepartmentId(Long dutyDepartmentId) {
+        this.dutyDepartmentId = dutyDepartmentId;
+    }
+
+    public Long getMakerDepartmentId() {
+        return makerDepartmentId;
+    }
+
+    public void setMakerDepartmentId(Long makerDepartmentId) {
+        this.makerDepartmentId = makerDepartmentId;
+    }
+
+    public Long getCommitPersonId() {
+        return commitPersonId;
+    }
+
+    public void setCommitPersonId(Long commitPersonId) {
+        this.commitPersonId = commitPersonId;
+    }
+
+    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;
+    }
+
+    public String getCommitPersonName() {
+        return commitPersonName;
+    }
+
+    public void setCommitPersonName(String commitPersonName) {
+        this.commitPersonName = commitPersonName;
+    }
+
+    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;
+    }
+
+    public String getPersonId() {
+        return personId;
+    }
+
+    public void setPersonId(String personId) {
+        this.personId = personId;
+    }
+
+    public String getPersonName() {
+        return personName;
+    }
+
+    public void setPersonName(String personName) {
+        this.personName = personName;
+    }
+
+    public String getCommitValue() {
+        return commitValue;
+    }
+
+    public void setCommitValue(String commitValue) {
+        this.commitValue = commitValue;
+    }
+}
\ No newline at end of file
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java
index 07b804e..9769574 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java
@@ -154,7 +154,7 @@
         respList.forEach(dto->{
             List<TargetDutyWorkApprove> list = targetDutyWorkApproveRepository.selectList(
                     new QueryWrapper<TargetDutyWorkApprove>().eq("del_flag",0)
-                            .eq("relate_type",pageQuery.getSearchParams().getTargetType())
+                            .eq("relate_type",pageQuery.getSearchParams().getRelateType())
                             .eq("relate_id",dto.getId())
                             .orderByDesc("sort"));
 

--
Gitblit v1.9.2