From 1fd5eac12e532a9906e0c1d57676c692c68d1f32 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 20 五月 2025 17:46:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 47 +++++++++++++++++++++++++++++++++++------------
1 files changed, 35 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..d21a2dd 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -1,20 +1,21 @@
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.SalesLedgerDto;
+import com.ruoyi.sales.pojo.SalesLedger;
+import com.ruoyi.sales.service.ICommonFileService;
+import com.ruoyi.sales.service.ISalesLedgerService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.util.List;
/**
* 閿�鍞彴璐ontroller
@@ -29,7 +30,7 @@
private ISalesLedgerService salesLedgerService;
- private ISalesLedgerFileService salesLedgerFileService;
+ private ICommonFileService commonFileService;
/**
* 鏌ヨ閿�鍞彴璐﹀垪琛�
@@ -83,11 +84,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 +103,27 @@
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 amount = salesLedgerService.getContractAmount();
+ return AjaxResult.success(amount != null ? amount : BigDecimal.ZERO);
+ } catch (Exception e) {
+ return AjaxResult.error("鑾峰彇鍚堝悓閲戦澶辫触锛�" + e.getMessage());
+ }
+ }
+
+ /**
+ * 瀹㈡埛鍚堝悓閲戦TOP5缁熻
+ */
+ @GetMapping("/getTopFiveList")
+ public AjaxResult getTopFiveList() {
+ return AjaxResult.success(salesLedgerService.getTopFiveList());
}
}
--
Gitblit v1.9.3