Merge remote-tracking branch 'origin/develop' into release_temp

epmet-gateway/src/main/resources/bootstrap.yml

@@ -486,7 +486,8 @@ epmet:
     - /data/aggregator/**
     - /gov/voice/**
     - /resi/voice/**
-    - /epmet/point/**
+    - /point/**
+    - /heart/**
 
   # 内部认证url白名单(在白名单中的，就不会再校验登录了)
   internalAuthUrlsWhiteList:

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -549,7 +549,7 @@ public interface GovOrgOpenFeignClient {
      */
     @PostMapping("/gov/org/agency/getsonagencyid")
     Result<List<SonOrgResultDTO>> getSonAgencyId(@RequestParam("orgId")String orgId,@RequestParam("type")String type);
-
+    
 //    /icbuilding/{id}?id=demoData
 
     /**

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IndividualCategoryListResultDTO.java

@@ -1,6 +1,7 @@
 package com.epmet.dto.result;
 
 import com.epmet.commons.tools.constant.NumConstant;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -37,5 +38,8 @@ public class IndividualCategoryListResultDTO implements Serializable {
 
     private String id;
 
+    @JsonIgnore
+    private String warnConfigId;
+
     private Integer count = NumConstant.ZERO;
 }

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/SubTableJoinDTO.java

@@ -0,0 +1,13 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@Data
+public class SubTableJoinDTO implements Serializable {
+    private static final long serialVersionUID = 8243764437194993736L;
+    private String tableName;
+    private String joinTableSql;
+}

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java

@@ -25,7 +25,7 @@ import java.util.Set;
  * @author yinzuomei@elink-cn.com
  * @date 2020/6/4 13:16
  */
-//@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class,url = "http://localhost:8089")
+// @FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class,url = "http://localhost:8089")
 @FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class)
 public interface OperCustomizeOpenFeignClient {
 
@@ -75,7 +75,7 @@ public interface OperCustomizeOpenFeignClient {
      * @date 2021/11/1 1:07 下午
      */
     @PostMapping(value = "/oper/customize/icform/querySubTables", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    Result<List<String>> querySubTables(@RequestBody CustomerFormQueryDTO queryDTO);
+    Result<List<SubTableJoinDTO>> querySubTables(@RequestBody CustomerFormQueryDTO queryDTO);
 
     @PostMapping(value = "/oper/customize/icform/queryIcResiSubTables", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
     Result<Set<String>> queryIcResiSubTables(@RequestBody CustomerFormQueryDTO queryDTO);

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java

@@ -61,7 +61,7 @@ public class OperCustomizeOpenFeignClientFallback implements OperCustomizeOpenFe
 	}
 
 	@Override
-	public Result<List<String>> querySubTables(CustomerFormQueryDTO formDto) {
+	public Result<List<SubTableJoinDTO>> querySubTables(CustomerFormQueryDTO formDto) {
 		return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "querySubTables", formDto);
 	}
 

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormController.java

@@ -133,9 +133,9 @@ public class IcFormController {
      * @date 2021/11/1 1:25 下午
      */
     @PostMapping(value = "querySubTables")
-    Result<List<String>> querySubTables(@RequestBody  CustomerFormQueryDTO formQueryDTO){
+    Result<List<SubTableJoinDTO>> querySubTables(@RequestBody  CustomerFormQueryDTO formQueryDTO){
         ValidatorUtils.validateEntity(formQueryDTO,CustomerFormQueryDTO.AddUserInternalGroup.class);
-        return new Result<List<String>>().ok(icFormItemService.querySubTables(formQueryDTO.getCustomerId(),formQueryDTO.getFormCode()));
+        return new Result<List<SubTableJoinDTO>>().ok(icFormItemService.querySubTables(formQueryDTO.getCustomerId(),formQueryDTO.getFormCode()));
     }
 
     @PostMapping(value = "queryIcResiSubTables")

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java

@@ -18,10 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.result.ColumnTableNameResultDTO;
-import com.epmet.dto.result.ConditionResultDTO;
-import com.epmet.dto.result.IcFormResColumnDTO;
-import com.epmet.dto.result.TableHeaderResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.entity.IcFormItemEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -62,7 +59,7 @@ public interface IcFormItemDao extends BaseDao<IcFormItemEntity> {
      * @author yinzuomei
      * @date 2021/11/1 1:25 下午
      */
-    List<String> querySubTables(@Param("customerId") String customerId, @Param("formCode")String formCode);
+    List<SubTableJoinDTO> querySubTables(@Param("customerId") String customerId, @Param("formCode")String formCode);
 
     Set<String> queryIcResiSubTables(@Param("customerId") String customerId, @Param("formCode")String formCode);
 

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemService.java

@@ -46,7 +46,7 @@ public interface IcFormItemService extends BaseService<IcFormItemEntity> {
 
     List<IcFormResColumnDTO> queryConditions(String customerId,String formCode);
 
-    List<String> querySubTables(String customerId, String formCode);
+    List<SubTableJoinDTO> querySubTables(String customerId, String formCode);
 
     Set<String> queryIcResiSubTables(String customerId, String formCode);
 

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java

@@ -21,24 +21,21 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.StrConstant;
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.IcFormItemDao;
-import com.epmet.dto.IcFormItemDTO;
 import com.epmet.dto.form.CustomerFormQueryDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.IcFormItemEntity;
 import com.epmet.service.IcFormItemService;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
 
 /**
  * 表单项
@@ -100,7 +97,7 @@ public class IcFormItemServiceImpl extends BaseServiceImpl<IcFormItemDao, IcForm
     }
 
     @Override
-    public List<String> querySubTables(String customerId, String formCode) {
+    public List<SubTableJoinDTO> querySubTables(String customerId, String formCode) {
         return baseDao.querySubTables(customerId,formCode);
     }
 

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcIndividualCategoryManageServiceImpl.java

@@ -9,13 +9,11 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IcIndividualCategoryManageDao;
 import com.epmet.dto.IcResiCategoryStatsConfigDTO;
+import com.epmet.dto.form.CategoryCountListFormDTO;
 import com.epmet.dto.form.EditIndividualCategoryFormDTO;
 import com.epmet.dto.form.IcResiCategoryStatsConfigFormDTO;
 import com.epmet.dto.form.StatsResiListFormDTO;
-import com.epmet.dto.result.IcStatsResiResultDTO;
-import com.epmet.dto.result.IcStatsResiWarnBuildingResultDTO;
-import com.epmet.dto.result.IndividualCategoryAllListResultDTO;
-import com.epmet.dto.result.IndividualCategoryListResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.entity.IcIndividualCategoryManageEntity;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.OperCustomizeOpenFeignClient;
@@ -27,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 个人分类管理
@@ -54,27 +53,22 @@ public class IcIndividualCategoryManageServiceImpl extends BaseServiceImpl<IcInd
         if (null == staffInfo){
             throw new EpmetException(String.format("查询工作人员%s信息失败...",tokenDto.getUserId()));
         }
-        StatsResiListFormDTO formDTO = new StatsResiListFormDTO();
-        formDTO.setId(staffInfo.getAgencyId());
-        formDTO.setLevel("agency");
-        formDTO.setCustomerId(tokenDto.getCustomerId());
-        Result<List<IcStatsResiResultDTO>> list = userOpenFeignClient.getPersonCategoryList(formDTO);
-        if (!list.success()){
-            throw new EpmetException("查询人员分类下人数失败...");
-        }
-        List<IcStatsResiResultDTO> datas = list.getData();
         List<IndividualCategoryListResultDTO> result = baseDao.individualCategoryList(tokenDto.getUserId());
-        if (CollectionUtils.isNotEmpty(datas) && CollectionUtils.isNotEmpty(result)){
-            result.forEach( r -> datas.stream().filter( d -> d.getId().equals(r.getId())).forEach(d -> r.setCount(d.getCount())));
-            return result;
-        }
-        if (CollectionUtils.isEmpty(datas) && CollectionUtils.isNotEmpty(result)){
-            return result;
-        }
         if (CollectionUtils.isEmpty(result)){
             return new ArrayList<>();
         }
-        return new ArrayList<>();
+        CategoryCountListFormDTO formDTO = new CategoryCountListFormDTO();
+        formDTO.setConfigList(result.stream().map(m -> m.getWarnConfigId()).collect(Collectors.toList()));
+        formDTO.setOrgId(staffInfo.getAgencyId());
+        Result<List<CategoryCountListResultDTO>> list = userOpenFeignClient.getPersonCategoryList(formDTO);
+        if (!list.success()){
+            throw new EpmetException("查询人员分类下人数失败...");
+        }
+        List<CategoryCountListResultDTO> datas = list.getData();
+        if (CollectionUtils.isNotEmpty(datas)){
+            result.forEach( r -> datas.stream().filter( d -> d.getConfigId().equals(r.getWarnConfigId())).forEach(d -> r.setCount(d.getCount())));
+        }
+        return result;
     }
 
     /**

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml

@@ -113,9 +113,10 @@
     </select>
 
     <!--  构造出所有子表关联语句  -->
-    <select id="querySubTables" parameterType="map" resultType="java.lang.String">
+    <select id="querySubTables" parameterType="map" resultType="com.epmet.dto.result.SubTableJoinDTO">
         select
-            CONCAT('left join ',temp.TABLE_NAME, ' on ( ic_resi_user.ID=',temp.TABLE_NAME,'.IC_RESI_USER  and ',temp.TABLE_NAME,'.del_flag="0" )') as subTables
+             temp.TABLE_NAME as tableName,
+            CONCAT('left join ',temp.TABLE_NAME, ' on ( ic_resi_user.ID=',temp.TABLE_NAME,'.IC_RESI_USER  and ',temp.TABLE_NAME,'.del_flag="0" )') as joinTableSql
         from (
                  SELECT DISTINCT
                      m.TABLE_NAME

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcIndividualCategoryManageDao.xml

@@ -15,9 +15,11 @@
             sc.LABEL,
             sc.MANAGEMENT_ICON,
             sc.COLUMN_NAME,
-            sc.id AS id
+            sc.id AS id,
+            wc.ID AS warnConfigId
         FROM ic_individual_category_manage cm
         INNER JOIN ic_resi_category_stats_config sc ON (sc.ID = cm.COLUMN_ID AND sc.DEL_FLAG = '0' AND `STATUS` = 'show')
+        INNER JOIN ic_resi_category_warn_config wc ON (sc.COLUMN_NAME = wc.COLUMN_NAME AND wc.DEL_FLAG = '0' AND wc.CUSTOMER_ID = sc.CUSTOMER_ID)
         WHERE cm.DEL_FLAG = 0
           AND cm.USER_ID = #{userId}
     </select>

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -94,7 +94,7 @@ public class IssueServiceImpl implements IssueService {
             issueDetailResult.setTopicInfo(topicInfoDTOResult == null ? new TopicInfoDTO() : topicInfoDTOResult);
         }
 
-        /*if("branch".equals(topicInfoDTOResult.getGroupType())){//支部小组话题发起人显示真实姓名
+        if (null != topicInfoDTOResult && "branch".equals(topicInfoDTOResult.getGroupType())) {//支部小组话题发起人显示真实姓名
             List<String> userIdList = new ArrayList<>();
             userIdList.add(issueResult.getUserId());
             Result<List<UserBaseInfoResultDTO>> result = epmetUserOpenFeignClient.queryUserBaseInfo(userIdList);
@@ -118,8 +118,8 @@ public class IssueServiceImpl implements IssueService {
                 IssueInitiatorResultDTO initiatorResult = userFeignClient.selectIssueInitiator(initiatorFormDTO).getData();
                 issueDetailResult.setIssueInitiator(initiatorResult == null ? HallConstat.NULL_CHARACTER_STRING : initiatorResult.getIssueInitiator());
             }
-        }*/
-        issueDetailResult.setIssueInitiator(topicInfoDTOResult.getPublishedUser());
+        }
+        //issueDetailResult.setIssueInitiator(topicInfoDTOResult.getPublishedUser());
 
         //判断是否投票
         CheckVoteFormDTO formDTO = new CheckVoteFormDTO();

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CategoryCountListFormDTO.java

@@ -0,0 +1,21 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/1/21 1:43 下午
+ * @DESC
+ */
+@Data
+public class CategoryCountListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1563081091285509142L;
+
+    private List<String> configList;
+
+    private String orgId;
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CategoryCountListResultDTO.java

@@ -0,0 +1,20 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/1/21 1:44 下午
+ * @DESC
+ */
+@Data
+public class CategoryCountListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -8441192101441016588L;
+
+    private String configId;
+
+    private Integer count;
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -709,6 +709,6 @@ public interface EpmetUserOpenFeignClient {
     Result<RegisterRelationDTO> resiRelationInfo(@RequestParam("userId")String userId);
 
     @PostMapping("/epmetuser/statsresiwarn/list2")
-    Result<List<IcStatsResiResultDTO>> getPersonCategoryList(@RequestBody StatsResiListFormDTO formDTO);
+    Result<List<CategoryCountListResultDTO>> getPersonCategoryList(@RequestBody CategoryCountListFormDTO formDTO);
 
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -524,7 +524,7 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     }
 
     @Override
-    public Result<List<IcStatsResiResultDTO>> getPersonCategoryList(StatsResiListFormDTO formDTO) {
+    public Result<List<CategoryCountListResultDTO>> getPersonCategoryList(CategoryCountListFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getPersonCategoryList", formDTO);
     }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -254,6 +254,9 @@ public class IcResiUserController {
         pageFormDTO.setCustomerId(tokenDto.getCustomerId());
         pageFormDTO.setStaffId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(pageFormDTO, IcResiUserPageFormDTO.AddUserInternalGroup.class);
+        if(null==pageFormDTO.getConditions()){
+            pageFormDTO.setConditions(new ArrayList<>());
+        }
         return new Result<PageData<Map<String, Object>>>().ok(icResiUserService.pageResiMap(pageFormDTO));
     }
 

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StatsResiWarnController.java

@@ -22,9 +22,11 @@ import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.CategoryCountListFormDTO;
 import com.epmet.dto.form.StatsResiListFormDTO;
 import com.epmet.dto.form.StatsResiWarnCountFormDTO;
 import com.epmet.dto.form.StatsResiWarnFormDTO;
+import com.epmet.dto.result.CategoryCountListResultDTO;
 import com.epmet.dto.result.IcStatsResiResultDTO;
 import com.epmet.dto.result.IcStatsResiWarnBuildingResultDTO;
 import com.epmet.dto.result.IcStatsResiWarnUserResultDTO;
@@ -74,9 +76,8 @@ public class StatsResiWarnController {
      * @date 2022/1/20 2:11 下午
      */
     @PostMapping("list2")
-    public Result<List<IcStatsResiResultDTO>> list2(@RequestBody StatsResiListFormDTO formDTO){
-        ValidatorUtils.validateEntity(formDTO);
-        return new Result<List<IcStatsResiResultDTO>>().ok(statsResiWarnService.list2(formDTO));
+    public Result<List<CategoryCountListResultDTO>> list2(@RequestBody CategoryCountListFormDTO formDTO){
+        return new Result<List<CategoryCountListResultDTO>>().ok(statsResiWarnService.list2(formDTO));
     }
 
     @PostMapping("buildingwarnlist")

epmet-user/epmet-user-server/src/main/java/com/epmet/service/StatsResiWarnService.java

@@ -17,7 +17,9 @@
 
 package com.epmet.service;
 
+import com.epmet.dto.form.CategoryCountListFormDTO;
 import com.epmet.dto.form.StatsResiListFormDTO;
+import com.epmet.dto.result.CategoryCountListResultDTO;
 import com.epmet.dto.result.IcStatsResiResultDTO;
 import com.epmet.dto.result.IcStatsResiWarnBuildingResultDTO;
 import com.epmet.dto.result.IcStatsResiWarnUserResultDTO;
@@ -39,7 +41,7 @@ public interface StatsResiWarnService{
 
     List<IcStatsResiResultDTO> list(String customerId,String id, String level);
 
-    List<IcStatsResiResultDTO> list2(StatsResiListFormDTO formDTO);
+    List<CategoryCountListResultDTO> list2(CategoryCountListFormDTO formDTO);
 
     void resiWarn(String customerId);
 

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

@@ -493,9 +493,29 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             return new PageData(new ArrayList(), NumConstant.ZERO);
         }
         List<IcFormResColumnDTO> resultColumns = resultColumnRes.getData();
+        // 查询结果列对应的表:
+        Set<String> resultColumnTables=resultColumns.stream().map(IcFormResColumnDTO::getTableName).collect(Collectors.toSet());
+
         // 查询列表展示项需要用到哪些子表
-        Result<List<String>> subTablesRes=operCustomizeOpenFeignClient.querySubTables(queryDTO1);
-        List<String> subTables =subTablesRes.getData();
+        Result<List<SubTableJoinDTO>> subTablesRes=operCustomizeOpenFeignClient.querySubTables(queryDTO1);
+        List<SubTableJoinDTO> subTables =subTablesRes.getData();
+        log.info("1、所有的子表subTables:"+JSON.toJSONString(subTables,true));
+
+        //关联哪些子表：查询条件用到的表名+查询的列对应的表  并集去重
+        Set<String> whereConditionTables=formDTO.getConditions().stream().map(ResiUserQueryValueDTO::getTableName).collect(Collectors.toSet());
+        Set<String> tables=new HashSet<>();
+        tables.addAll(whereConditionTables);
+        tables.addAll(resultColumnTables);
+        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());
+            }
+        });
+
+
         PageInfo<Map<String, Object>> pageInfo=new PageInfo<>();
         if (null == formDTO.getPageFlag()||formDTO.getPageFlag()) {
             //分页
@@ -505,14 +525,15 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     formDTO.getFormCode(),
                     formDTO.getConditions(),
                     resultColumns,
-                    subTables,
+                    finalSubTables,
                     staffInfoCacheResult.getAgencyId(), finalStaffOrgPath,null, formDTO.getKeyword()));
         }else{
             List<Map<String,Object>> list=baseDao.selectListResiMap(formDTO.getCustomerId(),
                     formDTO.getFormCode(),
                     formDTO.getConditions(),
                     resultColumns,
-                    subTables,staffInfoCacheResult.getAgencyId(),
+                    finalSubTables,
+                    staffInfoCacheResult.getAgencyId(),
                     staffOrgPath,null, formDTO.getKeyword());
             pageInfo.setTotal(CollectionUtils.isEmpty(list)?NumConstant.ZERO:list.size());
             pageInfo.setList(list);
@@ -575,7 +596,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 }
                 resultMap.put(UserConstant.HOME_ID, neighBorName.concat(buildName).concat(unitName).concat(doorName));
 
-                resultMap.put("CATEGORY_NAME",queryUserDemandName(formDTO.getCustomerId(),(String) resultMap.get("icResiUserId")));
+                // resultMap.put("CATEGORY_NAME",queryUserDemandName(formDTO.getCustomerId(),(String) resultMap.get("icResiUserId")));
             }
 
             if (resultMap.containsKey(UserConstant.GENDER)) {
@@ -672,10 +693,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         queryDTO.setCustomerId(customerId);
         queryDTO.setFormCode(formCode);
         //所有的子表
-        Result<List<String>> subTablesRes=operCustomizeOpenFeignClient.querySubTables(queryDTO);
+        Result<List<SubTableJoinDTO>> subTablesRes=operCustomizeOpenFeignClient.querySubTables(queryDTO);
         List<String> subTables=new ArrayList<>();
         if(subTablesRes.success()&&CollectionUtils.isNotEmpty(subTablesRes.getData())){
-            subTables =subTablesRes.getData();
+            subTables =subTablesRes.getData().stream().map(SubTableJoinDTO::getJoinTableSql).collect(Collectors.toList());
         }
         return baseDao.dynamicQuery(customerId,resultTableName,conditions,subTables,currentStaffAgencyId,staffOrgPath);
     }

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

@@ -9,6 +9,8 @@ import com.epmet.dao.IcResiUserDao;
 import com.epmet.dao.IcStatsResiWarnDao;
 import com.epmet.dto.IcResiCategoryStatsConfigDTO;
 import com.epmet.dto.IcResiCategoryWarnConfigDTO;
+import com.epmet.dto.PersonWarnLeftPieDTO;
+import com.epmet.dto.form.CategoryCountListFormDTO;
 import com.epmet.dto.form.IcResiCategoryStatsConfigFormDTO;
 import com.epmet.dto.form.StatsResiListFormDTO;
 import com.epmet.dto.result.*;
@@ -195,8 +197,15 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService {
     }
 
     @Override
-    public List<IcStatsResiResultDTO> list2(StatsResiListFormDTO formDTO) {
-        return this.list(formDTO.getCustomerId(), formDTO.getId(), formDTO.getLevel());
+    public List<CategoryCountListResultDTO> list2(CategoryCountListFormDTO formDTO) {
+        if (CollectionUtils.isEmpty(formDTO.getConfigList())){
+            return new ArrayList<>();
+        }
+        List<PersonWarnLeftPieDTO> result = icStatsResiWarnDao.selectCategoryCount(formDTO.getConfigList(), formDTO.getOrgId());
+        if (CollectionUtils.isEmpty(result)){
+            return new ArrayList<>();
+        }
+        return ConvertUtils.sourceToTarget(result,CategoryCountListResultDTO.class);
     }
 
     /**

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

@@ -136,7 +136,7 @@
     <select id="selectCategoryCount" resultType="com.epmet.dto.PersonWarnLeftPieDTO">
         SELECT
             CONFIG_ID,
-            COUNT(COUNT) AS count
+            SUM(COUNT) AS count
         FROM ic_stats_resi_warn
         WHERE DEL_FLAG = '0'
           AND CONCAT(AGENCY_PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%')