批量安装BUG

smart-city-platform/src/main/java/com/bz/smart_city/controller/water/WaterReadController.java

@@ -135,11 +135,9 @@ public class WaterReadController {
     public AjaxMessage<List<CustomerRateDto>> getListByCustomer(
             @ApiParam(value = "查询范围，2:昨天，7:近7日，15:近15日，99:上月", required = false) @RequestParam(required = false) Integer period,
             @ApiParam(value = "场景id", required = false) @RequestParam(required = false) Integer channelId,
-            @ApiParam(value = "客户id", required = false) @RequestParam(required = false) Integer customerId,
-            @ApiParam(value = "页数，默认第一页", required = true, defaultValue = "1") @RequestParam(required = true, defaultValue = "1") int pageNum,
-            @ApiParam(value = "条数，默认15条", required = true, defaultValue = "15") @RequestParam(required = true, defaultValue = "15") int pageSize
+            @ApiParam(value = "客户id", required = false) @RequestParam(required = false) Integer customerId
     ) {
-        return new AjaxMessage<>(ResultStatus.OK, statMeterReadRateByBuildingService.getListByCustomer(period, channelId, customerId, null, null, pageNum, pageSize));
+        return new AjaxMessage<>(ResultStatus.OK, statMeterReadRateByBuildingService.getListByCustomer(period, channelId, customerId, null, null));
     }
 
     @ResponseBody

smart-city-platform/src/main/java/com/bz/smart_city/service/StatMeterReadRateByBuildingService.java

@@ -25,7 +25,7 @@ public interface StatMeterReadRateByBuildingService{
 
     void getRateExcelByDeviceType(Integer period, HttpServletResponse httpServletResponse);
 
-    List<CustomerRateDto> getListByCustomer(Integer period, Integer channelId, Integer customerId, String sortColumn, String sortOrder, int pageNum, int pageSize);
+    List<CustomerRateDto> getListByCustomer(Integer period, Integer channelId, Integer customerId, String sortColumn, String sortOrder);
 
     List<CustomerRateDto> getSubListByCustomer(Integer period, Integer channelId, Integer customerId);
 

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/StatMeterReadRateByBuildingServiceImpl.java

@@ -326,14 +326,14 @@ public class StatMeterReadRateByBuildingServiceImpl implements StatMeterReadRate
     }
 
     @Override
-    public List<CustomerRateDto> getListByCustomer(Integer period, Integer channelId, Integer customerId, String sortColumn, String sortOrder, int pageNum, int pageSize) {
+    public List<CustomerRateDto> getListByCustomer(Integer period, Integer channelId, Integer customerId, String sortColumn, String sortOrder) {
         LoginUser loginUser = UserUtil.getCurrentUser();
         ///查询数据权限的建筑ids
         List<Integer> buildingIds = buildingService.getIdsByDataPermission();
         //2、根据数据项查询客户
         //List<Customer> customerList = customerService.getCustomerListByItem(loginUser.getSiteId(), buildingIds, customerId);
 
-        List<Integer> customerIds = customerId != null?newArrayList(customerId):null;
+        List<Integer> customerIds = customerId != null?customerService.findAllSubIds(customerId):null;
 
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
         //Integer startDate = Integer.valueOf(LocalDate.now().plusDays(-1).format(formatter));