单元展示排序

zhongrj

2023-12-20 7c533d448acabda7ec92d75757d760b447e41f00

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

@@ -301,23 +301,23 @@
   }

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