Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_resiimport_optimize

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java

@@ -95,6 +95,8 @@ public interface StrConstant {
     String SPECIAL_CUSTOMER = "150282ed25c14ff0785e7e06283b6283";
     //平音客户
     String PY_CUSTOMER = "6f203e30de1a65aab7e69c058826cd80";
+    //平音客户跟组织Id
+    String PY_ROOT_AGENCY = "53613e1c5de6ed473467f0159a10b135";
 
     /**
      * 单位积分,积分上限，积分说明，积分事件

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java

@@ -617,16 +617,8 @@ public class GovOrgServiceImpl implements GovOrgService {
         //3.查询直属下级组织下网格在查询时间段内存在上报事件(直接立项)数的网格，一天一条
         List<GridDateIdResultDTO> projectList = dataStatsService.getGridDateProjectIncrList(formDTO);
         //4.汇总数据，一个网格一天只记录一条数据，这条数据可能是例行工作的也可能是上报事件的，也可能某一天两个数都有，但只记录一条
-        Map<String, String> map = new HashMap<>();
-        workList.forEach(w -> {
-            map.put(w.getGridId() + w.getDateId(), w.getDateId());
-        });
-        //projectList.stream().filter(pro -> !map.containsKey(pro.getGridId() + pro.getDateId())).forEach(p -> workList.add(p));
-        projectList.forEach(pro -> {
-            if (!map.containsKey(pro.getGridId() + pro.getDateId())) {
-                workList.add(pro);
-            }
-        });
+        Set<String> map = workList.stream().map(o -> o.getGridId() + o.getDateId()).collect(Collectors.toSet());
+        projectList.stream().filter(pro -> !map.contains(pro.getGridId() + pro.getDateId())).forEach(p -> workList.add(p));
         //5.按组织封装数据
         //计算百分比使用，保留小数点后两位
         NumberFormat numberFormat = NumberFormat.getInstance();

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml

@@ -1155,8 +1155,8 @@
         FROM
             fact_grid_member_statistics_daily
         WHERE del_flag = '0'
-        AND DATE_FORMAT(created_time,'%Y%m%d')  <![CDATA[ >= ]]> #{startTime}
-        AND DATE_FORMAT(created_time,'%Y%m%d')  <![CDATA[ <= ]]> #{endTime}
+        AND date_id  <![CDATA[ >= ]]> #{startTime}
+        AND date_id  <![CDATA[ <= ]]> #{endTime}
         AND project_incr > 0
         AND pids LIKE CONCAT('%', #{agencyId}, '%')
         GROUP BY grid_id, date_id

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml

@@ -150,8 +150,8 @@
             stats_staff_patrol_record_daily
         WHERE
             del_flag = '0'
-        AND DATE_FORMAT(created_time,'%Y%m%d')  <![CDATA[ >= ]]> #{startTime}
-        AND DATE_FORMAT(created_time,'%Y%m%d')  <![CDATA[ <= ]]> #{endTime}
+        AND date_id  <![CDATA[ >= ]]> #{startTime}
+        AND date_id  <![CDATA[ <= ]]> #{endTime}
         AND routine_work_count > 0
         AND grid_pids LIKE CONCAT('%', #{agencyId}, '%')
         GROUP BY grid_id, date_id

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectOrgPeriodDailyDao.java

@@ -64,7 +64,7 @@ public interface FactOriginProjectOrgPeriodDailyDao extends BaseDao<FactOriginPr
      * @author wangc
      * @date 2020.10.19 16:26
     */
-    void deleteByProjectIds(@Param("list") List<String> list,@Param("customerId") String customerId);
+    void deleteByProjectIds(@Param("list") List<String> list, @Param("customerId") String customerId, @Param("dateId") String dateId);
 
     /**
      * @Description 批量插入

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

@@ -494,14 +494,17 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 		});
 		if (!CollectionUtils.isEmpty(formattingData)) {
 			List<String> projectList = new ArrayList<>();
-			projectList.add(param.getObjectId());
-			factOriginProjectOrgPeriodDailyDao.deleteByProjectIds(projectList, param.getCustomerId());
+			if (StringUtils.isNotEmpty(param.getObjectId())) {
+				projectList.add(param.getObjectId());
+			}
+			factOriginProjectOrgPeriodDailyDao.deleteByProjectIds(projectList, param.getCustomerId(), param.getDateId());
 			Lists.partition(formattingData, NumConstant.ONE_HUNDRED)
 					.forEach(part -> factOriginProjectOrgPeriodDailyDao.insertBatch(part));
 
 		}
 	}
 
+
 	/**
 	 * @Description 项目节点耗时数据补齐
 	 * @param

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java

@@ -3,6 +3,7 @@ package com.epmet.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.DateUtils;
@@ -252,7 +253,8 @@ public class StatsUserServiceImpl implements StatsUserService {
                     m.setSourceType("external");
                     m.setParentCustomerId(crm.getParentCustomerId());
                     m.setPid(pid.toString());
-                    m.setPids(pids.toString());
+                    //20220214 上报数据的pids是从街道开始,需要在前边拼接上平阴县的id才能保证后续的查询用like时可以筛选出数据  sun
+                    m.setPids(StrConstant.PY_ROOT_AGENCY + ":" + pids.toString());
                 } else {
                     log.warn(String.format("网格员数据分析上报,数据错误,根据agencyId未查询到组织信息,客户Id->%s,组织Id->%s", m.getCustomerId(), m.getAgencyId()));
                     iterator.remove();

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectOrgPeriodDailyDao.xml

@@ -40,6 +40,7 @@
         WHERE
         DEL_FLAG = '0'
         AND CUSTOMER_ID = #{customerId}
+        AND (DATE_FORMAT(INFORMED_DATE,"%Y%m%d") >= #{dateId} OR DATE_FORMAT(HANDLED_DATE,"%Y%m%d") >= #{dateId} OR DATE_FORMAT(PERIOD_TILL_REPLY_FIRSTLY,"%Y%m%d") >= #{dateId})
         <if test="null != list and list.size() > 0">
             <foreach collection="list" open="AND ( " close=" )" separator=" OR " item="item">
                 PROJECT_ID = #{item}

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java

@@ -230,7 +230,7 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
 
     List<VolunteerDistributionResultDTO.Distribution> listIcResiInfosByUserIds(@Param("userIds") List<String> userIds);
 
-    Map<String, String> getCategoryListMap(@Param("icUserId") String icUserId);
+    Map<String, String> getCategoryListMap(@Param("columns")List<String> columns, @Param("icUserId") String icUserId);
 
     Map<String, String> selectResiInfoMap(@Param("idCard") String idCard);
 
@@ -238,5 +238,5 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
 
     List<String> icUserCustomerIds();
 
-    List<Map<String, String>> getIcUserList(@Param("customerId") String customerId);
+    List<Map<String, String>> getIcUserList(@Param("customerId") String customerId, @Param("columns")List<String> columns);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -18,7 +18,6 @@
 package com.epmet.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -382,12 +381,15 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             icUserTransferRecordService.add(formDTO);
         }
         //2.判断类别数据是否修改[类别修改的变更明细里边存修改后的新值，是就存1否就存-1]
-        Result<List<IcResiCategoryWarnConfigDTO>> resultList = operCustomizeOpenFeignClient.categoryWarnConfigList(tokenDto.getCustomerId());
-        if (!resultList.success()) {
-            throw new RuntimeException("居民信息修改，获取客户居民类别预警配置表数据失败");
+        IcResiCategoryStatsConfigDTO sfdto = new IcResiCategoryStatsConfigDTO();
+        sfdto.setCustomerId(tokenDto.getCustomerId());
+        Result<List<IcResiCategoryStatsConfigDTO>> categoryListResult = operCustomizeOpenFeignClient.getCategoryList(sfdto);
+        if (!categoryListResult.success()){
+            throw new RenException("居民信息修改，获取客户居民类别预警配置表数据失败");
         }
         //修改前数据库居民十八类信息值
-        Map<String, String> hash = icResiUserDao.getCategoryListMap(entity.getId());
+        List<String> columns = categoryListResult.getData().stream().map(IcResiCategoryStatsConfigDTO::getColumnName).collect(Collectors.toList());
+        Map<String, String> hash = icResiUserDao.getCategoryListMap(columns, entity.getId());
         //封装变更记录和变更明细数据
         //变更记录
         IcUserChangeRecordEntity changeRecordEntity = new IcUserChangeRecordEntity();
@@ -396,7 +398,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         //变更明细
         List<IcUserChangeDetailedEntity> list = new ArrayList<>();
         IcUserChangeDetailedEntity categoryEntity = null;
-        for (IcResiCategoryWarnConfigDTO dto : resultList.getData()) {
+        for (IcResiCategoryStatsConfigDTO dto : categoryListResult.getData()) {
             String oldValue = hash.get(dto.getColumnName());
             if (map.containsKey(dto.getColumnName()) && !oldValue.equals(map.get(dto.getColumnName()))) {
                 //类别修改后的值
@@ -707,11 +709,27 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         queryDTO.setFormCode(formCode);
         //所有的子表
         Result<List<SubTableJoinDTO>> subTablesRes=operCustomizeOpenFeignClient.querySubTables(queryDTO);
-        List<String> subTables=new ArrayList<>();
+        /*List<String> subTablesBak=new ArrayList<>();
         if(subTablesRes.success()&&CollectionUtils.isNotEmpty(subTablesRes.getData())){
-            subTables =subTablesRes.getData().stream().map(SubTableJoinDTO::getJoinTableSql).collect(Collectors.toList());
-        }
-        return baseDao.dynamicQuery(customerId,resultTableName,conditions,subTables,currentStaffAgencyId,staffOrgPath);
+            subTablesBak =subTablesRes.getData().stream().map(SubTableJoinDTO::getJoinTableSql).collect(Collectors.toList());
+        }*/
+        List<SubTableJoinDTO> subTables =subTablesRes.getData();
+        // log.info("1、所有的子表subTables:"+JSON.toJSONString(subTables,true));
+        //关联哪些子表：查询条件用到的表名+查询的列对应的表  并集去重
+        Set<String> whereConditionTables=conditions.stream().map(ResiUserQueryValueDTO::getTableName).collect(Collectors.toSet());
+        Set<String> tables=new HashSet<>();
+        tables.addAll(whereConditionTables);
+        tables.add(resultTableName);
+        // log.info("2、查询条件+查询列对应的tables并集去重:"+ JSON.toJSONString(tables,true));
+        //最终关联的子表对应的sql：
+        List<String> finalSubTables =new ArrayList<>();
+        subTables.forEach(subTable->{
+            if(tables.contains(subTable.getTableName())){
+                finalSubTables.add(subTable.getJoinTableSql());
+            }
+        });
+
+        return baseDao.dynamicQuery(customerId,resultTableName,conditions,finalSubTables,currentStaffAgencyId,staffOrgPath);
     }
 
     /**

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java

@@ -21,12 +21,13 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IcResiUserDao;
 import com.epmet.dao.IcUserChangeRecordDao;
-import com.epmet.dto.IcResiCategoryWarnConfigDTO;
+import com.epmet.dto.IcResiCategoryStatsConfigDTO;
 import com.epmet.dto.IcUserChangeRecordDTO;
 import com.epmet.dto.form.IcResiUserChangeRecordFormDTO;
 import com.epmet.dto.form.IcUserChangeRecordInitFormDTO;
@@ -171,10 +172,13 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl<IcUserChangeR
         log.info("开始初始客户下居民的变更记录和变更明细数据，客户Id->"+customerId);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         //1.获取客户居民类别预警配置表数据
-        Result<List<IcResiCategoryWarnConfigDTO>> resultList = operCustomizeOpenFeignClient.categoryWarnConfigList(customerId);
-        if (!resultList.success()) {
-            throw new RuntimeException("居民信息修改，获取客户居民类别预警配置表数据失败");
+        IcResiCategoryStatsConfigDTO sfdto = new IcResiCategoryStatsConfigDTO();
+        sfdto.setCustomerId(customerId);
+        Result<List<IcResiCategoryStatsConfigDTO>> categoryListResult = operCustomizeOpenFeignClient.getCategoryList(sfdto);
+        if (!categoryListResult.success()){
+            throw new RenException("居民信息修改，获取客户居民类别预警配置表数据失败");
         }
+        List<String> columns = categoryListResult.getData().stream().map(IcResiCategoryStatsConfigDTO::getColumnName).collect(Collectors.toList());
         List<IcUserChangeRecordEntity> changeList = new ArrayList<>();
         IcUserChangeRecordEntity change = null;
         List<IcUserChangeDetailedEntity> detailedList = new ArrayList<>();
@@ -187,7 +191,7 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl<IcUserChangeR
         do {
             //一千条一循环查询客户下居民数据
             PageHelper.startPage(pageNo, NumConstant.ONE_THOUSAND);
-            icUserList = icResiUserDao.getIcUserList(customerId);
+            icUserList = icResiUserDao.getIcUserList(customerId, columns);
             pageNo++;
 
             //3.遍历封装数据
@@ -195,7 +199,7 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl<IcUserChangeR
                 //存放一个人的类别为是的变更明细数据
                 List<IcUserChangeDetailedEntity> subList = new ArrayList<>();
                 String changeId = UUID.randomUUID().toString().replaceAll("-", "");
-                for (IcResiCategoryWarnConfigDTO dto : resultList.getData()){
+                for (IcResiCategoryStatsConfigDTO dto : categoryListResult.getData()){
                     if(map.containsKey(dto.getColumnName())&&"1".equals(map.get(dto.getColumnName()))){
                         detailed = new IcUserChangeDetailedEntity();
                         detailed.setCustomerId(customerId);

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java

@@ -27,6 +27,7 @@ import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IcResiUserDao;
 import com.epmet.dao.IcUserTransferRecordDao;
+import com.epmet.dto.IcResiCategoryStatsConfigDTO;
 import com.epmet.dto.IcResiCategoryWarnConfigDTO;
 import com.epmet.dto.IcResiUserDTO;
 import com.epmet.dto.form.IcResiUserOrgMsgFormDTO;
@@ -51,6 +52,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 居民调动记录表
@@ -173,12 +175,15 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
         changeRecordEntity.setRemark(formDTO.getRemark());
         icUserChangeRecordService.insert(changeRecordEntity);
         //6-2.变更明细【类别明细迁出组织的-1，迁入组织的1】
-        Result<List<IcResiCategoryWarnConfigDTO>> resultList = operCustomizeOpenFeignClient.categoryWarnConfigList(formDTO.getCustomerId());
-        if (!resultList.success()) {
-            throw new RuntimeException("人员调动，获取客户居民类别预警配置表数据失败");
+        IcResiCategoryStatsConfigDTO dto = new IcResiCategoryStatsConfigDTO();
+        dto.setCustomerId(formDTO.getCustomerId());
+        Result<List<IcResiCategoryStatsConfigDTO>> categoryListResult = operCustomizeOpenFeignClient.getCategoryList(dto);
+        if (!categoryListResult.success()){
+            throw new RenException("人员调动，获取客户居民类别预警配置表数据失败");
         }
-        Map<String, String> map = icResiUserDao.getCategoryListMap(formDTO.getIcUserId());
-        List<IcUserChangeDetailedEntity> changeDetailedEntityList = saveChangeDetailed(resultList.getData(), map, changeRecordEntity.getId(), formDTO, resiUserDTO);
+        List<String> columns = categoryListResult.getData().stream().map(IcResiCategoryStatsConfigDTO::getColumnName).collect(Collectors.toList());
+        Map<String, String> map = icResiUserDao.getCategoryListMap(columns, formDTO.getIcUserId());
+        List<IcUserChangeDetailedEntity> changeDetailedEntityList = saveChangeDetailed(categoryListResult.getData(), map, changeRecordEntity.getId(), formDTO, resiUserDTO);
         icUserChangeDetailedService.insertBatch(changeDetailedEntityList);
 
     }
@@ -231,7 +236,7 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
      * @Author sun
      * @Description 变更明细
      **/
-    private List<IcUserChangeDetailedEntity> saveChangeDetailed(List<IcResiCategoryWarnConfigDTO> configList, Map<String, String> map, String icUserChangeRecordId, IcResiUserTransferFormDTO formDTO, IcResiUserDTO resiUserDTO) {
+    private List<IcUserChangeDetailedEntity> saveChangeDetailed(List<IcResiCategoryStatsConfigDTO> configList, Map<String, String> map, String icUserChangeRecordId, IcResiUserTransferFormDTO formDTO, IcResiUserDTO resiUserDTO) {
         List<IcUserChangeDetailedEntity> list = new ArrayList<>();
         IcUserChangeDetailedEntity outEntity = null;
         IcUserChangeDetailedEntity inEntity = null;
@@ -246,7 +251,7 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
                 throw new EpmetException(String.format("查询组织信息失败%s", formDTO.getNewAgencyId()));
             }
         }
-        for (IcResiCategoryWarnConfigDTO cf : configList) {
+        for (IcResiCategoryStatsConfigDTO cf : configList) {
             if ("1".equals(map.get(cf.getColumnName()))) {
                 //迁出
                 outEntity = new IcUserChangeDetailedEntity();

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -518,24 +518,9 @@
 
     <select id="getCategoryListMap" resultType="java.util.Map">
         SELECT
-            IFNULL(is_kc,'0') IS_KC,
-            IFNULL(is_cj,'0') IS_CJ,
-            IFNULL(is_ylfn,'0') IS_YLFN,
-            IFNULL(is_sn,'0') IS_SN,
-            IFNULL(is_special,'0') IS_SPECIAL,
-            IFNULL(is_volunteer,'0') IS_VOLUNTEER,
-            IFNULL(is_unemployed,'0') IS_UNEMPLOYED,
-            IFNULL(is_mb,'0') IS_MB,
-            IFNULL(is_sz,'0') IS_SZ,
-            IFNULL(is_sd,'0') IS_SD,
-            IFNULL(is_veterans,'0') IS_VETERANS,
-            IFNULL(is_ensure_house,'0') IS_ENSURE_HOUSE,
-            IFNULL(is_party,'0') IS_PARTY,
-            IFNULL(is_old_people,'0') IS_OLD_PEOPLE,
-            IFNULL(is_xfry,'0')IS_XFRY,
-            IFNULL(is_united_front,'0') IS_UNITED_FRONT,
-            IFNULL(is_db,'0') IS_DB,
-            IFNULL(is_dbh,'0') IS_DBH
+            <foreach collection="columns" separator="," item="c">
+                IFNULL(`${c}`,'0') AS `${c}`
+            </foreach>
         FROM
             ic_resi_user
         WHERE
@@ -590,25 +575,13 @@
             iru.home_id HOME_ID,
             iru.name NAME,
             iru.created_by CREATED_BY,
-            date_format(iru.created_time, '%Y-%m-%d %h:%i:%s') CREATED_TIME,
-            IFNULL(iru.is_kc,'0') IS_KC,
-            IFNULL(iru.is_cj,'0') IS_CJ,
-            IFNULL(iru.is_ylfn,'0') IS_YLFN,
-            IFNULL(iru.is_sn,'0') IS_SN,
-            IFNULL(iru.is_special,'0') IS_SPECIAL,
-            IFNULL(iru.is_volunteer,'0') IS_VOLUNTEER,
-            IFNULL(iru.is_unemployed,'0') IS_UNEMPLOYED,
-            IFNULL(iru.is_mb,'0') IS_MB,
-            IFNULL(iru.is_sz,'0') IS_SZ,
-            IFNULL(iru.is_sd,'0') IS_SD,
-            IFNULL(iru.is_veterans,'0') IS_VETERANS,
-            IFNULL(iru.is_ensure_house,'0') IS_ENSURE_HOUSE,
-            IFNULL(iru.is_party,'0') IS_PARTY,
-            IFNULL(iru.is_old_people,'0') IS_OLD_PEOPLE,
-            IFNULL(iru.is_xfry,'0')IS_XFRY,
-            IFNULL(iru.is_united_front,'0') IS_UNITED_FRONT,
-            IFNULL(iru.is_db,'0') IS_DB,
-            IFNULL(iru.is_dbh,'0') IS_DBH
+            date_format(iru.created_time, '%Y-%m-%d %h:%i:%s') CREATED_TIME
+            <if test="columns != null and columns.size() > 0">
+                ,
+                <foreach collection="columns" separator="," item="c">
+                    IFNULL(`${c}`,'0') AS `${c}`
+                </foreach>
+            </if>
         FROM
             ic_resi_user iru
         <!-- 只查询在变更记录表不存在新增节点的居民 -->