Merge branch 'dev_ic_platform' into develop

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java

@@ -191,21 +191,21 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         //获取居民分类数量统计
         IcResiUserDTO userDTO = new IcResiUserDTO();
         userDTO.setBuildId(formDTO.getBuildingId());
-        Result<Map<String, Map<String, Integer>>> resultMap = epmetUserOpenFeignClient.getHomeUserCategoryCount(userDTO);
+        Result<Map<String, Map<String, String>>> resultMap = epmetUserOpenFeignClient.getHomeUserCategoryCount(userDTO);
         if (!resultMap.success()) {
             throw new RenException(resultMap.getCode(), resultMap.getMsg());
         }
-        Map<String, Map<String, Integer>> map = resultMap.getData();
+        Map<String, Map<String, String>> map = resultMap.getData();
 
         return list.stream().map(item -> {
-            Map<String, Integer> countMap = map.get(item.getId());
+            Map<String, String> countMap = map.get(item.getId());
             HouseListResultDTO dto = new HouseListResultDTO();
             dto.setHouseId(item.getId());
             dto.setHouseName(item.getHouseName());
             List<HouseListResultDTO.CategoryListBean> categories = new ArrayList<>();
             if (null != countMap && CollectionUtils.isNotEmpty(categoryList)) {
                 for (IcResiCategoryStatsConfigDTO category : categoryList) {
-                    if (null == countMap.get(category.getColumnName()) || countMap.get(category.getColumnName()) == NumConstant.ZERO) {
+                    if (null == countMap.get(category.getColumnName()) || NumConstant.ZERO_STR.equals(countMap.get(category.getColumnName()))) {
                         continue;
                     }
                     HouseListResultDTO.CategoryListBean bean = new HouseListResultDTO.CategoryListBean();

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

@@ -652,5 +652,5 @@ public interface EpmetUserOpenFeignClient {
     Result<List<OptionResultDTO>> getDemandOptions();
 
     @PostMapping("/epmetuser/icresiuser/categorycount")
-    Result<Map<String, Map<String, Integer>>> getHomeUserCategoryCount(@RequestBody IcResiUserDTO formDTO);
+    Result<Map<String, Map<String, String>>> getHomeUserCategoryCount(@RequestBody IcResiUserDTO formDTO);
 }

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

@@ -346,13 +346,13 @@ public class IcResiUserController {
     /**
      * @Description 获取一栋楼每个房间人员分类的数量
      * @Param formDTO
-     * @Return {@link Result< Map< String, Map< String, Integer>>>}
+     * @Return {@link Result< Map< String, Map< String, String>>>}
      * @Author zhaoqifeng
      * @Date 2021/11/5 15:10
      */
     @PostMapping("categorycount")
-    public Result<Map<String, Map<String, Integer>>> getHomeUserCategoryCount(@RequestBody IcResiUserDTO formDTO) {
-        return new Result<Map<String, Map<String, Integer>>>().ok(icResiUserService.getHomeUserCategoryCount(formDTO.getBuildId()));
+    public Result<Map<String, Map<String, String>>> getHomeUserCategoryCount(@RequestBody IcResiUserDTO formDTO) {
+        return new Result<Map<String, Map<String, String>>>().ok(icResiUserService.getHomeUserCategoryCount(formDTO.getBuildId()));
     }
 
 }

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

@@ -123,7 +123,7 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
     String selectCategoryNames(@Param("customerId") String customerId,@Param("codeSet") Set<String> codeSet);
 
     @MapKey("HOME_ID")
-    Map<String, Map<String, Integer>> getHomeUserCategoryCount(@Param("buildId") String buildId);
+    Map<String, Map<String, String>> getHomeUserCategoryCount(@Param("buildId") String buildId);
 
     /**
      * @Description  根据userId查询志愿者

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

@@ -125,9 +125,9 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
     /**
      * @Description 获取一栋楼每个房间人员分类的数量
      * @Param buildId
-     * @Return {@link Map< String, Map< String, Integer>>}
+     * @Return {@link Map< String, Map< String, String>>}
      * @Author zhaoqifeng
      * @Date 2021/11/5 14:40
      */
-    Map<String, Map<String, Integer>> getHomeUserCategoryCount(String buildId);
+    Map<String, Map<String, String>> getHomeUserCategoryCount(String buildId);
 }

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

@@ -759,12 +759,12 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
      * @param buildId
      * @Description 获取一栋楼每个房间人员分类的数量
      * @Param buildId
-     * @Return {@link Map<String,Map<String,Integer>>}
+     * @Return {@link Map<String,Map<String,String>>}
      * @Author zhaoqifeng
      * @Date 2021/11/5 14:40
      */
     @Override
-    public Map<String, Map<String, Integer>> getHomeUserCategoryCount(String buildId) {
+    public Map<String, Map<String, String>> getHomeUserCategoryCount(String buildId) {
         return baseDao.getHomeUserCategoryCount(buildId);
     }
 }