ai

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

@@ -50,4 +50,6 @@ public class MyPubIssuesAuditingResultDTO implements Serializable {
     @JsonIgnore
     private String topicId;
 
+    private String sourceType;
+
 }

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

@@ -1456,7 +1456,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
                 throw new RenException("查询议题来源网格名称失败......");
             }
             list.forEach(l -> gridNameList.getData().stream().filter(o -> l.getGridId().equals(o.getGridId())).forEach(o -> l.setTopicReleaseGridName(o.getGridName())));
-            Result<List<GroupInfoResultDTO>> groupNameList = resiGroupOpenFeignClient.selectGroupInfo(new GroupInfoFormDTO(list.stream().map(m -> m.getTopicId()).collect(Collectors.toList())));
+            Result<List<GroupInfoResultDTO>> groupNameList = resiGroupOpenFeignClient.selectGroupInfo(new GroupInfoFormDTO(list.stream().filter(l -> l.getSourceType().equals(ModuleConstants.ISSUE_FROM_TOPIC)).map(m -> m.getTopicId()).collect(Collectors.toList())));
             if (!groupNameList.success()){
                 throw new RenException("查询议题来源小组名称失败......");
             }

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml

@@ -514,6 +514,7 @@
             i.SUGGESTION,
             i.ISSUE_TITLE,
             i.SOURCE_ID AS topicId,
+            i.SOURCE_TYPE AS sourceType,
             i.GRID_ID AS gridId,
             UNIX_TIMESTAMP(i.CREATED_TIME) AS shiftIssueTime
         FROM issue i

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

@@ -17,6 +17,8 @@ public class MyPubIssuesClosedResultDTO implements Serializable {
      * 议题id
      */
     private String issueId;
+    private String sourceId;
+    private String sourceType;
 
     /**
      *  议题标题
@@ -36,11 +38,11 @@ public class MyPubIssuesClosedResultDTO implements Serializable {
     /**
      * 话题发表于哪个组
      */
-    private String topicReleaseGroupName;
+    private String topicReleaseGroupName = "";
 
     /**
      * 话题发表于哪个网格
      */
-    private String topicReleaseGridName;
+    private String topicReleaseGridName = "";
 
 }

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

@@ -45,4 +45,6 @@ public class MyPubIssuesShiftProjectResultDTO implements Serializable {
     private String topicReleaseGroupName;
 
     private String issueId;
+    private String sourceId;
+    private String sourceType;
 }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/IssueServiceImpl.java

@@ -188,11 +188,17 @@ public class IssueServiceImpl implements IssueService {
         }
         //查询话题来源小组名称
         Result<List<GroupInfoResultDTO>> groupNameList = resiGroupOpenFeignClient.selectGroupInfo(new GroupInfoFormDTO(topicIds));
+        if (!CollectionUtils.isEmpty(topicIds)){
+            groupNameList = resiGroupOpenFeignClient.selectGroupInfo(new GroupInfoFormDTO(topicIds));
+        }
         if (!groupNameList.success()){
             logger.error("查询议题来源小组名称失败......");
         }
         //查询项目基本信息
-        Result<List<ProjectDTO>> projectRes=govProjectOpenFeignClient.queryProjectInfoByIds(projectIds);
+        Result<List<ProjectDTO>> projectRes = new Result<>();
+        if (!CollectionUtils.isEmpty(projectIds)){
+            projectRes = govProjectOpenFeignClient.queryProjectInfoByIds(projectIds);
+        }
         if(!projectRes.success()){
             logger.error("查询项目信息失败......");
         }
@@ -201,14 +207,21 @@ public class IssueServiceImpl implements IssueService {
             MyPubIssuesShiftProjectResultDTO resultDTO=new MyPubIssuesShiftProjectResultDTO();
             resultDTO.setIssueId(issueDTO.getId());
             resultDTO.setProjectId(issueDTO.getProjectId());
-            gridNameList.getData().stream().filter(o -> issueDTO.getGridId().equals(o.getGridId())).forEach(o -> resultDTO.setTopicReleaseGridName(o.getGridName()));
-            groupNameList.getData().stream().filter(g -> issueDTO.getSourceId().equals(g.getTopicId())).forEach(g -> resultDTO.setTopicReleaseGroupName(g.getTopicGroupName()));
+            resultDTO.setSourceId(issueDTO.getSourceId());
+            resultDTO.setSourceType(issueDTO.getSourceType());
+            if (!CollectionUtils.isEmpty(gridNameList.getData())){
+                gridNameList.getData().stream().filter(o -> issueDTO.getGridId().equals(o.getGridId())).forEach(o -> resultDTO.setTopicReleaseGridName(o.getGridName()));
+            }
+            if (!CollectionUtils.isEmpty(groupNameList.getData())){
+                groupNameList.getData().stream().filter(g -> issueDTO.getSourceId().equals(g.getTopicId())).forEach(g -> resultDTO.setTopicReleaseGroupName(g.getTopicGroupName()));
+            }
             resultDTO.setShiftProjectTime(issueDTO.getShiftedTimeStamp());
 
-
-            projectRes.getData().stream().filter(p->issueDTO.getProjectId().equals(p.getId())).forEach(projectDTO -> resultDTO.setProjectTitle(projectDTO.getTitle()));
-            //当前处理部门名称列表
-            projectRes.getData().stream().filter(p->issueDTO.getProjectId().equals(p.getId())).forEach(projectDTO -> resultDTO.setDepartmentNameList(projectDTO.getCurrentDepartmentNameList()));
+            if (!CollectionUtils.isEmpty(projectRes.getData())){
+                projectRes.getData().stream().filter(p->issueDTO.getProjectId().equals(p.getId())).forEach(projectDTO -> resultDTO.setProjectTitle(projectDTO.getTitle()));
+                //当前处理部门名称列表
+                projectRes.getData().stream().filter(p->issueDTO.getProjectId().equals(p.getId())).forEach(projectDTO -> resultDTO.setDepartmentNameList(projectDTO.getCurrentDepartmentNameList()));
+            }
             list.add(resultDTO);
         }
         return list;
@@ -244,6 +257,9 @@ public class IssueServiceImpl implements IssueService {
         }
         //查询话题来源小组名称
         Result<List<GroupInfoResultDTO>> groupNameList = resiGroupOpenFeignClient.selectGroupInfo(new GroupInfoFormDTO(topicIds));
+        if (!CollectionUtils.isEmpty(topicIds)){
+            groupNameList = resiGroupOpenFeignClient.selectGroupInfo(new GroupInfoFormDTO(topicIds));
+        }
         if (!groupNameList.success()){
             logger.error("查询议题来源小组名称失败......");
         }
@@ -254,8 +270,14 @@ public class IssueServiceImpl implements IssueService {
             resultDTO.setIssueTitle(issueDTO.getIssueTitle());
             resultDTO.setSuggestion(issueDTO.getSuggestion());
             resultDTO.setClosedTime(issueDTO.getClosedTimeStamp());
-            gridNameList.getData().stream().filter(o -> issueDTO.getGridId().equals(o.getGridId())).forEach(o -> resultDTO.setTopicReleaseGridName(o.getGridName()));
-            groupNameList.getData().stream().filter(g -> issueDTO.getSourceId().equals(g.getTopicId())).forEach(g -> resultDTO.setTopicReleaseGroupName(g.getTopicGroupName()));
+            resultDTO.setSourceId(issueDTO.getSourceId());
+            resultDTO.setSourceType(issueDTO.getSourceType());
+            if (!CollectionUtils.isEmpty(gridNameList.getData())){
+                gridNameList.getData().stream().filter(o -> issueDTO.getGridId().equals(o.getGridId())).forEach(o -> resultDTO.setTopicReleaseGridName(o.getGridName()));
+            }
+            if (!CollectionUtils.isEmpty(groupNameList.getData())){
+                groupNameList.getData().stream().filter(g -> issueDTO.getSourceId().equals(g.getTopicId())).forEach(g -> resultDTO.setTopicReleaseGroupName(g.getTopicGroupName()));
+            }
             resultDTOList.add(resultDTO);
         }
         return resultDTOList;