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

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java

@@ -259,6 +259,6 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
 	 * @author zxc
 	 * @date 2021/12/10 10:31 上午
 	 */
-	List<ProjectDistributionAnalysisRightDTO> selectProjectCountByOrg(List<String> orgIds,@Param("startDate")String startDate,@Param("endDate")String endDate);
+	List<ProjectDistributionAnalysisRightDTO> selectProjectCountByOrg(List<SonOrgResultDTO> orgIds,@Param("startDate")String startDate,@Param("endDate")String endDate);
 
 }

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

@@ -2924,6 +2924,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		if (CollectionUtils.isEmpty(sonOrgList.getData())){
 			return result;
 		}
+		// 所有子级orgId，并构建全部数据
 		List<SonOrgResultDTO> orgIds = sonOrgList.getData();
 		for (SonOrgResultDTO o : orgIds) {
 			ProjectDistributionAnalysisRightDTO dto = new ProjectDistributionAnalysisRightDTO();
@@ -2932,7 +2933,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		}
 		List<ProjectDistributionAnalysisRightDTO> dtos;
 		if (!agencyInfo.getLevel().equals(ProjectConstant.ORG_LEVEL_COMMUNITY)){
-			dtos = baseDao.selectProjectCountByOrg(orgIds.stream().map(m -> m.getOrgId()).collect(Collectors.toList()), formDTO.getStartDate(), formDTO.getEndDate());
+			dtos = baseDao.selectProjectCountByOrg(orgIds, formDTO.getStartDate(),formDTO.getEndDate());
 		}else {
 			Result<List<ProjectDistributionAnalysisRightDTO>> projectCountByGrid = govIssueOpenFeignClient.getProjectCountByGrid(formDTO);
 			if (!projectCountByGrid.success()){

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

@@ -470,17 +470,15 @@
 
     <!-- 查询组织下的项目数 -->
     <select id="selectProjectCountByOrg" resultType="com.epmet.dto.result.ProjectDistributionAnalysisRightDTO">
-        SELECT
-            AGENCY_ID AS orgId,
-            COUNT(ID) AS count
-        FROM project
-        WHERE DEL_FLAG = '0'
-            AND AGENCY_ID IN (
-                <foreach collection="orgIds" item="o" separator=",">
-                    #{o}
-                </foreach>)
-            AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') >= #{startDate}
-            AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{endDate}
-        GROUP BY AGENCY_ID
+        <foreach collection="orgIds" item="o" separator=" UNION ALL ">
+            SELECT
+                #{o.orgId} AS orgId,
+                COUNT(ID) AS count
+            FROM project
+            WHERE DEL_FLAG = '0'
+                AND ORG_ID_PATH LIKE CONCAT(#{o.pids},#{o.orgId},'%')
+                AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') >= #{startDate}
+                AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{endDate}
+        </foreach>
     </select>
 </mapper>