epmetuser/statsresiwarn/list支持传入多个小区，

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

@@ -21,6 +21,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
+import java.util.List;
 
 
 /**
@@ -39,6 +40,11 @@ public class StatsResiListFormDTO implements Serializable {
      */
     @NotBlank(message = "id不能为空")
 	private String id;
+    /**
+     * 目前只支持传入小区id
+     * level：neighborHood
+     */
+    private List<String> idList;
 
     @NotBlank(message = "level不能为空")
     private String level;

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

@@ -67,7 +67,7 @@ public class StatsResiWarnController {
     public Result<List<IcStatsResiResultDTO>> list(@LoginUser TokenDto tokenDto,@RequestBody StatsResiListFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO);
         String customerId = tokenDto.getCustomerId();
-        List<IcStatsResiResultDTO> icStatsResiResultDTOList = statsResiWarnService.list(customerId,formDTO.getId(),formDTO.getLevel());
+        List<IcStatsResiResultDTO> icStatsResiResultDTOList = statsResiWarnService.list(customerId,formDTO.getId(),formDTO.getLevel(),formDTO.getIdList());
         return new Result<List<IcStatsResiResultDTO>>().ok(icStatsResiResultDTOList);
     }
 

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

@@ -19,7 +19,6 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.commons.tools.dto.result.OptionDataResultDTO;
-import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IcResiUserConfirmDTO;
 import com.epmet.dto.IcResiUserDTO;
 import com.epmet.dto.IcVolunteerPolyDTO;
@@ -278,8 +277,12 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
      * @author LiuJanJun
      * @date 2022/2/12 3:03 下午
      */
-    Map<String, BigDecimal> getDataAnalyseCount(@Param("customerId") String customerId, @Param("tableName") String tableName,
+    Map<String, BigDecimal> getDataAnalyseCount(@Param("customerId") String customerId,
-                                                @Param("columnList") List<String> columnList, @Param("id") String id, @Param("level") String level);
+                                                @Param("tableName") String tableName,
+                                                @Param("columnList") List<String> columnList,
+                                                @Param("id") String id,
+                                                @Param("level") String level,
+                                                @Param("idList")List<String> idList);
 
     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/StatsResiWarnService.java

@@ -58,7 +58,7 @@ public interface StatsResiWarnService{
 
     PageData<UserWarnNameListResultDTO> allUserWarnList(StatsResiWarnFormDTO formDTO);
 
-    List<IcStatsResiResultDTO> list(String customerId,String id, String level);
+    List<IcStatsResiResultDTO> list(String customerId,String id, String level,List<String> idList);
 
     List<IcStatsResiResultDTO> list2(StatsResiListFormDTO formDTO);
 

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

@@ -243,7 +243,7 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService {
     }
 
     @Override
-    public List<IcStatsResiResultDTO> list(String customerId,String id, String level) {
+    public List<IcStatsResiResultDTO> list(String customerId,String id, String level,List<String> idList) {
         //获取所有配置类项 getshow
         IcResiCategoryStatsConfigFormDTO dto = new IcResiCategoryStatsConfigFormDTO();
         dto.setStatus("show");
@@ -263,7 +263,7 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService {
         });
         Map<String,Map<String, BigDecimal>> tableColumnCountMap = new HashMap<>();
         paramMap.forEach((tableName,columnList) ->{
-            Map<String, BigDecimal> countMap = icResiUserDao.getDataAnalyseCount(customerId,tableName,columnList, id,level);
+            Map<String, BigDecimal> countMap = icResiUserDao.getDataAnalyseCount(customerId,tableName,columnList, id,level,idList);
             if (countMap  != null){
                 tableColumnCountMap.put(tableName,countMap);
             }
@@ -287,7 +287,7 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService {
 
     @Override
     public List<IcStatsResiResultDTO> list2(StatsResiListFormDTO formDTO) {
-        return list(formDTO.getCustomerId(), formDTO.getId(), formDTO.getLevel());
+        return list(formDTO.getCustomerId(), formDTO.getId(), formDTO.getLevel(),null);
     }
 
     /**

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

@@ -818,7 +818,14 @@
                 AND GRID_ID = #{id}
             </if>
             <if test="level=='neighborHood'">
-                AND VILLAGE_ID = #{id}
+                <if test="id != null and id != ''">
+                    AND VILLAGE_ID = #{id}
+                </if>
+                <if test="idList != null and idList.size() > 0">
+                    <foreach collection="idList" item="id" open="AND (" close=")" separator=" OR ">
+                        VILLAGE_ID = #{id}
+                    </foreach>
+                </if>
             </if>
             <if test="level=='building'">
                 AND BUILD_ID = #{id}