修改新需求

src/main/java/com/ydtech/modules/inv/controller/InvAccountIncoiceController.java

@@ -81,6 +81,14 @@ public class InvAccountIncoiceController {
         Page<InvAccountIncoice> invAccountIncoicePage = this.invAccountIncoiceService.page(page, lambdaQuery);
 
         InvAccountIncoiceResult invAccountIncoiceResult = this.invAccountIncoiceService.selectAccountIncoice(invAccountIncoice);
+        if(invAccountIncoiceResult == null){
+            InvAccountIncoiceResult invAccountIncoiceResult1 = new InvAccountIncoiceResult();
+            invAccountIncoiceResult1.setRecords(invAccountIncoicePage.getRecords());
+            invAccountIncoiceResult1.setCurrent(invAccountIncoice.getPageNo());
+            invAccountIncoiceResult1.setTotal(invAccountIncoicePage.getTotal());
+            invAccountIncoiceResult1.setSize(invAccountIncoice.getPageSize());
+            return HttpResult.ok(invAccountIncoiceResult1);
+        }
         invAccountIncoiceResult.setRecords(invAccountIncoicePage.getRecords());
         invAccountIncoiceResult.setCurrent(invAccountIncoice.getPageNo());
         invAccountIncoiceResult.setTotal(invAccountIncoicePage.getTotal());

src/main/java/com/ydtech/modules/inv/model/InvAccountIncoiceResult.java

@@ -25,4 +25,13 @@ public class InvAccountIncoiceResult {
 
     @ApiModelProperty("不含税金额总和")
     private BigDecimal noHasTaxSum;
+
+    @ApiModelProperty("进账金额总和")
+    private BigDecimal payoutMoneySum;
+
+    @ApiModelProperty("未进账金额总和")
+    private BigDecimal notPayoutMoneySum;
+
+    @ApiModelProperty("开票数总和")
+    private BigDecimal invoiceNumSum;
 }

src/main/resources/mapper/modules/inv/InvAccountIncoiceMapper.xml

@@ -51,7 +51,10 @@ biller = values(biller) invoice_subjects = values(invoice_subjects) invoice_by =
         SELECT
             sum(round(invoice_money,2)) as invoice_money_sum,
             sum( round(tax, 2) ) as tax_sum,
-            sum( round(no_has_tax, 2) ) as no_has_tax_sum
+            sum( round(no_has_tax, 2) ) as no_has_tax_sum,
+            sum( round(payout_money, 2) ) as payoutMoneySum,
+            sum( round(not_payout_money, 2) ) as notPayoutMoneySum,
+            sum( round(invoice_num, 2) ) as invoiceNumSum
         FROM inv_account_incoice WHERE del_flag = '0'
         <if test="invoiceTimeStart != null">
             and invoice_time &gt;=  #{invoiceTimeStart}