From f81c345f7bf058fdfe5fee6f0dfd5de0f4cb767c Mon Sep 17 00:00:00 2001 From: chenrui <1187576398@qq.com> Date: 星期一, 12 五月 2025 16:29:02 +0800 Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/product-inventory-management-after --- src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 34 ++++++++++++---------------------- 1 files changed, 12 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java index 19122e8..18ad04f 100644 --- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java +++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java @@ -1,6 +1,6 @@ package com.ruoyi.sales.controller; -import java.util.List; +import java.util.*; import javax.servlet.http.HttpServletResponse; import com.ruoyi.common.utils.poi.ExcelUtil; @@ -8,12 +8,7 @@ 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 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; @@ -22,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; @@ -37,8 +31,7 @@ * 鏌ヨ閿�鍞彴璐﹀垪琛� */ @GetMapping("/list") - public TableDataInfo list(SalesLedgerDto salesLedgerDto) - { + public TableDataInfo list(SalesLedgerDto salesLedgerDto) { startPage(); List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedgerDto); return getDataTable(list); @@ -48,8 +41,8 @@ * 鏌ヨ閿�鍞彴璐﹀拰浜у搧鐖跺瓙鍒楄〃 */ @GetMapping("/getSalesLedgerWithProducts") - public SalesLedgerDto getSalesLedgerWithProducts(SalesLedgerDto salesLedgerDto){ - return salesLedgerService.getSalesLedgerWithProducts(salesLedgerDto); + public SalesLedgerDto getSalesLedgerWithProducts(SalesLedgerDto salesLedgerDto) { + return salesLedgerService.getSalesLedgerWithProducts(salesLedgerDto); } /** @@ -57,8 +50,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 +60,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,9 +69,8 @@ * 鍒犻櫎閿�鍞彴璐� */ @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"); } -- Gitblit v1.9.3