From ae659b7fe99a8862082a4ba4bb24148a2a6727ca Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期四, 08 十月 2026 16:57:40 +0800
Subject: [PATCH] feat(芯导): 仓储物流出库 / 人力资源(离职/在职/合同/薪资) / 环保门禁(门禁+智能巡检) 后端
---
src/main/java/com/ruoyi/account/controller/AccountController.java | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/controller/AccountController.java b/src/main/java/com/ruoyi/account/controller/AccountController.java
index 50f1b60..9d1cc12 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountController.java
+++ b/src/main/java/com/ruoyi/account/controller/AccountController.java
@@ -1,6 +1,7 @@
package com.ruoyi.account.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.dto.AccountTransferDto;
import com.ruoyi.account.pojo.Account;
import com.ruoyi.account.pojo.AccountIncome;
import com.ruoyi.account.service.AccountIncomeService;
@@ -31,14 +32,25 @@
/**
- * 鏂板
+ * 鏂板娴佹按(鑷姩琛ュ叏鏀舵敮鏂瑰悜)
* @param account
* @return
*/
- @PostMapping()
- @ApiOperation("鏂板")
+ @PostMapping("/add")
+ @ApiOperation("鏂板娴佹按")
public AjaxResult add(@RequestBody Account account) {
- return AjaxResult.success(accountService.save(account));
+ return AjaxResult.success(accountService.saveFlow(account));
+ }
+
+ /**
+ * 杞处(鐢熸垚鎴愬娴佹按)
+ * @param dto
+ * @return
+ */
+ @PostMapping("/transfer")
+ @ApiOperation("杞处")
+ public AjaxResult transfer(@RequestBody AccountTransferDto dto) {
+ return AjaxResult.success(accountService.transfer(dto));
}
/**
@@ -52,7 +64,10 @@
if(CollectionUtils.isEmpty(ids)){
return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- //鍒犻櫎妫�楠屽崟
+ if (accountService.listByIds(ids).stream().anyMatch(item -> "2".equals(item.getFlowType()))) {
+ return AjaxResult.error("杞处鎴愬娴佹按涓嶅彲鍗曠嫭鍒犻櫎");
+ }
+ // 鍒犻櫎鏅�氳祫閲戞祦姘达紱杞处娴佹按蹇呴』淇濇寔鎴愬瀹屾暣
return AjaxResult.success(accountService.removeBatchByIds(ids));
}
@@ -64,7 +79,7 @@
@PutMapping()
@ApiOperation("淇敼")
public AjaxResult update(@RequestBody Account account) {
- return AjaxResult.success(accountService.updateById(account));
+ return AjaxResult.success(accountService.updateFlow(account));
}
/**
@@ -74,8 +89,8 @@
*/
@GetMapping("/page")
@ApiOperation("鍒嗛〉鏌ヨ")
- public AjaxResult accountListPage(Page page) {
- return AjaxResult.success(accountService.page(page));
+ public AjaxResult accountListPage(Page page,Account account) {
+ return AjaxResult.success(accountService.accountListPage(page,account));
}
--
Gitblit v1.9.3