From 366b67926809852c1090f14c5a24fe00109a81b5 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 28 七月 2025 17:59:52 +0800
Subject: [PATCH] yys  首页接口开发

---
 src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index f4ce895..a18d5c4 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -161,8 +161,8 @@
      * 杩戝崐骞村紑绁�,鍥炴閲戦
      */
     @GetMapping("/getAmountHalfYear")
-    public AjaxResult getAmountHalfYear() {
-        return AjaxResult.success(salesLedgerService.getAmountHalfYear());
+    public AjaxResult getAmountHalfYear(@RequestParam(value = "type",defaultValue = "1") Integer type) {
+        return AjaxResult.success(salesLedgerService.getAmountHalfYear(type));
     }
 
     /**
@@ -178,6 +178,7 @@
         List<Long> salesLedgerIds = iPage.getRecords().stream().map(SalesLedger::getId).collect(Collectors.toList());
         List<InvoiceLedgerDto> invoiceLedgerDtoList = invoiceLedgerMapper.invoicedTotal(salesLedgerIds);
         if(CollectionUtils.isEmpty(invoiceLedgerDtoList)){
+            iPage.setTotal(iPage.getRecords().size());
             return iPage;
         }
         for (SalesLedger salesLedger : iPage.getRecords()) {
@@ -204,6 +205,7 @@
                 iPage.getRecords().removeIf(salesLedger -> Objects.equals(salesLedger.getNoInvoiceAmountTotal(), new BigDecimal("0.00")));
             }
         }
+        iPage.setTotal(iPage.getRecords().size());
         return iPage;
     }
 }

--
Gitblit v1.9.3