Merge remote-tracking branch 'origin/dev_2021_12_30_bug' into develop

# Conflicts:
#	epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java

@@ -38,6 +38,7 @@ import com.epmet.util.DimIdGenerator;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -127,17 +128,26 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 		//获取项目信息
 		List<ProjectDTO> projectList = projectService.getProjectInfo(customerId, dateString, projectId);
 		factOriginProjectMainDailyService.deleteByDate(customerId, dateString,projectId);
+		List<IssueDTO> issueList = new ArrayList<>();
+		List<ResiTopicDTO> topicList = new ArrayList<>();
 		if (!CollectionUtils.isEmpty(projectList)) {
 			Map<String, ResiEventDTO> projectEventMap = projectService.getEventList(customerId);
 			//提取议题ID
 			List<String> issueIds =
 					projectList.stream().filter(item -> ProjectConstant.ISSUE.equals(item.getOrigin())).map(ProjectDTO::getOriginId).collect(Collectors.toList());
+			if (CollectionUtils.isNotEmpty(issueIds)) {
+				//分批次获取
 				//获取议题信息
-			List<IssueDTO> issueList = issueService.getIssueInfoByIds(issueIds);
+				List<List<String>> partition = ListUtils.partition(issueIds, NumConstant.FIFTY);
+				partition.forEach(part -> issueList.addAll(issueService.getIssueInfoByIds(part)));
 				//提取话题ID
 				List<String> topicIds = issueList.stream().map(IssueDTO::getSourceId).collect(Collectors.toList());
+				if (CollectionUtils.isNotEmpty(topicIds)) {
 					//获取话题信息
-			List<ResiTopicDTO> topicList = topicService.getTopicByIds(topicIds);
+					List<List<String>> topicPart = ListUtils.partition(topicIds, NumConstant.FIFTY);
+					topicPart.forEach(part -> topicList.addAll(topicService.getTopicByIds(part)));
+				}
+			}
 			//获取网格认证党员
 			List<PartyMemberDTO> partyMemberList = partyMemberService.getPartyMemberByCustomer(customerId);
 			//生成DTO

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SonOrgResultDTO.java

@@ -0,0 +1,20 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/12/31 10:22 上午
+ * @DESC
+ */
+@Data
+public class SonOrgResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -1046350929245852333L;
+
+    private String orgId;
+
+    private String pids;
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -539,7 +539,7 @@ public interface GovOrgOpenFeignClient {
      * @date 2021/12/9 4:42 下午
      */
     @PostMapping("/gov/org/agency/getsonagencyid")
-    Result<List<String>> getSonAgencyId(@RequestParam("orgId")String orgId);
+    Result<List<SonOrgResultDTO>> getSonAgencyId(@RequestParam("orgId")String orgId,@RequestParam("type")String type);
     
 //    /icbuilding/{id}?id=demoData
 

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

@@ -335,8 +335,8 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
     }
 
     @Override
-    public Result<List<String>> getSonAgencyId(String orgId) {
-        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getSonAgencyId", orgId);
+    public Result<List<SonOrgResultDTO>> getSonAgencyId(String orgId,String type) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getSonAgencyId", orgId,type);
     }
 
     @Override

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java

@@ -356,8 +356,8 @@ public class AgencyController {
      * @date 2021/12/9 4:42 下午
      */
     @PostMapping("getsonagencyid")
-    public Result<List<String>> getSonAgencyId(@RequestParam("orgId")String orgId){
-        return new Result<List<String>>().ok(agencyService.getSonAgencyId(orgId));
+    public Result<List<SonOrgResultDTO>> getSonAgencyId(@RequestParam("orgId")String orgId,@RequestParam("type")String type){
+        return new Result<List<SonOrgResultDTO>>().ok(agencyService.getSonAgencyId(orgId,type));
     }
 
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java

@@ -289,7 +289,9 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      * @author zxc
      * @date 2021/12/9 4:42 下午
      */
-    List<String> getSonAgencyId(@Param("orgId") String orgId);
+    List<SonOrgResultDTO> getSonAgencyId(@Param("orgId") String orgId);
+
+    List<SonOrgResultDTO> getSonGridId(@Param("orgId") String orgId);
 
     /**
      * desc:获取组织和网格的数据 树形sql

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java

@@ -154,6 +154,6 @@ public interface AgencyService {
      * @author zxc
      * @date 2021/12/9 4:42 下午
      */
-    List<String> getSonAgencyId(String orgId);
+    List<SonOrgResultDTO> getSonAgencyId(String orgId,String type);
 
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java

@@ -644,8 +644,13 @@ public class AgencyServiceImpl implements AgencyService {
      * @date 2021/12/9 4:42 下午
      */
     @Override
-    public List<String> getSonAgencyId(String orgId) {
-        List<String> result = customerAgencyDao.getSonAgencyId(orgId);
+    public List<SonOrgResultDTO> getSonAgencyId(String orgId,String type) {
+        List<SonOrgResultDTO> result = new ArrayList<>();
+        if (type.equals("community")){
+            result = customerAgencyDao.getSonGridId(orgId);
+        }else {
+            result = customerAgencyDao.getSonAgencyId(orgId);
+        }
         if (CollectionUtils.isNotEmpty(result)){
             return result;
         }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

@@ -684,9 +684,10 @@
     </select>
 
     <!-- 查询下级agencyId -->
-    <select id="getSonAgencyId" resultType="java.lang.String">
+    <select id="getSonAgencyId" resultType="com.epmet.dto.result.SonOrgResultDTO">
         SELECT
-            ID
+            ID AS orgId,
+            pids
         FROM customer_agency
         WHERE
             DEL_FLAG = '0'
@@ -720,5 +721,14 @@
         AND ca.del_flag = '0'
         AND cg.id = #{gridId}
     </select>
+    <select id="getSonGridId" resultType="com.epmet.dto.result.SonOrgResultDTO">
+        SELECT
+            ID AS orgId,
+            pids
+        FROM customer_grid
+        WHERE
+            DEL_FLAG = '0'
+          AND PID = #{orgId}
+    </select>
 
 </mapper>

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

@@ -2917,22 +2917,26 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		}
 		ProjectDistributionAnalysisRightResultDTO result = new ProjectDistributionAnalysisRightResultDTO();
 		List<ProjectDistributionAnalysisRightDTO> orgList = new ArrayList<>();
-		if (!agencyInfo.getLevel().equals(ProjectConstant.ORG_LEVEL_COMMUNITY)){
-			Result<List<String>> sonAgencyIdResult = govOrgOpenFeignClient.getSonAgencyId(formDTO.getOrgId());
-			if (!sonAgencyIdResult.success()){
-				throw new EpmetException(String.format("查询组织{%s}的下级组织失败...",formDTO.getOrgId()));
-			}
-			List<String> agencyIds = sonAgencyIdResult.getData();
-			if (CollectionUtils.isNotEmpty(agencyIds)){
-				orgList = baseDao.selectProjectCountByOrg(agencyIds,formDTO.getStartDate(),formDTO.getEndDate());
+		Result<List<SonOrgResultDTO>> sonOrgList = govOrgOpenFeignClient.getSonAgencyId(formDTO.getOrgId(), agencyInfo.getLevel());
+		if (!sonOrgList.success() || CollectionUtils.isEmpty(sonOrgList.getData())){
+			throw new EpmetException(String.format("查询组织{%s}的下级组织失败或为空...",formDTO.getOrgId()));
 		}
+		List<SonOrgResultDTO> orgIds = sonOrgList.getData();
+		if (!agencyInfo.getLevel().equals(ProjectConstant.ORG_LEVEL_COMMUNITY)){
+			orgList = baseDao.selectProjectCountByOrg(orgIds.stream().map(m -> m.getPids()).collect(Collectors.toList()), formDTO.getStartDate(),formDTO.getEndDate());
 		}else {
+			for (SonOrgResultDTO o : orgIds) {
+				ProjectDistributionAnalysisRightDTO dto = new ProjectDistributionAnalysisRightDTO();
+				dto.setOrgId(o.getOrgId());
+				orgList.add(dto);
+			}
 			Result<List<ProjectDistributionAnalysisRightDTO>> projectCountByGrid = govIssueOpenFeignClient.getProjectCountByGrid(formDTO);
 			if (!projectCountByGrid.success()){
 				throw new EpmetException("查询网格项目数失败...");
 			}
 			if (CollectionUtils.isNotEmpty(projectCountByGrid.getData())){
-				orgList = projectCountByGrid.getData();
+				orgList.stream().forEach(o -> projectCountByGrid.getData().stream().filter(p -> p.getOrgId().equals(o.getOrgId())).forEach(p -> o.setCount(p.getCount())));
+
 			}
 		}
 		if (CollectionUtils.isEmpty(orgList)){

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml

@@ -476,7 +476,7 @@
                 COUNT(ID) AS count
             FROM project
             WHERE DEL_FLAG = '0'
-                AND ORG_ID_PATH LIKE CONCAT('%',#{orgId},'%')
+                AND ORG_ID_PATH LIKE CONCAT(#{orgId},'%')
                 AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') >= #{startDate}
                 AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{endDate}
         </foreach>