项目详情

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/DepartmentNameListResultDTO.java

@@ -0,0 +1,28 @@
+package com.epmet.evaluationindex.screen.dto.result;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/10/26 3:36 下午
+ */
+@Data
+@AllArgsConstructor
+public class DepartmentNameListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -801407836277197080L;
+
+    /**
+     * 部门名
+     */
+    private String departmentName;
+    /**
+     * 工作人员
+     */
+    private List<String> staffList;
+
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectDetailResultDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.project.dto.result;
 
+import com.epmet.evaluationindex.screen.dto.result.DepartmentNameListResultDTO;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -48,20 +49,7 @@ public class ProjectDetailResultDTO implements Serializable {
     /**
      * 当前跟进部门
      */
-    private List<com.epmet.dto.result.ProjectDetailResultDTO.DepartmentNameListBean> departmentList;
-
-    @NoArgsConstructor
-    @Data
-    public static class DepartmentNameListBean {
-        /**
-         * 部门名
-         */
-        private String departmentName;
-        /**
-         * 工作人员
-         */
-        private List<String> staffList;
-    }
+    private List<DepartmentNameListResultDTO> departmentList;
 
     public ProjectDetailResultDTO() {
         this.eventTitle = "";

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java

@@ -12,7 +12,7 @@ import com.epmet.dto.form.LoginUserDetailsFormDTO;
 import com.epmet.dto.form.ProcessListFormDTO;
 import com.epmet.dto.result.LoginUserDetailsResultDTO;
 import com.epmet.dto.result.ProcessAndCurrentDeptResultDTO;
-import com.epmet.dto.result.ProcesslistResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.DepartmentNameListResultDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovProjectOpenFeignClient;
 import com.epmet.module.project.service.ProjectService;
@@ -198,7 +198,8 @@ public class ProjectServiceImpl implements ProjectService {
         ProcessAndCurrentDeptResultDTO data = processList.getData();
         List<ProjectProcessResultDTO> processResultDTOS = ConvertUtils.sourceToTarget(data.getProcessList(), ProjectProcessResultDTO.class);
         projectDetailResultDTO.setProcessList(processResultDTOS);
-        projectDetailResultDTO.setDepartmentList(data.getDepartmentList());
+        List<DepartmentNameListResultDTO> departmentNameListResultDTOS = ConvertUtils.sourceToTarget(data.getProcessList(), DepartmentNameListResultDTO.class);
+        projectDetailResultDTO.setDepartmentList(departmentNameListResultDTOS);
         projectDetailResultDTO.setDepartmentNameList(data.getDepartmentNameList());
         return projectDetailResultDTO;
     }

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProcessAndCurrentDeptResultDTO.java

@@ -4,6 +4,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -38,4 +39,10 @@ public class ProcessAndCurrentDeptResultDTO implements Serializable {
          */
         private List<String> staffList;
     }
+
+    public ProcessAndCurrentDeptResultDTO() {
+        this.processList = new ArrayList<>();
+        this.departmentNameList = new ArrayList<>();
+        this.departmentList = new ArrayList<>();
+    }
 }