1去掉分页

smart-city-platform/src/main/java/com/bz/smart_city/controller/pay/PayReportController.java

@@ -25,6 +25,7 @@ import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.List;
 
 /**
  * @Author: ZJY
@@ -126,14 +127,12 @@ public class PayReportController {
 
     @ApiOperation(value = "用水性质销售统计报表")
     @GetMapping("/getWaterPropertySaleReport")
-    public AjaxMessage<Pagination<PayWaterPropertyReportDto>> getWaterPropertySaleReport(
+    public AjaxMessage<List<PayWaterPropertyReportDto>> getWaterPropertySaleReport(
             @ApiParam(value = "机构ID", required = false) @RequestParam(required = false) Integer officeId,
             @ApiParam(value = "收费员", required = false) @RequestParam(required = false) Integer userId,
             @ApiParam(value = "起始时间", required = false,defaultValue = "2020-01-01") @RequestParam(required = false) String startDate,
             @ApiParam(value = "结束时间", required = false,defaultValue = "2020-01-30") @RequestParam(required = false) String endDate,
-            @ApiParam(value = "用水类别", required = false) @RequestParam(required = false) Integer watercategoryId,
-            @ApiParam(value = "页数,非必传，默认第一页", required = false, defaultValue = "1") @RequestParam(required = false, defaultValue = "1") int pageNum,
-            @ApiParam(value = "条数，非必传，默认10条", required = false, defaultValue = "20") @RequestParam(required = false, defaultValue = "10") int pageSize
+            @ApiParam(value = "用水类别", required = false) @RequestParam(required = false) Integer watercategoryId
     ){
         PayWaterPropertyReport  inParams = new PayWaterPropertyReport();
         inParams.setOfficeId(officeId);
@@ -142,7 +141,7 @@ public class PayReportController {
         inParams.setEndDate(endDate);
         inParams.setWatercategoryId(watercategoryId);
 
-        Pagination<PayWaterPropertyReportDto> pagination = payReportService.getWaterPropertySaleReport(inParams,pageNum,pageSize);
+        List<PayWaterPropertyReportDto> pagination = payReportService.getWaterPropertySaleReport(inParams);
         return  new AjaxMessage<>(ResultStatus.OK,pagination);
     }
 

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

@@ -188,12 +188,10 @@ public class PayReportServiceImpl implements PayReportService {
     /**
      * 用水性质销售报表
      * @param payWaterPropertyReport
-     * @param pageNum
-     * @param pageSize
      * @return
      */
     @Override
-    public Pagination<PayWaterPropertyReportDto> getWaterPropertySaleReport(PayWaterPropertyReport payWaterPropertyReport, int pageNum, int pageSize)
+    public List<PayWaterPropertyReportDto> getWaterPropertySaleReport(PayWaterPropertyReport payWaterPropertyReport)
     {
         LoginUser loginUser = UserUtil.getCurrentUser();
         BigInteger customerId = new BigInteger(String.valueOf(loginUser.getCustomerId()));
@@ -201,7 +199,6 @@ public class PayReportServiceImpl implements PayReportService {
         BigInteger siteId = new BigInteger(String.valueOf(loginUser.getSiteId()));
         payWaterPropertyReport.setSiteId(siteId);
 
-        Pagination<PayWaterPropertyReportDto> pg = new Pagination<>();
         //组装账户交易明细+实收记录
         List<PayWaterPropertyReportDto> list = new ArrayList<PayWaterPropertyReportDto>();
         //获取账户交易明细记录
@@ -289,9 +286,7 @@ public class PayReportServiceImpl implements PayReportService {
             dto.setReceivedamount(receivedamount);
             list.add(dto);
         }
-        pg.setTotal(list.size());
-        pg.setList(list);
-        return pg;
+        return list;
     }
 
     /**
@@ -440,7 +435,7 @@ public class PayReportServiceImpl implements PayReportService {
             message = message + "销售网点：全部网点";
         }
         if(StringUtils.isNotBlank(payWaterPropertyReport.getUserName())){
-            message = message + "　　　　　　操作员："+payWaterPropertyReport.getOfficeName();
+            message = message + "　　　　　　操作员："+payWaterPropertyReport.getUserName();
         }else{
             message = message + "　　　　　　操作员：全部操作员";
         }

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

@@ -8,6 +8,7 @@ import com.bz.smart_city.dto.pay.PayWaterPropertyReportDto;
 import com.bz.smart_city.entity.pay.PayWaterPropertyReport;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * @Author: ZJY
@@ -21,7 +22,7 @@ public interface PayReportService {
 
     Pagination<PayArrearagedetailsReportDto> getPayArrearagedetailsReport(PayArrearagedetailsReportDto payArrearagedetailsReportDto, int pageNum, int pageSize);
 
-    Pagination<PayWaterPropertyReportDto> getWaterPropertySaleReport(PayWaterPropertyReport payWaterPropertyReport, int pageNum, int pageSize);
+    List<PayWaterPropertyReportDto> getWaterPropertySaleReport(PayWaterPropertyReport payWaterPropertyReport);
 
     void getDebtListExcel(PayArrearagedetailsReportDto payArrearagedetailsReportDto, HttpServletResponse httpServletResponse);