E呼即办2

linwe

2024-05-15 047ced202f052d70c50f4365b2d86810de076489

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

@@ -121,7 +121,7 @@
    */
   @Override
   public HouseVO getHouseDetail(HouseVO house) {
      if (house == null) {
      if (ObjectUtils.isEmpty(house)) {
         logger.error("house是空值", house);
         return new HouseVO();
      }
@@ -825,28 +825,25 @@

   @Override
   public Map<String, Object> getHouseStatistics(String code, String roleType, String aoiCode, String buildingCode, String unitCode) {
      HouseVO house = new HouseVO();
      CommonParamSet commonParamSet = new CommonParamSet<>().invoke(HouseVO.class, house);
      Map<String, Object> objectObjectHashMap = new HashMap<>();
      if (roleType.equals("2")) {
         //    result1 查询楼栋数  result2 查询房屋套数 result3 查询住户数  result4 查询单元数
         Integer result1 = baseMapper.getHouseStatisticsOne(code, null, aoiCode, buildingCode, unitCode, roleType);
         Integer result2 = baseMapper.getHouseStatisticsTwo(code, null, aoiCode, buildingCode, unitCode, roleType);
         Integer result3 = baseMapper.getHouseStatisticsThree(code, null, aoiCode, buildingCode, unitCode, roleType);
         Integer result4 = baseMapper.getHouseStatisticsFour(code, null, aoiCode, buildingCode, unitCode, roleType);
         objectObjectHashMap.put("result1", result1);
         objectObjectHashMap.put("result2", result2);
         objectObjectHashMap.put("result3", result3);
         objectObjectHashMap.put("result4", result4);
      } else {

         Integer result1 = baseMapper.getHouseStatisticsOne(code, AuthUtil.getUserId(), aoiCode, buildingCode, unitCode, roleType);
         Integer result2 = baseMapper.getHouseStatisticsTwo(code, AuthUtil.getUserId(), aoiCode, buildingCode, unitCode, roleType);
         Integer result3 = baseMapper.getHouseStatisticsThree(code, AuthUtil.getUserId(), aoiCode, buildingCode, unitCode, roleType);
         Integer result4 = baseMapper.getHouseStatisticsFour(code, AuthUtil.getUserId(), aoiCode, buildingCode, unitCode, roleType);
         objectObjectHashMap.put("result1", result1);
         objectObjectHashMap.put("result2", result2);
         objectObjectHashMap.put("result3", result3);
         objectObjectHashMap.put("result4", result4);
      Long userId = null;
      String roleName = SpringUtils.getRequestParam("roleName");
      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,
         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);
      objectObjectHashMap.put("result1", result1);
      objectObjectHashMap.put("result2", result2);
      objectObjectHashMap.put("result3", result3);
      objectObjectHashMap.put("result4", result4);
      return objectObjectHashMap;
   }