@PostMapping("issueprocess")

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueAdvanceResDTO.java

@@ -0,0 +1,21 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description 议题的处理进展（包含转项目后的进展）内部服务之间调用
+ * @Author yzm
+ * @Date 2022/10/11 9:43
+ */
+@Data
+public class IssueAdvanceResDTO {
+    private String issueId;
+    /**
+     * 议题状态(voting 已转项目：shift_project 已关闭：closed)
+     */
+    private String issueStatus;
+    private List<ProcessListResultDTOBak> processList;
+}
+

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ProcessListResultDTOBak.java

@@ -0,0 +1,38 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/10/11 11:13
+ */
+@Data
+public class ProcessListResultDTOBak {
+
+    /**
+     * 处理进展名称(表决中、转项目、流转中已结案、已关闭)
+     */
+    private String processName;
+
+    /**
+     * 已转项目进展记录时间
+     */
+    private Long processTime;
+
+    /**
+     * 处理部门（处理人所属的机关单位名称）
+     */
+    private String departmentName;
+
+    /**
+     * 进展说明
+     */
+    private String progressDesc;
+
+    /**
+     * 进展id（操作记录表id）
+     */
+    private String processId;
+}
+

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProcessController.java

@@ -27,6 +27,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IssueProcessDTO;
 import com.epmet.dto.form.IssueIdFormDTO;
+import com.epmet.dto.result.IssueAdvanceResDTO;
 import com.epmet.dto.result.ProcessListResultDTO;
 import com.epmet.excel.IssueProcessExcel;
 import com.epmet.service.IssueProcessService;
@@ -103,4 +104,13 @@ public class IssueProcessController {
         return new Result<List<ProcessListResultDTO>>().ok(issueProcessService.processList(issueId));
     }
 
+    /**
+     * 议题的处理进展，(只包含发起议题、关闭议题)
+     * @param issueId
+     * @return
+     */
+    @PostMapping("issueprocess")
+    public Result<IssueAdvanceResDTO> queryIssueProcess(@RequestBody IssueIdFormDTO issueId){
+        return new Result<IssueAdvanceResDTO>().ok(issueProcessService.queryIssueProcess(issueId));
+    }
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProcessService.java

@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IssueProcessDTO;
 import com.epmet.dto.form.IssueIdFormDTO;
+import com.epmet.dto.result.IssueAdvanceResDTO;
 import com.epmet.dto.result.ProcessListResultDTO;
 import com.epmet.entity.IssueProcessEntity;
 
@@ -109,4 +110,11 @@ public interface IssueProcessService extends BaseService<IssueProcessEntity> {
      * @date 2020.05.13 16:42
     **/
     int insertOne(IssueProcessDTO issueProcessDTO);
+
+    /**
+     * 议题的处理进展，(只包含发起议题、关闭议题)
+     * @param issueId
+     * @return
+     */
+    IssueAdvanceResDTO queryIssueProcess(IssueIdFormDTO issueId);
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java

@@ -32,9 +32,12 @@ import com.epmet.dto.IssueDTO;
 import com.epmet.dto.IssueProcessDTO;
 import com.epmet.dto.form.IssueIdFormDTO;
 import com.epmet.dto.form.ProcessProjectIdFormDTO;
+import com.epmet.dto.result.IssueAdvanceResDTO;
 import com.epmet.dto.result.ProcessListResultDTO;
+import com.epmet.dto.result.ProcessListResultDTOBak;
+import com.epmet.dto.result.ProjectProcessListResultDTO;
 import com.epmet.entity.IssueProcessEntity;
-import com.epmet.feign.GovProjectFeignClient;
+import com.epmet.feign.GovProjectOpenFeignClient;
 import com.epmet.service.IssueProcessService;
 import com.epmet.service.IssueService;
 import org.apache.commons.lang3.StringUtils;
@@ -60,11 +63,11 @@ public class IssueProcessServiceImpl extends BaseServiceImpl<IssueProcessDao, Is
     @Autowired
     private IssueService issueService;
     @Autowired
-    private GovProjectFeignClient govProjectFeignClient;
-    @Autowired
     private IssueProjectRelationDao issueProjectRelationDao;
     @Autowired
     private IssueProcessDao issueProcessDao;
+    @Autowired
+    private GovProjectOpenFeignClient govProjectOpenFeignClient;
 
     @Override
     public PageData<IssueProcessDTO> page(Map<String, Object> params) {
@@ -150,12 +153,12 @@ public class IssueProcessServiceImpl extends BaseServiceImpl<IssueProcessDao, Is
             if (!StringUtils.isBlank(projectId)) {
                 ProcessProjectIdFormDTO formDTO = new ProcessProjectIdFormDTO();
                 formDTO.setProjectId(projectId);
-                Result<List<ProcessListResultDTO>> resultDTO = govProjectFeignClient.projectProcessList(formDTO);
+                Result<List<ProjectProcessListResultDTO>> resultDTO = govProjectOpenFeignClient.projectProcessList(formDTO);
                 if (!resultDTO.success()){
                     throw new RenException(IssueConstant.PROJECT_PROCESS_LIST_FAILURE);
                 }
                 if (!CollectionUtils.isEmpty(resultDTO.getData())){
-                    listResult.addAll(resultDTO.getData());
+                    listResult.addAll(ConvertUtils.sourceToTarget(resultDTO.getData(),ProcessListResultDTO.class));
                 }
             }
         }
@@ -167,4 +170,29 @@ public class IssueProcessServiceImpl extends BaseServiceImpl<IssueProcessDao, Is
         return listResult;
     }
 
+    /**
+     * 议题处理进展(只包含发起议题、关闭议题)
+     *
+     * @param issueId
+     * @return
+     */
+    @Override
+    public IssueAdvanceResDTO queryIssueProcess(IssueIdFormDTO issueId) {
+        IssueDTO issueDTO = issueService.get(issueId.getIssueId());
+        List<ProcessListResultDTO> processList=new ArrayList<>();
+        if (issueDTO.getIssueStatus().equals(IssueConstant.ISSUE_CLOSED)){
+            //已关闭——处理进展
+            processList = baseDao.issueProcess(issueId);
+        }
+        //转议题信息
+        ProcessListResultDTO issueProcessResultDTO = issueProcessDao.issueBeginInfo(issueId);
+        if (null != issueProcessResultDTO) {
+            processList.add(issueProcessResultDTO);
+        }
+        IssueAdvanceResDTO issueAdvanceResDTO=new IssueAdvanceResDTO();
+        issueAdvanceResDTO.setIssueId(issueDTO.getId());
+        issueAdvanceResDTO.setIssueStatus(issueDTO.getIssueStatus());
+        issueAdvanceResDTO.setProcessList(ConvertUtils.sourceToTarget(processList, ProcessListResultDTOBak.class));
+        return issueAdvanceResDTO;
+    }
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -677,6 +677,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
             //查询话题失败异常
         }else if (ModuleConstants.ISSUE.equals(issueDetail.getSourceType())){
             issueInfo = ConvertUtils.sourceToTarget(issueDetail,GovIssueDetailResultDTO.class);
+            issueInfo.setIssueSuggestion(issueDetail.getSuggestion());
             Result<List<UserBaseInfoResultDTO>> userResult = userOpenFeignClient.queryUserBaseInfo(Arrays.asList(issueDetail.getCreatedBy()));
             if (!userResult.success() || CollectionUtils.isEmpty(userResult.getData())){
                 throw new EpmetException("查询居民信息失败");
@@ -688,6 +689,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
             return issueInfo;
         }else {
             issueInfo = ConvertUtils.sourceToTarget(issueDetail,GovIssueDetailResultDTO.class);
+            issueInfo.setIssueSuggestion(issueDetail.getSuggestion());
             CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(issueDetail.getCustomerId(), issueDetail.getCreatedBy());
             if (null == staffInfo){
                 throw new EpmetException("查询工作人员信息失败："+issueDetail.getCreatedBy());