From 09394848ce262aff81897503d32ec334fd3f2b6f Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 20 一月 2026 15:59:30 +0800
Subject: [PATCH] Merge branch 'dev_tide' into dev_tide_zlglxt_xinlan
---
src/main/java/com/ruoyi/account/controller/AccountReconciliationController.java | 79 +++++++++++++++++++++++++++++++++++++++
1 files changed, 79 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/controller/AccountReconciliationController.java b/src/main/java/com/ruoyi/account/controller/AccountReconciliationController.java
new file mode 100644
index 0000000..e608e9c
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/controller/AccountReconciliationController.java
@@ -0,0 +1,79 @@
+package com.ruoyi.account.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.pojo.Account;
+import com.ruoyi.account.pojo.AccountReconciliation;
+import com.ruoyi.account.service.AccountReconciliationService;
+import com.ruoyi.account.service.AccountService;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 璐㈠姟绠＄悊--璐㈠姟瀵硅处
+ */
+@RestController
+@RequestMapping("/finance/reconciliation")
+@Api(tags = "璐㈠姟绠＄悊--璐㈠姟瀵硅处")
+public class AccountReconciliationController {
+
+ @Resource
+ private AccountReconciliationService accountReconciliationService;
+
+
+ /**
+ * 鏂板
+ * @param accountReconciliation
+ * @return
+ */
+ @PostMapping()
+ @ApiOperation("鏂板")
+ public AjaxResult add(@RequestBody AccountReconciliation accountReconciliation) {
+ return AjaxResult.success(accountReconciliationService.save(accountReconciliation));
+ }
+
+ /**
+ * 鍒犻櫎
+ * @param ids
+ * @return
+ */
+ @DeleteMapping()
+ @ApiOperation("鍒犻櫎")
+ public AjaxResult delQualityInspect(@RequestBody List<Integer> ids) {
+ if(CollectionUtils.isEmpty(ids)){
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ }
+ //鍒犻櫎妫�楠屽崟
+ return AjaxResult.success(accountReconciliationService.removeBatchByIds(ids));
+ }
+
+ /**
+ * 淇敼
+ * @param accountReconciliation
+ * @return
+ */
+ @PutMapping()
+ @ApiOperation("淇敼")
+ public AjaxResult update(@RequestBody AccountReconciliation accountReconciliation) {
+ return AjaxResult.success(accountReconciliationService.updateById(accountReconciliation));
+ }
+
+ /**
+ *鍒嗛〉鏌ヨ
+ * @param page
+ * @return
+ */
+ @GetMapping("/page")
+ @ApiOperation("鍒嗛〉鏌ヨ")
+ public AjaxResult accountReconciliationListPage(Page page,AccountReconciliation accountReconciliation) {
+ return AjaxResult.success(accountReconciliationService.accountReconciliationListPage(page, accountReconciliation));
+ }
+
+
+
+}
--
Gitblit v1.9.3