Merge remote-tracking branch 'remotes/origin/dev'

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, projectId);
 			//提取议题ID
 			List<String> issueIds =
 					projectList.stream().filter(item -> ProjectConstant.ISSUE.equals(item.getOrigin())).map(ProjectDTO::getOriginId).collect(Collectors.toList());
-			//获取议题信息
-			List<IssueDTO> issueList = issueService.getIssueInfoByIds(issueIds);
-			//提取话题ID
-			List<String> topicIds = issueList.stream().map(IssueDTO::getSourceId).collect(Collectors.toList());
-			//获取话题信息
-			List<ResiTopicDTO> topicList = topicService.getTopicByIds(topicIds);
+			if (CollectionUtils.isNotEmpty(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<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/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java

@@ -114,6 +114,15 @@ public interface IcPartyUnitService extends BaseService<IcPartyUnitEntity> {
      */
     List<OptionDTO> option(IcPartyUnitDTO dto);
 
+    /**
+     * @Description 获取组织以及下级单位列表
+     * @Param dto
+     * @Return {@link List< OptionDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/11/22 14:35
+     */
+    List<OptionDTO> options(IcPartyUnitDTO dto);
+
     /**
      * 导入数据
      * @Param tokenDto

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java

@@ -366,7 +366,7 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
         unitDTO.setAgencyId(formDTO.getAgencyId());
         if (CollectionUtils.isNotEmpty(dtoList)) {
             //获取联建单位
-            Map<String, String> option = icPartyUnitService.option(unitDTO).stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel));
+            Map<String, String> option = icPartyUnitService.options(unitDTO).stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel));
             //获取服务事项字典
             SubCodeFormDTO codeFormDTO = new SubCodeFormDTO();
             codeFormDTO.setCustomerId(tokenDto.getCustomerId());

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java

@@ -193,7 +193,7 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
             }
             insert(entity);
         } else {
-            if (CollectionUtils.isNotEmpty(list) && list.get(0).getId().equals(entity.getId())) {
+            if (CollectionUtils.isNotEmpty(list) && !list.get(0).getId().equals(entity.getId())) {
                 throw new EpmetException(EpmetErrorCode.PARTY_UNIT_NAME_EXITED.getCode(), EpmetErrorCode.PARTY_UNIT_NAME_EXITED.getMsg(), EpmetErrorCode.PARTY_UNIT_NAME_EXITED.getMsg());
             }
             updateById(entity);
@@ -261,6 +261,25 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
         }).collect(Collectors.toList());
     }
 
+    @Override
+    public List<OptionDTO> options(IcPartyUnitDTO dto) {
+        LambdaQueryWrapper<IcPartyUnitEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.and(wp -> wp.eq(IcPartyUnitEntity::getAgencyId, dto.getAgencyId()).or().
+                like(IcPartyUnitEntity::getPids, dto.getAgencyId()));
+        wrapper.orderByDesc(IcPartyUnitEntity::getUpdatedTime);
+        wrapper.eq(StringUtils.isNotBlank(dto.getServiceMatter()), IcPartyUnitEntity::getServiceMatter, dto.getServiceMatter());
+        List<IcPartyUnitEntity> list = baseDao.selectList(wrapper);
+        if (CollectionUtils.isEmpty(list)) {
+            return Collections.emptyList();
+        }
+        return list.stream().map(item -> {
+            OptionDTO option = new OptionDTO();
+            option.setValue(item.getId());
+            option.setLabel(item.getUnitName());
+            return option;
+        }).collect(Collectors.toList());
+    }
+
     /**
      * 导入数据
      *

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ResiBuzzLeftPieChartFormDTO.java

@@ -23,4 +23,9 @@ public class ResiBuzzLeftPieChartFormDTO implements Serializable {
      * 组织类型，agency：组织，grid：网格
      */
     private String orgType;
+
+    /**
+     * 表决中：voting 已转项目：shift_project 已关闭：closed，全部：all
+     */
+    private String status = "all";
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java

@@ -272,7 +272,7 @@ public interface IssueDao extends BaseDao<IssueEntity> {
      * @author zxc
      * @date 2021/12/30 9:16 上午
      */
-    List<String> resiBuzzLeftPieChartIssueIds(@Param("orgId")String orgId,@Param("orgType")String orgType);
+    List<String> resiBuzzLeftPieChartIssueIds(@Param("orgId")String orgId,@Param("orgType")String orgType,@Param("status")String status);
 
     /**
      * @Description  查询组织下每个网格的项目数

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

@@ -1667,7 +1667,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         // 分类编码长度
         Integer length = baseDao.selectOneLevelCategoryLength(tokenDto.getCustomerId());
 //        List<ResiBuzzLeftPieChartResultDTO> result = baseDao.resiBuzzLeftPieChart(formDTO.getOrgId(), formDTO.getOrgType(), length, tokenDto.getCustomerId());
-        List<String> issueIds = baseDao.resiBuzzLeftPieChartIssueIds(formDTO.getOrgId(), formDTO.getOrgType());
+        List<String> issueIds = baseDao.resiBuzzLeftPieChartIssueIds(formDTO.getOrgId(), formDTO.getOrgType(),formDTO.getStatus());
         if(CollectionUtils.isEmpty(issueIds)){
             return new ArrayList<>();
         }

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

@@ -645,7 +645,7 @@
     <!-- 查询组织下每个网格的项目数 -->
     <select id="getProjectCountByGrid" resultType="com.epmet.dto.result.ProjectDistributionAnalysisRightDTO">
         SELECT
-            GRID_ID,
+            GRID_ID AS orgId,
             COUNT(ID) AS count
         FROM issue
         WHERE DEL_FLAG = '0'
@@ -684,6 +684,9 @@
         FROM issue i
         INNER JOIN issue_vote_statistical s ON (s.ISSUE_ID = i.ID AND s.DEL_FLAG = '0')
         WHERE i.DEL_FLAG = '0'
+        <if test='status != "all" '>
+            AND i.ISSUE_STATUS = #{status}
+        </if>
         <if test='orgType == "grid" '>
             AND i.GRID_ID = #{orgId}
         </if>