From 0578cb68bcd2933fd638f94a7cc7c53f21588b48 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 12 五月 2025 16:04:59 +0800
Subject: [PATCH] 通用文件上传

---
 src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java |   72 +++++++++++++-----------------------
 1 files changed, 26 insertions(+), 46 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index 1f871d6..7f4f39a 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -1,21 +1,14 @@
 package com.ruoyi.sales.controller;
 
-import java.util.List;
+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.ISalesLedgerService;
-import org.springframework.security.access.prepost.PreAuthorize;
 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.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+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;
@@ -24,14 +17,13 @@
 
 /**
  * 閿�鍞彴璐ontroller
- * 
+ *
  * @author ruoyi
  * @date 2025-05-08
  */
 @RestController
 @RequestMapping("/sales/ledger")
-public class SalesLedgerController extends BaseController
-{
+public class SalesLedgerController extends BaseController {
     @Autowired
     private ISalesLedgerService salesLedgerService;
 
@@ -39,11 +31,18 @@
      * 鏌ヨ閿�鍞彴璐﹀垪琛�
      */
     @GetMapping("/list")
-    public TableDataInfo list(SalesLedger salesLedger)
-    {
+    public TableDataInfo list(SalesLedgerDto salesLedgerDto) {
         startPage();
-        List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedger);
+        List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedgerDto);
         return getDataTable(list);
+    }
+
+    /**
+     * 鏌ヨ閿�鍞彴璐﹀拰浜у搧鐖跺瓙鍒楄〃
+     */
+    @GetMapping("/getSalesLedgerWithProducts")
+    public SalesLedgerDto getSalesLedgerWithProducts(SalesLedgerDto salesLedgerDto) {
+        return salesLedgerService.getSalesLedgerWithProducts(salesLedgerDto);
     }
 
     /**
@@ -51,49 +50,30 @@
      */
     @Log(title = "閿�鍞彴璐�", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SalesLedger salesLedger)
-    {
-        List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedger);
+    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, "閿�鍞彴璐︽暟鎹�");
     }
 
     /**
-     * 鑾峰彇閿�鍞彴璐﹁缁嗕俊鎭�
-     */
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return success(salesLedgerService.selectSalesLedgerById(id));
-    }
-
-    /**
-     * 鏂板閿�鍞彴璐�
+     * 鏂板淇敼閿�鍞彴璐�
      */
     @Log(title = "閿�鍞彴璐�", businessType = BusinessType.INSERT)
-    @PostMapping ("/insertSalesLedger")
-    public AjaxResult add(@RequestBody SalesLedger salesLedger)
-    {
-        return toAjax(salesLedgerService.insertSalesLedger(salesLedger));
-    }
-
-    /**
-     * 淇敼閿�鍞彴璐�
-     */
-    @Log(title = "閿�鍞彴璐�", businessType = BusinessType.UPDATE)
-    @PostMapping ("/updateSalesLedger")
-    public AjaxResult edit(@RequestBody SalesLedger salesLedger)
-    {
-        return toAjax(salesLedgerService.updateSalesLedger(salesLedger));
+    @PostMapping("/addOrUpdateSalesLedger")
+    public AjaxResult add(@RequestBody SalesLedgerDto salesLedgerDto) {
+        return toAjax(salesLedgerService.addOrUpdateSalesLedger(salesLedgerDto));
     }
 
     /**
      * 鍒犻櫎閿�鍞彴璐�
      */
     @Log(title = "閿�鍞彴璐�", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable 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));
     }
 }

--
Gitblit v1.9.3