From 698008c4a0f97efa3c583967e246b78777b150a7 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 26 五月 2025 10:35:44 +0800
Subject: [PATCH] 回款登记功能修改
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 98 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 69 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index 1c934a1..d21a2dd 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -1,44 +1,42 @@
package com.ruoyi.sales.controller;
-import java.util.List;
-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.ISalesLedgerService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
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
- *
+ *
* @author ruoyi
* @date 2025-05-08
*/
@RestController
@RequestMapping("/sales/ledger")
-public class SalesLedgerController extends BaseController
-{
- @Autowired
+@AllArgsConstructor
+public class SalesLedgerController extends BaseController {
+
private ISalesLedgerService salesLedgerService;
+
+ private ICommonFileService commonFileService;
/**
* 鏌ヨ閿�鍞彴璐﹀垪琛�
*/
@GetMapping("/list")
- public TableDataInfo list(SalesLedgerDto salesLedgerDto)
- {
+ public TableDataInfo list(SalesLedgerDto salesLedgerDto) {
startPage();
List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedgerDto);
return getDataTable(list);
@@ -48,8 +46,8 @@
* 鏌ヨ閿�鍞彴璐﹀拰浜у搧鐖跺瓙鍒楄〃
*/
@GetMapping("/getSalesLedgerWithProducts")
- public SalesLedgerDto getSalesLedgerWithProducts(SalesLedgerDto salesLedgerDto){
- return salesLedgerService.getSalesLedgerWithProducts(salesLedgerDto);
+ public SalesLedgerDto getSalesLedgerWithProducts(SalesLedgerDto salesLedgerDto) {
+ return salesLedgerService.getSalesLedgerWithProducts(salesLedgerDto);
}
/**
@@ -57,8 +55,7 @@
*/
@Log(title = "閿�鍞彴璐�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, SalesLedgerDto salesLedgerDto)
- {
+ public void export(HttpServletResponse response, SalesLedgerDto salesLedgerDto) {
List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedgerDto);
ExcelUtil<SalesLedger> util = new ExcelUtil<SalesLedger>(SalesLedger.class);
util.exportExcel(response, list, "閿�鍞彴璐︽暟鎹�");
@@ -68,9 +65,8 @@
* 鏂板淇敼閿�鍞彴璐�
*/
@Log(title = "閿�鍞彴璐�", businessType = BusinessType.INSERT)
- @PostMapping ("/addOrUpdateSalesLedger")
- public AjaxResult add(@RequestBody SalesLedgerDto salesLedgerDto)
- {
+ @PostMapping("/addOrUpdateSalesLedger")
+ public AjaxResult add(@RequestBody SalesLedgerDto salesLedgerDto) {
return toAjax(salesLedgerService.addOrUpdateSalesLedger(salesLedgerDto));
}
@@ -78,12 +74,56 @@
* 鍒犻櫎閿�鍞彴璐�
*/
@Log(title = "閿�鍞彴璐�", businessType = BusinessType.DELETE)
- @DeleteMapping("/delLedger")
- public AjaxResult remove(@RequestBody Long[] ids)
- {
+ @DeleteMapping("/delLedger")
+ public AjaxResult remove(@RequestBody Long[] ids) {
if (ids == null || ids.length == 0) {
return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
return toAjax(salesLedgerService.deleteSalesLedgerByIds(ids));
}
+
+ /**
+ * 鏌ヨ閿�鍞彴璐︿笉鍒嗛〉
+ *
+ * @param salesLedgerDto
+ * @return
+ */
+ @GetMapping("/listNoPage")
+ public AjaxResult listNoPage(SalesLedgerDto salesLedgerDto) {
+ List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedgerDto);
+ return AjaxResult.success(list);
+ }
+
+ /**
+ * 閿�鍞彴璐﹂檮浠跺垹闄�
+ */
+ @Log(title = "閿�鍞彴璐﹂檮浠跺垹闄�", businessType = BusinessType.DELETE)
+ @DeleteMapping("/delLedgerFile")
+ public AjaxResult delLedgerFile(@RequestBody Long[] ids) {
+ if (ids == null || ids.length == 0) {
+ return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ }
+ 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