From 35a26d64e5d9e260cde73f1dbdf8e88a442742dd Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 06 六月 2025 09:04:25 +0800
Subject: [PATCH] 开票台账数据未展示功能修改

---
 src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java |   80 ++++++++++++++++++++++++++++++++++------
 1 files changed, 68 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index ace01c0..c7b7ccf 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -1,20 +1,26 @@
 package com.ruoyi.sales.controller;
 
-import java.util.*;
-import javax.servlet.http.HttpServletResponse;
-
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.sales.dto.SalesLedgerDto;
-import com.ruoyi.sales.pojo.SalesLedger;
-import com.ruoyi.sales.service.ISalesLedgerFileService;
-import com.ruoyi.sales.service.ISalesLedgerService;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.sales.dto.InvoiceLedgerDto;
+import com.ruoyi.sales.dto.SalesLedgerDto;
+import com.ruoyi.sales.mapper.InvoiceLedgerMapper;
+import com.ruoyi.sales.pojo.SalesLedger;
+import com.ruoyi.sales.service.ICommonFileService;
+import com.ruoyi.sales.service.ISalesLedgerService;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 閿�鍞彴璐ontroller
@@ -29,7 +35,10 @@
 
     private ISalesLedgerService salesLedgerService;
 
-    private ISalesLedgerFileService salesLedgerFileService;
+    private ICommonFileService commonFileService;
+
+    @Autowired
+    private InvoiceLedgerMapper invoiceLedgerMapper;
 
     /**
      * 鏌ヨ閿�鍞彴璐﹀垪琛�
@@ -38,6 +47,23 @@
     public TableDataInfo list(SalesLedgerDto salesLedgerDto) {
         startPage();
         List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedgerDto);
+        // 璁＄畻宸插紑绁ㄩ噾棰�/鏈紑绁ㄩ噾棰�(宸插～鍐欏彂绁ㄩ噾棰濅负鍑�)
+        if(CollectionUtils.isEmpty(list)){
+            return getDataTable(list);
+        }
+        List<Long> salesLedgerIds = list.stream().map(SalesLedger::getId).collect(Collectors.toList());
+        List<InvoiceLedgerDto> invoiceLedgerDtoList = invoiceLedgerMapper.invoicedTotal(salesLedgerIds);
+        if(CollectionUtils.isEmpty(invoiceLedgerDtoList)){
+            return getDataTable(list);
+        }
+        for (SalesLedger salesLedger : list) {
+            for (InvoiceLedgerDto invoiceLedgerDto : invoiceLedgerDtoList) {
+                if (salesLedger.getId().intValue() == invoiceLedgerDto.getSalesLedgerId()) {
+                    BigDecimal noInvoiceAmountTotal = salesLedger.getContractAmount().subtract(invoiceLedgerDto.getInvoiceTotal());
+                    salesLedger.setNoInvoiceAmountTotal(noInvoiceAmountTotal);
+                }
+            }
+        }
         return getDataTable(list);
     }
 
@@ -83,11 +109,12 @@
 
     /**
      * 鏌ヨ閿�鍞彴璐︿笉鍒嗛〉
+     *
      * @param salesLedgerDto
      * @return
      */
     @GetMapping("/listNoPage")
-    public AjaxResult listNoPage(SalesLedgerDto salesLedgerDto){
+    public AjaxResult listNoPage(SalesLedgerDto salesLedgerDto) {
         List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedgerDto);
         return AjaxResult.success(list);
     }
@@ -101,6 +128,35 @@
         if (ids == null || ids.length == 0) {
             return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
         }
-        return toAjax(salesLedgerFileService.deleteSalesLedgerByIds(ids));
+        return toAjax(commonFileService.deleteSalesLedgerByIds(ids));
+    }
+
+    /**
+     * 鏈湀閿�鍞悎鍚岄噾棰�
+     */
+    @GetMapping("/getContractAmount")
+    public AjaxResult getContractAmount() {
+        try {
+            BigDecimal contractAmount = salesLedgerService.getContractAmount();
+            return AjaxResult.success(contractAmount != null ? contractAmount : BigDecimal.ZERO);
+        } catch (Exception e) {
+            return AjaxResult.error("鑾峰彇鍚堝悓閲戦澶辫触锛�" + e.getMessage());
+        }
+    }
+
+    /**
+     * 瀹㈡埛鍚堝悓閲戦TOP5缁熻
+     */
+    @GetMapping("/getTopFiveList")
+    public AjaxResult getTopFiveList() {
+        return AjaxResult.success(salesLedgerService.getTopFiveList());
+    }
+
+    /**
+     * 杩戝崐骞村紑绁�,鍥炴閲戦
+     */
+    @GetMapping("/getAmountHalfYear")
+    public AjaxResult getAmountHalfYear() {
+        return AjaxResult.success(salesLedgerService.getAmountHalfYear());
     }
 }

--
Gitblit v1.9.3