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

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-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-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;
@@ -710,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);
     }
 
     /**