From bb6b615d79f351f6a258dc776ebeb52909e8a094 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Sat, 8 Oct 2022 14:51:41 +0800
Subject: [PATCH] =?UTF-8?q?/issue/closedproject=E5=B7=B2=E5=A4=84=E7=90=86?=
 =?UTF-8?q?-=E5=B7=B2=E7=BB=93=E6=A1=88=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/result/ResolvedResultDTO.java   | 22 ++++++++
 .../src/main/resources/mapper/ProjectDao.xml  |  7 ++-
 .../epmet/service/impl/IssueServiceImpl.java  | 56 ++++++++++++++-----
 3 files changed, 68 insertions(+), 17 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResolvedResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResolvedResultDTO.java
index 14187406e3..3c676185b9 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResolvedResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResolvedResultDTO.java
@@ -13,6 +13,7 @@ import java.util.List;
 @Data
 public class ResolvedResultDTO implements Serializable {
 	private static final long serialVersionUID = -6670213622289052352L;
+	private String projectId;
 	/**
 	 * 议题Id
 	 */
@@ -53,4 +54,25 @@ public class ResolvedResultDTO implements Serializable {
 	private String longitude;
 	private String latitude;
 
+	/**
+	 * 项目来源：
+	 * 来源议题 issue
+	 * 项目立项 agency
+	 * 旧版事件上报 resi_event
+	 * 工作人员上报(巡查) work_event
+	 * 新版事件上报 ic_event
+	 */
+	private String projectOrigin;
+	/**
+	 * 话题id
+	 */
+	private String topicId;
+	/**
+	 * 来源类型 话题：resi_topic；直接立议题：issue；
+	 */
+	private String issueSourceType;
+	/**
+	 * 发布议题的图片
+	 */
+	private List<String> issueImgs;
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
index 73291bb680..8c3f58f3f5 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
@@ -361,17 +361,20 @@
         ORDER BY a.CREATED_TIME DESC
     </select>
 
+    <!-- 已结案：议题已转项目，且项目结案选择已解决   -->
     <select id="selectResolvedListByGrid" resultType="com.epmet.dto.result.ResolvedResultDTO">
         SELECT
+            a.ID AS projectId,
             a.ORIGIN_ID AS issueId,
             a.TITLE AS issueTitle,
             c.PUBLIC_REPLY AS publicReply,
             UNIX_TIMESTAMP(a.UPDATED_TIME) AS closedTime,
-            b.SOURCE_ID AS sourceId
+            b.SOURCE_ID AS sourceId,
+            a.ORIGIN as projectOrigin
         FROM
             project a
         INNER JOIN project_related_personnel b ON a.ID = b.PROJECT_ID
-        AND b.SOURCE_TYPE = 'topic'
+        AND b.SOURCE_TYPE = 'issue'
         AND b.GRID_ID = #{gridId}
         LEFT JOIN project_process c ON a.ID = c.PROJECT_ID
         AND c.OPERATION = 'close'
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
index 0c7d9ded4c..d23515b003 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
@@ -563,30 +563,56 @@ public class IssueServiceImpl implements IssueService {
      */
     @Override
     public List<ResolvedResultDTO> getClosedProjectList(ShiftProjectListFromDTO formDTO) {
-        List<ResolvedResultDTO> resultList = govProjectOpenFeignClient.getResolvedList(formDTO).getData();
+        //查询项目（来源于议题的）已结案已解决的
+        Result<List<ResolvedResultDTO>> projectRes=govProjectOpenFeignClient.getResolvedList(formDTO);
+        if(!projectRes.success()){
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getMsg());
+        }
+        List<ResolvedResultDTO> resultList = projectRes.getData();
         if (org.apache.commons.collections4.CollectionUtils.isEmpty(resultList)) {
             return new ArrayList<>();
         }
 
-        List<String> topicIds = resultList.stream().map(ResolvedResultDTO::getSourceId).collect(Collectors.toList());
-        TopicDetailBatchFormDTO form = new TopicDetailBatchFormDTO();
-        form.setTopicIdList(topicIds);
-        Result<List<ResiTopicDetailResultDTO>> topicDetailsResult = resiGroupOpenFeignClient.listTopicDetailsByIds(form);
-        if (!topicDetailsResult.success()) {
-            logger.error("调用resi-group批量查询详情失败");
-        } else {
-            List<ResiTopicDetailResultDTO> topicDetails = topicDetailsResult.getData();
-            HashMap<String, ResiTopicDetailResultDTO> rtm = convertTopicDetailList2Map(topicDetails);
+        // 话题信息
+        HashMap<String, ResiTopicDetailResultDTO> rtm=new HashMap<>();
+        // 议题信息
+        //2、根据议题id查询话题id
+        List<String> issueIds = resultList.stream().map(ResolvedResultDTO::getIssueId).collect(Collectors.toList());
+        // 根据议题id查询话题id
+        Result<List<IssueProfileDTO>> issueRes = govIssueOpenFeignClient.getIssueProfile(issueIds);
+
+        if (issueRes.success() && !CollectionUtils.isEmpty(issueRes.getData())) {
+            // 3、如果存在议题来源于话题
+            List<String> topicIds = issueRes.getData().stream().filter(t -> t.getIssueSourceType().equals("resi_topic")).map(IssueProfileDTO::getSourceId).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(topicIds)) {
+                // 3.1 查询话题详情
+                TopicDetailBatchFormDTO form = new TopicDetailBatchFormDTO();
+                form.setTopicIdList(topicIds);
+                Result<List<ResiTopicDetailResultDTO>> topicDetailsResult = resiGroupOpenFeignClient.listTopicDetailsByIds(form);
+                if (topicDetailsResult.success() && !CollectionUtils.isEmpty(topicDetailsResult.getData())) {
+                    List<ResiTopicDetailResultDTO> topicDetails = topicDetailsResult.getData();
+                    topicDetails.stream().forEach(t -> {
+                        if(StringUtils.isNotBlank(t.getIssueId())){
+                            rtm.put(t.getIssueId(), t);
+                        }
+                    });
+                }
+            }
+            Map<String,IssueProfileDTO> issueMap=issueRes.getData().stream().collect(Collectors.toMap(IssueProfileDTO::getIssueId, o -> o, (o1, o2) -> o1));
+            // 赋值话题信息、议题来源、议题图片
             resultList.forEach(vi -> {
-                ResiTopicDetailResultDTO rr = rtm.get(vi.getSourceId());
+                ResiTopicDetailResultDTO rr = rtm.get(vi.getIssueId());
                 vi.setTopicImgs(rr == null ? new ArrayList<>() : rr.getTopicImgs());
                 vi.setTopicVoices(rr == null ? new ArrayList<>() : rr.getTopicImgs());
-                vi.setTopicContent(rr == null ? "" : rr.getTopicContent());
-                vi.setLongitude(rr == null ? "" : rr.getLongitude());
-                vi.setLatitude(rr == null ? "" : rr.getLatitude());
+                vi.setTopicContent(rr == null ? StrConstant.EPMETY_STR : rr.getTopicContent());
+                vi.setLongitude(rr == null ? StrConstant.EPMETY_STR : rr.getLongitude());
+                vi.setLatitude(rr == null ? StrConstant.EPMETY_STR : rr.getLatitude());
+                vi.setTopicId(null == rr ? StrConstant.EPMETY_STR : rr.getTopicId());
+                IssueProfileDTO issue = issueMap.get(vi.getIssueId());
+                vi.setIssueSourceType(null != issue ? issue.getIssueSourceType() : StrConstant.EPMETY_STR);
+                vi.setIssueImgs(null != issue ? issue.getIssueImgs() : new ArrayList<>());
             });
         }
-
         return resultList;
     }