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/AccountController.java |   83 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 83 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/account/controller/AccountController.java b/src/main/java/com/ruoyi/account/controller/AccountController.java
new file mode 100644
index 0000000..2f9690b
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/controller/AccountController.java
@@ -0,0 +1,83 @@
+package com.ruoyi.account.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.pojo.Account;
+import com.ruoyi.account.pojo.AccountIncome;
+import com.ruoyi.account.service.AccountIncomeService;
+import com.ruoyi.account.service.AccountService;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.framework.security.LoginUser;
+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 javax.servlet.http.HttpServletResponse;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐㈠姟绠$悊--璧勯噾绠$悊
+ */
+@RestController
+@RequestMapping("/finance/funds")
+@Api(tags = "璐㈠姟绠$悊--璧勯噾绠$悊")
+public class AccountController {
+
+    @Resource
+    private AccountService accountService;
+
+
+    /**
+     * 鏂板
+     * @param account
+     * @return
+     */
+    @PostMapping()
+    @ApiOperation("鏂板")
+    public AjaxResult add(@RequestBody Account account) {
+        return AjaxResult.success(accountService.save(account));
+    }
+
+    /**
+     * 鍒犻櫎
+     * @param ids
+     * @return
+     */
+    @DeleteMapping()
+    @ApiOperation("鍒犻櫎")
+    public AjaxResult delQualityInspect(@RequestBody List<Integer> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+        }
+        //鍒犻櫎妫�楠屽崟
+        return AjaxResult.success(accountService.removeBatchByIds(ids));
+    }
+
+    /**
+     * 淇敼
+     * @param account
+     * @return
+     */
+    @PutMapping()
+    @ApiOperation("淇敼")
+    public AjaxResult update(@RequestBody Account account) {
+        return AjaxResult.success(accountService.updateById(account));
+    }
+
+    /**
+     *鍒嗛〉鏌ヨ
+     * @param page
+     * @return
+     */
+    @GetMapping("/page")
+    @ApiOperation("鍒嗛〉鏌ヨ")
+    public AjaxResult accountListPage(Page page,Account account) {
+        return AjaxResult.success(accountService.accountListPage(page,account));
+    }
+
+
+
+}

--
Gitblit v1.9.3