From b2859e20392f07094ec84166b83e6189665404c2 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期六, 12 七月 2025 17:09:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim_yys'
---
src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
index 25fd122..9dcda81 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
@@ -1,5 +1,7 @@
package com.ruoyi.approve.controller;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.approve.service.IApproveProcessService;
import com.ruoyi.approve.vo.ApproveGetAndUpdateVo;
import com.ruoyi.approve.vo.ApproveProcessVO;
@@ -8,8 +10,10 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.domain.SysDept;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import java.text.ParseException;
import java.util.List;
@RestController
@@ -45,7 +49,8 @@
* @return
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody ApproveProcessVO approveProcessVO) {
+ @Transactional(rollbackFor = Exception.class)
+ public AjaxResult add(@RequestBody ApproveProcessVO approveProcessVO) throws ParseException {
if (approveProcessVO == null) {
return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
}
@@ -60,7 +65,7 @@
* @return
*/
@GetMapping("/get")
- public AjaxResult get(@RequestBody ApproveGetAndUpdateVo approveGetAndUpdateVo){
+ public AjaxResult get(ApproveGetAndUpdateVo approveGetAndUpdateVo){
if (approveGetAndUpdateVo.getId() == null || approveGetAndUpdateVo.getId().isEmpty()) {
return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
}
@@ -73,6 +78,7 @@
* @return
*/
@PostMapping("/update")
+ @Transactional(rollbackFor = Exception.class)
public AjaxResult update(@RequestBody ApproveGetAndUpdateVo approveGetAndUpdateVo) {
if (approveGetAndUpdateVo == null) {
return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
@@ -85,8 +91,8 @@
* @return
*/
@GetMapping("/list")
- public AjaxResult list() {
- return AjaxResult.success(approveProcessService.listAll());
+ public AjaxResult list(Page page, ApproveProcess approveProcess) {
+ return AjaxResult.success(approveProcessService.listAll(page, approveProcess));
}
/**
@@ -94,7 +100,8 @@
* @param ids
* @return
*/
- @PostMapping("/deleteIds")
+ @DeleteMapping("/deleteIds")
+ @Transactional(rollbackFor = Exception.class)
public AjaxResult deleteIds(@RequestBody Long[] ids) {
if (ids == null || ids.length == 0) {
return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
--
Gitblit v1.9.3