项目详情返回结果调整

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

@@ -1,6 +1,5 @@
 package com.epmet.project.dto.result;
 
-import com.epmet.dto.result.ProcesslistResultDTO;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -39,7 +38,7 @@ public class ProjectDetailResultDTO implements Serializable {
     /**
      * 项目进展
      */
-    private List<ProcesslistResultDTO> processList;
+    private List<ProjectProcessResultDTO> processList;
 
     public ProjectDetailResultDTO() {
         this.eventTitle = "";

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

@@ -0,0 +1,76 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.project.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 项目跟踪-项目处理进展列表-接口返参
+ *
+ * @author sun
+ */
+@Data
+public class ProjectProcessResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 项目Id
+     */
+    private String projectId = "";
+
+    /**
+     * 项目处理进展Id
+     */
+    private String processId = "";
+
+    /**
+     * 处理进展名称
+     */
+    private String processName = "";
+
+    /**
+     * 处理进展时间
+     */
+    private Long processTime;
+
+    /**
+     * 处理进展时间 字符串
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private String processTimeStr;
+
+    /**
+     * 处理部门
+     */
+    private String departmentName = "";
+
+    /**
+     * 公开答复
+     */
+    private String publicReply = "";
+
+    /**
+     * 内部备注
+     */
+    private String internalRemark = "";
+}

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

@@ -3,6 +3,7 @@ package com.epmet.datareport.service.project.impl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.datareport.dao.project.ProjectDao;
@@ -186,14 +187,16 @@ public class ProjectServiceImpl implements ProjectService {
     @Override
     public ProjectDetailResultDTO projectDetail(ProcessListFormDTO processListFormDTO) {
         ProjectDetailResultDTO projectDetailResultDTO = screenDifficultyDataService.projectDetail(processListFormDTO);
-        if (null == projectDetailResultDTO){
+        if (null == projectDetailResultDTO) {
             return new ProjectDetailResultDTO();
         }
         Result<List<ProcesslistResultDTO>> processList = govProjectOpenFeignClient.getProcessList(processListFormDTO);
-        if (!processList.success()){
+        if (!processList.success()) {
             throw new RenException(ProjectConstant.PROCESS_FAILURE);
         }
-        projectDetailResultDTO.setProcessList(processList.getData());
+
+        List<ProjectProcessResultDTO> processResultDTOS = ConvertUtils.sourceToTarget(processList.getData(), ProjectProcessResultDTO.class);
+        projectDetailResultDTO.setProcessList(processResultDTOS);
         return projectDetailResultDTO;
     }