驾驶舱添加社区筛选优化

linwe

2024-06-24 60e1a68fa319cd9e92d632bf678b31af20973508

 src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java

@@ -33,6 +33,7 @@
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
import org.springblade.modules.doorplateAddress.service.IDoorplateAddressService;
import org.springblade.modules.grid.entity.GridEntity;
@@ -828,13 +829,14 @@
      if (!Strings.isBlank(roleName) && roleName.equals("mj")){
         userId = AuthUtil.getUserId();
      }
      Integer result1 = baseMapper.getHouseStatisticsOne(code, userId, aoiCode, buildingCode, unitCode, roleType);
      Integer result2  = baseMapper.getHouseStatisticsTwo(code, aoiCode, buildingCode, unitCode, house,
      List<String> communityCodeList = Func.toStrList(code);
      Integer result1 = baseMapper.getHouseStatisticsOne(communityCodeList, userId, aoiCode, buildingCode, unitCode, roleType);
      Integer result2  = baseMapper.getHouseStatisticsTwo(communityCodeList, aoiCode, buildingCode, unitCode, house,
         commonParamSet.getIsAdministrator(),
         commonParamSet.getRegionChildCodesList(),
         commonParamSet.getGridCodeList());
      Integer result3 = baseMapper.getHouseStatisticsThree(code, userId, aoiCode, buildingCode, unitCode, roleType);
      Integer result4 = baseMapper.getHouseStatisticsFour(code, userId, aoiCode, buildingCode, unitCode, roleType);
      Integer result3 = baseMapper.getHouseStatisticsThree(communityCodeList, userId, aoiCode, buildingCode, unitCode, roleType);
      Integer result4 = baseMapper.getHouseStatisticsFour(communityCodeList, userId, aoiCode, buildingCode, unitCode, roleType);
      objectObjectHashMap.put("result1", result1);
      objectObjectHashMap.put("result2", result2);
      objectObjectHashMap.put("result3", result3);
@@ -928,10 +930,8 @@
   public List<Map<String, Object>> getHouseLabelStatistic(HouseVO house) {
      CommonParamSet commonParamSet = new CommonParamSet<>().invoke(HouseVO.class, house);
      // 按房屋标签统计
      List<Map<String, Object>> list = baseMapper.getHouseLabelStatistic(house,
         commonParamSet.getIsAdministrator(),
         commonParamSet.getRegionChildCodesList(),
         commonParamSet.getGridCodeList());
      List<String> communityCodeList = Func.toStrList(house.getCode());
      List<Map<String, Object>> list = baseMapper.getHouseLabelStatistic(house,communityCodeList);
      // 返回
      return list;
   }