From dc9c6c612cde7b938c6851383b9da99abab025a4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:02:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java | 95 +++++++++++++++++++++++++++--------------------
1 files changed, 55 insertions(+), 40 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java b/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java
index abf43f9..3b4f493 100644
--- a/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java
@@ -1,29 +1,30 @@
package com.ruoyi.sales.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.AjaxResult;
+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.R;
import com.ruoyi.sales.dto.InvoiceLedgerDto;
import com.ruoyi.sales.dto.InvoiceRegistrationProductDto;
-import com.ruoyi.sales.mapper.InvoiceRegistrationProductMapper;
-import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
+import com.ruoyi.sales.mapper.InvoiceLedgerFileMapper;
import com.ruoyi.sales.service.InvoiceLedgerService;
-import org.springframework.beans.factory.annotation.Autowired;
+import io.jsonwebtoken.lang.Collections;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.List;
@RestController
@RequestMapping("/invoiceLedger")
-public class InvoiceLedgerController {
+@AllArgsConstructor
+public class InvoiceLedgerController extends BaseController {
- @Autowired
private InvoiceLedgerService invoiceLedgerService;
-
- @Autowired
- private InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
+ private InvoiceLedgerFileMapper invoiceLedgerFileMapper;
/**
* 寮�绁ㄥ彴璐︽柊澧�
@@ -31,9 +32,9 @@
* @return
*/
@PostMapping("/saveOrUpdate")
- public AjaxResult invoiceLedgerSaveOrUpdate(@RequestBody InvoiceRegistrationProductDto productDto) {
+ public R<?> invoiceLedgerSaveOrUpdate(@RequestBody InvoiceRegistrationProductDto productDto) {
invoiceLedgerService.invoiceLedgerSaveOrUpdate(productDto);
- return AjaxResult.success();
+ return R.ok();
}
/**
@@ -42,9 +43,9 @@
* @return
*/
@DeleteMapping("/del")
- public AjaxResult invoiceLedgerDel(@RequestBody List<Integer> ids) {
+ public R<?> invoiceLedgerDel(@RequestBody List<Integer> ids) {
invoiceLedgerService.invoiceLedgerDel(ids);
- return AjaxResult.success();
+ return R.ok();
}
/**
@@ -54,8 +55,8 @@
* @return
*/
@GetMapping("/page")
- public AjaxResult invoiceLedgerPage(Page page, InvoiceLedgerDto invoiceLedgerDto) {
- return AjaxResult.success(invoiceLedgerService.invoiceLedgerPage(page, invoiceLedgerDto));
+ public R<?> invoiceLedgerPage(Page page, InvoiceLedgerDto invoiceLedgerDto) {
+ return R.ok(invoiceLedgerService.invoiceLedgerPage(page, invoiceLedgerDto));
}
/**
@@ -64,9 +65,22 @@
* @return
*/
@GetMapping("/fileList")
- public AjaxResult invoiceLedgerFileList(Integer invoiceLedgerId) {
- return AjaxResult.success(invoiceLedgerService.invoiceLedgerFileList(invoiceLedgerId));
+ public R<?> invoiceLedgerFileList(Integer invoiceLedgerId) {
+ return R.ok(invoiceLedgerService.invoiceLedgerFileList(invoiceLedgerId));
}
+
+ /**
+ * 寮�绁ㄥ彴璐︽枃浠跺垹闄�
+ */
+ @DeleteMapping("/delFile")
+ @Log(title = "寮�绁ㄥ彴璐�", businessType = BusinessType.DELETE)
+ public R<?> invoiceLedgerDelFile(@RequestBody List<Integer> ids) {
+ if(Collections.isEmpty(ids)) return R.fail("璇烽�夋嫨瑕佸垹闄ょ殑鏂囦欢");
+ invoiceLedgerFileMapper.deleteBatchIds(ids);
+ return R.ok();
+ }
+
+
/**
* 寮�绁ㄥ彴璐︽枃浠朵笂浼�
@@ -74,11 +88,11 @@
* @return
*/
@PostMapping("/uploadFile")
- public AjaxResult invoiceLedgerUploadFile(MultipartFile file) {
+ public R<?> invoiceLedgerUploadFile(MultipartFile file) {
try {
- return AjaxResult.success(invoiceLedgerService.invoiceLedgerUploadFile(file));
+ return R.ok(invoiceLedgerService.invoiceLedgerUploadFile(file));
}catch (Exception e) {
- return AjaxResult.error(e.getMessage());
+ return R.fail(e.getMessage());
}
}
@@ -99,8 +113,8 @@
* @return
*/
@GetMapping("/info")
- public AjaxResult invoiceLedgerInfo(Integer id) {
- return AjaxResult.success(invoiceLedgerService.invoiceLedgerDetail(id));
+ public R<?> invoiceLedgerInfo(Integer id) {
+ return R.ok(invoiceLedgerService.invoiceLedgerDetail(id));
}
/**
@@ -109,12 +123,12 @@
* @return
*/
@PostMapping("/commitFile")
- public AjaxResult invoiceLedgerCommitFile(@RequestBody InvoiceLedgerDto invoiceLedgerDto) {
+ public R<?> invoiceLedgerCommitFile(@RequestBody InvoiceLedgerDto invoiceLedgerDto) {
try {
invoiceLedgerService.invoiceLedgerCommitFile(invoiceLedgerDto);
- return AjaxResult.success();
+ return R.ok();
}catch (Exception e) {
- return AjaxResult.error(e.getMessage());
+ return R.fail(e.getMessage());
}
}
@@ -124,8 +138,8 @@
* @return
*/
@GetMapping("/list")
- public AjaxResult invoiceLedgerList(InvoiceLedgerDto invoiceLedgerDto) {
- return AjaxResult.success(invoiceLedgerService.invoiceLedgerList(invoiceLedgerDto));
+ public R<?> invoiceLedgerList(InvoiceLedgerDto invoiceLedgerDto) {
+ return R.ok(invoiceLedgerService.invoiceLedgerList(invoiceLedgerDto));
}
/**
@@ -135,20 +149,20 @@
* @return
*/
@GetMapping("/salesAccount")
- public AjaxResult invoiceLedgerSalesAccount(Page page, InvoiceLedgerDto invoiceLedgerDto) {
- return AjaxResult.success(invoiceLedgerService.invoiceLedgerSalesAccount(page,invoiceLedgerDto));
+ public R<?> invoiceLedgerSalesAccount(Page page, InvoiceLedgerDto invoiceLedgerDto) {
+ return R.ok(invoiceLedgerService.invoiceLedgerSalesAccount(page,invoiceLedgerDto));
}
/**
* 鏈湀寮�绁ㄩ噾棰�
*/
@GetMapping("/getInvoiceAmount")
- public AjaxResult getInvoiceAmount() {
+ public R<?> getInvoiceAmount() {
try {
BigDecimal amount = invoiceLedgerService.getInvoiceAmount();
- return AjaxResult.success(amount != null ? amount : BigDecimal.ZERO);
+ return R.ok(amount != null ? amount : BigDecimal.ZERO);
} catch (Exception e) {
- return AjaxResult.error("鑾峰彇寮�绁ㄩ噾棰濆け璐ワ細" + e.getMessage());
+ return R.fail("鑾峰彇寮�绁ㄩ噾棰濆け璐ワ細" + e.getMessage());
}
}
@@ -159,8 +173,9 @@
* @return
*/
@GetMapping("/registrationProductPage")
- public AjaxResult registrationProductPage(Page page, InvoiceRegistrationProductDto registrationProductDto) {
- return AjaxResult.success(invoiceLedgerService.registrationProductPage(page,registrationProductDto));
+ public R<?> registrationProductPage(Page page, InvoiceRegistrationProductDto registrationProductDto) {
+
+ return R.ok(invoiceLedgerService.registrationProductPage(page,registrationProductDto));
}
/**
@@ -169,8 +184,8 @@
* @return
*/
@GetMapping("/invoiceLedgerProductInfo")
- public AjaxResult invoiceLedgerProductDetail(Integer id) {
- return AjaxResult.success(invoiceLedgerService.invoiceLedgerProductDetail(id));
+ public R<?> invoiceLedgerProductDetail(Integer id) {
+ return R.ok(invoiceLedgerService.invoiceLedgerProductDetail(id));
}
/**
@@ -179,12 +194,12 @@
* @return
*/
@DeleteMapping("delInvoiceLedger/{invoiceRegistrationProductId}")
- public AjaxResult delInvoiceLedger(@PathVariable Integer invoiceRegistrationProductId) {
+ public R<?> delInvoiceLedger(@PathVariable Integer invoiceRegistrationProductId) {
try {
invoiceLedgerService.delInvoiceLedger(invoiceRegistrationProductId);
- return AjaxResult.success();
+ return R.ok();
}catch (Exception e) {
- return AjaxResult.error(e.getMessage());
+ return R.fail(e.getMessage());
}
}
--
Gitblit v1.9.3