From 83abd7b427e84f6813e1a017912cf61676103316 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 21 五月 2026 09:37:17 +0800
Subject: [PATCH] refactor(account): 移除AccountIncome相关代码和依赖
---
src/main/java/com/ruoyi/sales/controller/InvoiceRegistrationController.java | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/InvoiceRegistrationController.java b/src/main/java/com/ruoyi/sales/controller/InvoiceRegistrationController.java
index 09447b1..8ea6c11 100644
--- a/src/main/java/com/ruoyi/sales/controller/InvoiceRegistrationController.java
+++ b/src/main/java/com/ruoyi/sales/controller/InvoiceRegistrationController.java
@@ -2,8 +2,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.sales.dto.InvoiceRegistrationDto;
import com.ruoyi.sales.dto.InvoiceRegistrationProductDto;
import com.ruoyi.sales.dto.SalesLedgerDto;
@@ -19,7 +18,7 @@
@RestController
@RequestMapping("/invoiceRegistration")
@AllArgsConstructor
-public class InvoiceRegistrationController extends BaseController {
+public class InvoiceRegistrationController {
private InvoiceRegistrationService invoiceRegistrationService;
@@ -31,13 +30,13 @@
@PostMapping("/save")
@Log(title = "寮�绁ㄧ櫥璁�", businessType = com.ruoyi.framework.aspectj.lang.enums.BusinessType.INSERT)
@Transactional(rollbackFor = Exception.class)
- public R<?> invoiceRegistrationSave(@RequestBody List<SalesLedgerDto> salesLedgerDto) {
- if(Collections.isEmpty(salesLedgerDto)) return R.fail("璇烽�夋嫨瑕佷繚瀛樼殑璁板綍");
+ public AjaxResult invoiceRegistrationSave(@RequestBody List<SalesLedgerDto> salesLedgerDto) {
+ if(Collections.isEmpty(salesLedgerDto)) return AjaxResult.error("璇烽�夋嫨瑕佷繚瀛樼殑璁板綍");
salesLedgerDto.forEach(item ->{
invoiceRegistrationService.invoiceRegistrationSave(item);
});
- return R.ok();
+ return AjaxResult.success();
}
/**
@@ -46,9 +45,9 @@
* @return
*/
@DeleteMapping("/del")
- public R<?> invoiceRegistrationDel(@RequestBody List<Integer> ids) {
+ public AjaxResult invoiceRegistrationDel(@RequestBody List<Integer> ids) {
invoiceRegistrationService.invoiceRegistrationDel(ids);
- return R.ok();
+ return AjaxResult.success();
}
/**
@@ -57,9 +56,9 @@
* @return
*/
@PostMapping("/update")
- public R<?> invoiceRegistrationUpdate(@RequestBody InvoiceRegistrationDto invoiceRegistrationDto) {
+ public AjaxResult invoiceRegistrationUpdate(@RequestBody InvoiceRegistrationDto invoiceRegistrationDto) {
invoiceRegistrationService.invoiceRegistrationUpdate(invoiceRegistrationDto);
- return R.ok();
+ return AjaxResult.success();
}
/**
@@ -69,8 +68,8 @@
* @return
*/
@GetMapping("/listPage")
- public R<?> invoiceRegistrationListPage(Page page, InvoiceRegistrationDto invoiceRegistrationDto) {
- return R.ok(invoiceRegistrationService.invoiceRegistrationListPage(page, invoiceRegistrationDto));
+ public AjaxResult invoiceRegistrationListPage(Page page, InvoiceRegistrationDto invoiceRegistrationDto) {
+ return AjaxResult.success(invoiceRegistrationService.invoiceRegistrationListPage(page, invoiceRegistrationDto));
}
/**
@@ -79,8 +78,8 @@
* @return
*/
@GetMapping("/productList")
- public R<?> invoiceRegistrationProductList(InvoiceRegistrationProductDto invoiceRegistrationProductDto) {
- return R.ok(invoiceRegistrationService.invoiceRegistrationProductList(invoiceRegistrationProductDto));
+ public AjaxResult invoiceRegistrationProductList(InvoiceRegistrationProductDto invoiceRegistrationProductDto) {
+ return AjaxResult.success(invoiceRegistrationService.invoiceRegistrationProductList(invoiceRegistrationProductDto));
}
/**
@@ -89,8 +88,8 @@
* @return
*/
@GetMapping("/detail")
- public R<?> invoiceRegistrationDetail(Integer id) {
- return R.ok(invoiceRegistrationService.invoiceRegistrationDetail(id));
+ public AjaxResult invoiceRegistrationDetail(Integer id) {
+ return AjaxResult.success(invoiceRegistrationService.invoiceRegistrationDetail(id));
}
/**
--
Gitblit v1.9.3