bug

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(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

@@ -25,8 +25,8 @@ import com.epmet.commons.rocketmq.messages.ProjectChangedMQMsg;
 import com.epmet.commons.tools.constant.*;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
-import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
@@ -58,11 +58,12 @@ import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
 import com.epmet.send.SendMqMsgUtil;
 import com.epmet.service.*;
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.google.common.base.Joiner;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import org.apache.commons.collections4.CollectionUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -76,7 +77,6 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.multipart.MultipartFile;
 
-
 import javax.servlet.http.HttpServletRequest;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -2922,6 +2922,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();
@@ -2930,7 +2931,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

@@ -472,17 +472,15 @@
 
     <!-- 查询组织下的项目数 -->
     <select id="selectProjectCountByOrg" resultType="com.epmet.dto.result.ProjectDistributionAnalysisRightDTO">
+        <foreach collection="orgIds" item="o" separator=" UNION ALL ">
             SELECT
-            AGENCY_ID AS orgId,
+                #{o.orgId} AS orgId,
                 COUNT(ID) AS count
             FROM project
             WHERE DEL_FLAG = '0'
-            AND AGENCY_ID IN (
+                AND ORG_ID_PATH LIKE CONCAT(#{o.pids},#{o.orgId},'%')
-                <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>
     </select>
 </mapper>