议事厅-表决中议题列表。调整完成

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java

@@ -2,6 +2,7 @@ package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.IcEventDTO;
 import com.epmet.dto.ProjectCategoryDTO;
 import com.epmet.dto.ProjectDTO;
 import com.epmet.dto.form.*;
@@ -178,4 +179,11 @@ public interface GovProjectOpenFeignClient {
 	@PostMapping("gov/project/project/staffpendingproject")
 	Result<List<ProjectDTO>> staffPendingProject(@RequestBody ProjectListFromDTO formDTO);
 
+	/**
+	 * 批量查询事件信息
+	 * @param icEventIds
+	 * @return
+	 */
+	@PostMapping("gov/project/icEvent/batchSelectById")
+    Result<List<IcEventDTO>> batchSelectById(@RequestBody List<String> icEventIds);
 }

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java

@@ -3,6 +3,7 @@ package com.epmet.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.IcEventDTO;
 import com.epmet.dto.ProjectCategoryDTO;
 import com.epmet.dto.ProjectDTO;
 import com.epmet.dto.form.*;
@@ -174,4 +175,15 @@ public class GovProjectOpenFeignClientFallback implements GovProjectOpenFeignCli
 	public Result<List<ProjectDTO>> staffPendingProject(ProjectListFromDTO formDTO) {
 		return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "staffPendingProject",formDTO);
 	}
+
+	/**
+	 * 批量查询事件信息
+	 *
+	 * @param icEventIds
+	 * @return
+	 */
+	@Override
+	public Result<List<IcEventDTO>> batchSelectById(List<String> icEventIds) {
+		return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "batchSelectById",icEventIds);
+	}
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java

@@ -542,6 +542,18 @@ public class IcEventController {
         return new Result<PageData<PageUserReportEventResDTO>>().ok(icEventService.icEventPageUserReported(formDTO));
     }
 
-
+    /**
+     * 批量查询事件信息
+     *
+     * @param icEventIds
+     * @return
+     */
+    @PostMapping("gov/project/icEvent/batchSelectById")
+    public Result<List<IcEventDTO>> batchSelectById(@RequestBody List<String> icEventIds) {
+        if (CollectionUtils.isEmpty(icEventIds)) {
+            return new Result<>();
+        }
+        return new Result<List<IcEventDTO>>().ok(icEventService.batchSelectById(icEventIds));
+    }
 
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java

@@ -230,4 +230,11 @@ public interface IcEventService extends BaseService<IcEventEntity> {
      * @param formDTO
      */
     void icEventToIssue(IcEventToIssueFormDTO formDTO);
+
+    /**
+     * 批量查询事件信息
+     * @param icEventIds
+     * @return
+     */
+    List<IcEventDTO> batchSelectById(List<String> icEventIds);
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java

@@ -1803,4 +1803,16 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
         icEventOperationLogService.insert(logEntity);
     }
 
+    /**
+     * 批量查询事件信息
+     *
+     * @param icEventIds
+     * @return
+     */
+    @Override
+    public List<IcEventDTO> batchSelectById(List<String> icEventIds) {
+        List<IcEventEntity>list=baseDao.selectBatchIds(icEventIds);
+        return ConvertUtils.sourceToTarget(list,IcEventDTO.class);
+    }
+
 }

epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/HallIcEventDTO.java

@@ -12,6 +12,13 @@ import java.io.Serializable;
 @Data
 public class HallIcEventDTO implements Serializable {
     private static final long serialVersionUID = -6245586010939647194L;
-    //     todo
+    /**
+     * 事件Id
+     */
+    private String icEventId;
+    /**
+     * 事件内容
+     */
+    private String eventContent;
 }
 

epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java

@@ -73,7 +73,7 @@ public class VotingIssueListResultDTO implements Serializable {
     /**
      * 话题信息-2022.10.10
      */
-    private TopicInfoDTO topicInfoDTO;
+    private TopicInfoDTO topicInfo;
     /**
      * 事件信息-2022.10.10
      */

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -10,6 +10,7 @@ import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constat.HallConstat;
+import com.epmet.dto.IcEventDTO;
 import com.epmet.dto.IssueSuggestionDTO;
 import com.epmet.dto.TopicInfoDTO;
 import com.epmet.dto.form.*;
@@ -443,14 +444,26 @@ public class IssueServiceImpl implements IssueService {
                         topicInfoDTO.setTopicVoices(rr.getTopicVoices());
                         topicInfoDTO.setPublishedUser(rr.getReleaseUserName());
                         topicInfoDTO.setReleaseTime(rr.getReleaseTime());
-                        vi.setTopicInfoDTO(topicInfoDTO);
+                        vi.setTopicInfo(topicInfoDTO);
                     });
                 }
             }
-            //来源于事件的
+            // 来源于事件的
             List<String> icEventIds = votingIssueList.stream().filter(t -> t.getSourceType().equals("ic_event")).map(i -> i.getSourceId()).collect(Collectors.toList());
-            if(!CollectionUtils.isEmpty(icEventIds)){
-                // todo 查询事件详情
+            if (!CollectionUtils.isEmpty(icEventIds)) {
+                Result<List<IcEventDTO>> eventInfoRes = govProjectOpenFeignClient.batchSelectById(icEventIds);
+                if (eventInfoRes.success() && !CollectionUtils.isEmpty(eventInfoRes.getData())) {
+                    Map<String, IcEventDTO> eventMap = eventInfoRes.getData().stream().collect(Collectors.toMap(IcEventDTO::getId, o -> o, (o1, o2) -> o1));
+                    votingIssueList.forEach(vi -> {
+                        IcEventDTO event = eventMap.get(vi.getSourceId());
+                        if (null != event) {
+                            HallIcEventDTO hallIcEventDTO = new HallIcEventDTO();
+                            hallIcEventDTO.setIcEventId(event.getId());
+                            hallIcEventDTO.setEventContent(event.getEventContent());
+                            vi.setIcEventInfo(hallIcEventDTO);
+                        }
+                    });
+                }
             }
         }
         return votingIssueList;