党建引领【组织次数，参与人数】

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java

@@ -17,6 +17,7 @@ import com.epmet.dao.stats.DimDateDao;
 import com.epmet.dao.stats.DimMonthDao;
 import com.epmet.dto.AgencySubTreeDto;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
+import com.epmet.dto.extract.form.ScreenExtractFormDTO;
 import com.epmet.dto.indexcal.CalculateCommonFormDTO;
 import com.epmet.dto.screen.form.ScreenCentralZoneDataFormDTO;
 import com.epmet.dto.stats.form.CustomerIdAndDateIdFormDTO;
@@ -651,8 +652,8 @@ public class DemoController {
     private PartyGuideService partyGuideService;
 
     @PostMapping("zxczxc")
-    public Result getZxcZxc(@RequestBody CustomerIdAndDateIdFormDTO formDTO){
+    public Result getZxcZxc(@RequestBody ScreenExtractFormDTO formDTO){
-//        partyGuideService.partyGuideExtract(formDTO.getCustomerId(),formDTO.getDateId());
+        partyGuideService.partyGuideExtract(formDTO);
         return new Result();
     }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenPartyBranchDataDao.java

@@ -65,4 +65,34 @@ public interface ScreenPartyBranchDataDao extends BaseDao<ScreenPartyBranchDataE
      * @date 2020/9/25 9:16 上午
      */
     void insertScreenPartyBranchData(@Param("lists") List<ScreenPartyBranchDataFormDTO> lists);
+
+    /**
+     * @Description  删除旧的建设情况数据
+     * @Param customerId
+     * @Param monthId
+     * @Param orgIds
+     * @author zxc
+     * @date 2020/9/27 9:04 上午
+     */
+    Integer deleteOldScreenPartyBranchData(@Param("customerId")String customerId,@Param("monthId") String monthId,@Param("orgIds") List<String> orgIds);
+
+    /**
+     * @Description  根据orgId查询建设情况数据
+     * @Param customerId
+     * @Param monthId
+     * @Param orgIds
+     * @author zxc
+     * @date 2020/9/27 9:38 上午
+     */
+    List<ScreenPartyBranchDataFormDTO> selectScreenPartyBranchDataByOrgId(@Param("customerId") String customerId, @Param("monthId") String monthId,@Param("orgIds") List<String> orgIds);
+
+    /**
+     * @Description  根据parentId查询建设情况数据
+     * @Param customerId
+     * @Param monthId
+     * @Param parentId
+     * @author zxc
+     * @date 2020/9/27 9:38 上午
+     */
+    List<ScreenPartyBranchDataFormDTO> selectScreenPartyBranchDataByParentId(@Param("customerId")String customerId,@Param("monthId") String monthId,@Param("parentId") String parentId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenPartyLinkMassesDataDao.java

@@ -68,12 +68,11 @@ public interface ScreenPartyLinkMassesDataDao extends BaseDao<ScreenPartyLinkMas
     /**
      * @Description  删除旧的党员联系群众
      * @param customerId
-     * @param monthId
      * @param orgIds
      * @author zxc
      * @date 2020/9/22 3:28 下午
      */
-    Integer deleteOldPartyLinkInfo(@Param("customerId") String customerId,@Param("monthId") String monthId,@Param("orgIds") List<String> orgIds);
+    Integer deleteOldPartyLinkInfo(@Param("customerId") String customerId, @Param("orgIds") List<String> orgIds);
 
     /**
      * @Description  查询党员联系群众信息

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

@@ -2,6 +2,7 @@ package com.epmet.service.evaluationindex.extract.toscreen.impl;
 
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.ScreenConstant;
 import com.epmet.dto.extract.form.ScreenExtractFormDTO;
 import com.epmet.dto.extract.form.ScreenPartyBranchDataFormDTO;
@@ -286,13 +287,13 @@ public class PartyGuideServiceImpl implements PartyGuideService {
                                 if (party.getOrgId().equals(join.getOrgId())){
                                     party.setAverageJoinUserCount(join.getJoinUserCount());
                                     party.setAverageJoinUserCount(party.getJoinUserCount() / party.getOrganizeCount());
+                                    party.setYearId(DateUtils.getYearId(monthId));
                                 }
                             });
                         });
                     }
                     result.addAll(screenPartyBranchDataList);
                 });
-
                 // 社区级别的
                 Map<String, List<ScreenPartyBranchDataFormDTO>> groupByAgency = result.stream().collect(Collectors.groupingBy(ScreenPartyBranchDataFormDTO::getParentId));
                 List<OrgNameResultDTO> orgNameAgencyList = agencyService.selectOrgNameAgency(orgIds);
@@ -309,14 +310,61 @@ public class PartyGuideServiceImpl implements PartyGuideService {
                     form.setOrgId(agencyId);
                     form.setCustomerId(customerId);
                     form.setOrgType(ScreenConstant.AGENCY);
+                    form.setMonthId(monthId);
+                    form.setYearId(DateUtils.getYearId(monthId));
                     form.setOrganizeCount(actList.stream().collect(Collectors.summingInt(ScreenPartyBranchDataFormDTO::getOrganizeCount)));
                     form.setJoinUserCount(actList.stream().collect(Collectors.summingInt(ScreenPartyBranchDataFormDTO::getJoinUserCount)));
                     form.setAverageJoinUserCount(form.getJoinUserCount() / form.getOrganizeCount());
                     result.add(form);
                 });
-
+                delAndInsertOrganize(result,customerId,monthId,orgIds);
             }else {
-
+                List<GridInfoResultDTO> directGridIds = gridService.selectDirectGrid(orgIds);
+                agencyIdList.forEach(agency -> {
+                    String agencyId = agency.getAgencyId();
+                    List<String> disGridIds = new ArrayList<>();
+                    directGridIds.forEach(grid -> {
+                        if (agencyId.equals(grid.getAgencyId())){
+                            disGridIds.add(grid.getGridId());
+                        }
+                    });
+                    // 存在直属网格
+                    if (!CollectionUtils.isEmpty(disGridIds)){
+                        List<ScreenPartyBranchDataFormDTO> gridResult = new ArrayList<>();
+                        List<JoinUserCountResultDTO> joinUserCountList = actUserRelationService.selectJoinUserCount(customerId, monthId);
+                        List<OrgNameResultDTO> orgNameList = agencyService.selectOrgNameGrid(disGridIds);
+                        List<ScreenPartyBranchDataFormDTO> screenPartyBranchDataList = actInfoService.selectActInfo(customerId, monthId, ScreenConstant.GRID, disGridIds);
+                        if (!CollectionUtils.isEmpty(screenPartyBranchDataList)){
+                            screenPartyBranchDataList.forEach(party -> {
+                                orgNameList.forEach(org -> {
+                                    if (party.getOrgId().equals(org.getGridId())){
+                                        party.setOrgName(org.getGridName());
+                                    }
+                                });
+                                ScreenPartyBranchDataFormDTO copyParty = ConvertUtils.sourceToTarget(party, ScreenPartyBranchDataFormDTO.class);
+                                gridResult.add(copyParty);
+                            });
+                        }
+                    }
+                    List<ScreenPartyBranchDataFormDTO> disPartyBranchDataList = partyBranchDataService.selectScreenPartyBranchDataByOrgId(customerId, monthId, disGridIds);
+                    List<ScreenPartyBranchDataFormDTO> screenPartyBranchDataList = partyBranchDataService.selectScreenPartyBranchDataByParentId(customerId, monthId, agencyId);
+                    screenPartyBranchDataList.addAll(disPartyBranchDataList);
+                    if (!CollectionUtils.isEmpty(screenPartyBranchDataList)){
+                        ScreenPartyBranchDataFormDTO form = new ScreenPartyBranchDataFormDTO();
+                        form.setOrgId(agencyId);
+                        form.setOrgType(ScreenConstant.AGENCY);
+                        form.setOrgName(screenPartyBranchDataList.get(NumConstant.ZERO).getOrgName());
+                        form.setCustomerId(customerId);
+                        form.setMonthId(monthId);
+                        form.setYearId(DateUtils.getYearId(monthId));
+                        form.setParentId(screenPartyBranchDataList.get(NumConstant.ZERO).getParentId());
+                        form.setJoinUserCount(screenPartyBranchDataList.stream().collect(Collectors.summingInt(ScreenPartyBranchDataFormDTO::getJoinUserCount)));
+                        form.setOrganizeCount(screenPartyBranchDataList.stream().collect(Collectors.summingInt(ScreenPartyBranchDataFormDTO::getOrganizeCount)));
+                        form.setAverageJoinUserCount(form.getJoinUserCount() / form.getOrganizeCount());
+                        result.add(form);
+                    }
+                });
+                delAndInsertOrganize(result,customerId,monthId,orgIds);
             }
         }
     }
@@ -381,7 +429,7 @@ public class PartyGuideServiceImpl implements PartyGuideService {
         }
         Integer delNum;
         do {
-            delNum = linkMassesDataService.deleteOldPartyLinkInfo(customerId, monthId, orgIds);
+            delNum = linkMassesDataService.deleteOldPartyLinkInfo(customerId, orgIds);
         }while (delNum > NumConstant.ZERO);
         List<List<ScreenPartyLinkMassesDataFormDTO>> partition = ListUtils.partition(finalResult, NumConstant.ONE_HUNDRED);
         partition.forEach(p -> {
@@ -403,6 +451,31 @@ public class PartyGuideServiceImpl implements PartyGuideService {
         List<ScreenPartyBranchDataFormDTO> screenPartyBranchData = agencyService.selectAllAgencyIdToOrganize(customerId, monthId);
         List<ScreenPartyBranchDataFormDTO> screenPartyBranchDataList = gridService.selectAllGridIdToOrganize(customerId, monthId);
         screenPartyBranchDataList.addAll(screenPartyBranchData);
+        List<ScreenPartyBranchDataFormDTO> finalResult = new ArrayList<>();
+        screenPartyBranchDataList.forEach(rl -> {
+            orgIds.forEach(orgId -> {
+                if (rl.getOrgId().equals(orgId)){
+                    finalResult.add(rl);
+                }
+            });
+        });
+        if (!CollectionUtils.isEmpty(result)){
+            finalResult.forEach(fr -> {
+                result.forEach(r -> {
+                    if (fr.getOrgId().equals(r.getOrgId())){
+                        BeanUtils.copyProperties(r,fr);
+                    }
+                });
+            });
+        }
+        Integer delNum;
+        do {
+            delNum = partyBranchDataService.deleteOldScreenPartyBranchData(customerId, monthId, orgIds);
+        }while (delNum > NumConstant.ZERO);
+        List<List<ScreenPartyBranchDataFormDTO>> partition = ListUtils.partition(finalResult, NumConstant.ONE_HUNDRED);
+        partition.forEach(p -> {
+            partyBranchDataService.insertScreenPartyBranchData(p);
+        });
     }
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenPartyBranchDataService.java

@@ -39,4 +39,34 @@ public interface ScreenPartyBranchDataService extends BaseService<ScreenPartyBra
      */
     void insertScreenPartyBranchData(List<ScreenPartyBranchDataFormDTO> lists);
 
+    /**
+     * @Description  删除旧的建设情况数据
+     * @Param customerId
+     * @Param monthId
+     * @Param orgIds
+     * @author zxc
+     * @date 2020/9/27 9:04 上午
+     */
+    Integer deleteOldScreenPartyBranchData(String customerId, String monthId, List<String> orgIds);
+
+    /**
+     * @Description  根据orgId查询建设情况数据
+     * @Param customerId
+     * @Param monthId
+     * @Param orgIds
+     * @author zxc
+     * @date 2020/9/27 9:38 上午
+     */
+    List<ScreenPartyBranchDataFormDTO> selectScreenPartyBranchDataByOrgId(String customerId, String monthId, List<String> orgIds);
+
+    /**
+     * @Description  根据parentId查询建设情况数据
+     * @Param customerId
+     * @Param monthId
+     * @Param parentId
+     * @author zxc
+     * @date 2020/9/27 9:38 上午
+     */
+    List<ScreenPartyBranchDataFormDTO> selectScreenPartyBranchDataByParentId(String customerId, String monthId, String parentId);
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenPartyLinkMassesDataService.java

@@ -42,12 +42,11 @@ public interface ScreenPartyLinkMassesDataService extends BaseService<ScreenPart
     /**
      * @Description  删除旧的党员联系群众
      * @param customerId
-     * @param monthId
      * @param orgIds
      * @author zxc
      * @date 2020/9/22 3:28 下午
      */
-    Integer deleteOldPartyLinkInfo(String customerId, String monthId, List<String> orgIds);
+    Integer deleteOldPartyLinkInfo(String customerId, List<String> orgIds);
 
     /**
      * @Description  查询党员联系群众信息

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerAgencyServiceImpl.java

@@ -175,7 +175,7 @@ public class ScreenCustomerAgencyServiceImpl implements ScreenCustomerAgencyServ
 
     @Override
     public List<ScreenPartyBranchDataFormDTO> selectAllAgencyIdToOrganize(String customerId, String monthId) {
-        return null;
+        return screenCustomerAgencyDao.selectAllAgencyIdToOrganize(customerId, monthId);
     }
 
     /**

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenPartyBranchDataServiceImpl.java

@@ -18,7 +18,10 @@
 package com.epmet.service.evaluationindex.screen.impl;
 
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.evaluationindex.screen.ScreenPartyBranchDataDao;
 import com.epmet.dto.extract.form.ScreenPartyBranchDataFormDTO;
 import com.epmet.entity.evaluationindex.screen.ScreenPartyBranchDataEntity;
@@ -26,6 +29,7 @@ import com.epmet.service.evaluationindex.screen.ScreenPartyBranchDataService;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -35,6 +39,7 @@ import java.util.List;
  * @since v1.0.0 2020-09-22
  */
 @Service
+@DataSource(DataSourceConstant.EVALUATION_INDEX)
 public class ScreenPartyBranchDataServiceImpl extends BaseServiceImpl<ScreenPartyBranchDataDao, ScreenPartyBranchDataEntity> implements ScreenPartyBranchDataService {
 
     /**
@@ -49,4 +54,49 @@ public class ScreenPartyBranchDataServiceImpl extends BaseServiceImpl<ScreenPart
             baseDao.insertScreenPartyBranchData(lists);
         }
     }
+
+    /**
+     * @Description  删除旧的建设情况数据
+     * @Param customerId
+     * @Param monthId
+     * @Param orgIds
+     * @author zxc
+     * @date 2020/9/27 9:04 上午
+     */
+    @Override
+    public Integer deleteOldScreenPartyBranchData(String customerId, String monthId, List<String> orgIds) {
+        if (!CollectionUtils.isEmpty(orgIds)){
+            return baseDao.deleteOldScreenPartyBranchData(customerId, monthId, orgIds);
+        }
+        return NumConstant.ZERO;
+    }
+
+    /**
+     * @Description  根据orgId查询建设情况数据
+     * @Param customerId
+     * @Param monthId
+     * @Param orgIds
+     * @author zxc
+     * @date 2020/9/27 9:38 上午
+     */
+    @Override
+    public List<ScreenPartyBranchDataFormDTO> selectScreenPartyBranchDataByOrgId(String customerId, String monthId, List<String> orgIds) {
+        if (!CollectionUtils.isEmpty(orgIds)){
+            return baseDao.selectScreenPartyBranchDataByOrgId(customerId, monthId, orgIds);
+        }
+        return new ArrayList<>();
+    }
+
+    /**
+     * @Description  根据parentId查询建设情况数据
+     * @Param customerId
+     * @Param monthId
+     * @Param parentId
+     * @author zxc
+     * @date 2020/9/27 9:38 上午
+     */
+    @Override
+    public List<ScreenPartyBranchDataFormDTO> selectScreenPartyBranchDataByParentId(String customerId, String monthId, String parentId) {
+        return baseDao.selectScreenPartyBranchDataByParentId(customerId, monthId, parentId);
+    }
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenPartyLinkMassesDataServiceImpl.java

@@ -57,14 +57,13 @@ public class ScreenPartyLinkMassesDataServiceImpl extends BaseServiceImpl<Screen
     /**
      * @Description  删除旧的党员联系群众
      * @param customerId
-     * @param monthId
      * @param orgIds
      * @author zxc
      * @date 2020/9/22 3:28 下午
      */
     @Override
-    public Integer deleteOldPartyLinkInfo(String customerId, String monthId, List<String> orgIds) {
+    public Integer deleteOldPartyLinkInfo(String customerId, List<String> orgIds) {
-        return baseDao.deleteOldPartyLinkInfo(customerId, monthId, orgIds);
+        return baseDao.deleteOldPartyLinkInfo(customerId, orgIds);
     }
 
     /**

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml

@@ -328,7 +328,8 @@
             AGENCY_NAME AS orgName,
             CUSTOMER_ID AS customerId,
             PID AS parentId,
-            #{monthId} AS dataEndTime
+            #{monthId} AS monthId,
+            SUBSTR(#{monthId},1,4) AS yearId
         FROM
             screen_customer_agency
         WHERE

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerGridDao.xml

@@ -319,7 +319,8 @@
             grid_name AS orgName,
             CUSTOMER_ID AS customerId,
             PARENT_AGENCY_ID AS parentId,
-            #{monthId} AS dataEndTime
+            #{monthId} AS monthId,
+            SUBSTR(#{monthId},1,4) AS yearId
         FROM
             screen_customer_grid
         WHERE

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenPartyBranchDataDao.xml

@@ -109,4 +109,63 @@
                 )
             </foreach>
     </insert>
+
+    <!-- 删除旧的建设情况数据 -->
+    <delete id="deleteOldScreenPartyBranchData">
+        delete from screen_party_branch_data
+        where CUSTOMER_ID = #{customerId}
+        and MONTH_ID = #{monthId}
+        and
+        (
+        <foreach collection="orgIds" item="orgId" separator=" OR ">
+            org_id = #{orgId}
+        </foreach>
+        )
+        LIMIT 1000
+    </delete>
+
+    <!-- 根据orgId查询建设情况数据 -->
+    <select id="selectScreenPartyBranchDataByOrgId" resultType="com.epmet.dto.extract.form.ScreenPartyBranchDataFormDTO">
+        SELECT
+            ORG_ID,
+            ORGANIZE_COUNT,
+            JOIN_USER_COUNT
+        FROM
+            screen_party_branch_data
+        WHERE
+            DEL_FLAG = '0'
+            AND TYPE = 'voluntaryservice'
+            AND CUSTOMER_ID = #{customerId}
+            AND MONTH_ID = #{monthId}
+            AND
+            (
+                <foreach collection="orgIds" item="gridId" separator=" or ">
+                    ORG_ID = #{gridId}
+                </foreach>
+            )
+    </select>
+
+    <!-- 根据parentId查询建设情况数据 -->
+    <select id="selectScreenPartyBranchDataByParentId" resultType="com.epmet.dto.extract.form.ScreenPartyBranchDataFormDTO">
+        SELECT
+            spbd.CUSTOMER_ID,
+            spbd.YEAR_ID,
+            spbd.MONTH_ID,
+            spbd.PARENT_ID AS orgId,
+            spbd.ORG_TYPE,
+            sca.AGENCY_NAME AS orgName,
+            spbd.ORGANIZE_COUNT,
+            spbd.JOIN_USER_COUNT
+        FROM
+            screen_party_branch_data spbd
+            LEFT JOIN screen_customer_agency sca ON sca.AGENCY_ID = spbd.PARENT_ID
+        WHERE
+            spbd.DEL_FLAG = '0'
+            AND sca.DEL_FLAG = 0
+            AND spbd.TYPE = 'voluntaryservice'
+            AND spbd.ORG_TYPE = 'agency'
+            AND spbd.CUSTOMER_ID = #{customerId}
+            AND spbd.MONTH_ID = #{monthId}
+            AND spbd.ORG_ID = #{parentId}
+    </select>
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenPartyLinkMassesDataDao.xml

@@ -13,7 +13,6 @@
     <delete id="deleteOldPartyLinkInfo">
         delete from screen_party_link_masses_data
         where CUSTOMER_ID = #{customerId}
-        and DATA_END_TIME = #{monthId}
         and
         (
             <foreach collection="orgIds" item="orgId" separator=" OR ">