From 824167180dbb9f2de41ad20563937cfada5a49fe Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 31 Dec 2021 13:25:42 +0800
Subject: [PATCH 1/2] emm

---
 .../src/main/java/com/epmet/dao/ProjectDao.java               | 2 +-
 .../main/java/com/epmet/service/impl/ProjectServiceImpl.java  | 2 +-
 .../src/main/resources/mapper/ProjectDao.xml                  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java
index d0d71cab98..0f91019b54 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java
@@ -265,6 +265,6 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
 	 * @author zxc
 	 * @date 2021/12/10 10:31 上午
 	 */
-	List<ProjectDistributionAnalysisRightDTO> selectProjectCountByOrg(@Param("orgIds")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);
 
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
index e3a705b1a4..db10234c0b 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@@ -2921,7 +2921,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		}
 		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());
+			orgList = baseDao.selectProjectCountByOrg(orgIds, formDTO.getStartDate(),formDTO.getEndDate());
 		}else {
 			for (SonOrgResultDTO o : orgIds) {
 				ProjectDistributionAnalysisRightDTO dto = new ProjectDistributionAnalysisRightDTO();
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 676ff317c1..464bcf4db4 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
@@ -472,9 +472,9 @@
 
     <!-- 查询组织下的项目数 -->
     <select id="selectProjectCountByOrg" resultType="com.epmet.dto.result.ProjectDistributionAnalysisRightDTO">
-        <foreach collection="orgIds" item="orgId" separator=" UNION ALL ">
+        <foreach collection="orgIds" item="o" separator=" UNION ALL ">
             SELECT
-                #{orgId} AS orgId,
+                #{o.orgId} AS orgId,
                 COUNT(ID) AS count
             FROM project
             WHERE DEL_FLAG = '0'

From fbfb4709bf0cf0548aff5cbe942e5a74cfa3d7f4 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 31 Dec 2021 13:36:27 +0800
Subject: [PATCH 2/2] bug

---
 .../gov-project-server/src/main/resources/mapper/ProjectDao.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 464bcf4db4..c0226d7499 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
@@ -478,7 +478,7 @@
                 COUNT(ID) AS count
             FROM project
             WHERE DEL_FLAG = '0'
-                AND ORG_ID_PATH LIKE CONCAT(#{orgId},'%')
+                AND ORG_ID_PATH LIKE CONCAT(#{o.orgId},'%')
                 AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') >= #{startDate}
                 AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{endDate}
         </foreach>