From d55278560d29562b341aafa1652209a8aae0af33 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 30 四月 2026 17:08:16 +0800
Subject: [PATCH] 计量器具台账附件修改
---
src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java | 61 +++++++++++++++---------------
1 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
index 6fb9986..ed02564 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
@@ -2,40 +2,31 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.account.pojo.AccountExpense;
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.approve.service.IApproveProcessService;
-import com.ruoyi.approve.vo.ApproveGetAndUpdateVo;
-import com.ruoyi.approve.vo.ApproveProcessVO;
+import com.ruoyi.approve.bean.vo.ApproveGetAndUpdateVo;
+import com.ruoyi.approve.bean.vo.ApproveProcessVO;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.domain.SysDept;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
-import java.text.ParseException;
import java.util.List;
@RestController
@RequestMapping("/approveProcess")
-@Api(tags = "瀹℃壒")
+@AllArgsConstructor
+@Tag(name = "瀹℃壒")
public class ApproveProcessController {
- @GetMapping("/test")
- public AjaxResult test() {
- System.out.println(1111);
- return AjaxResult.success("娴嬭瘯");
- }
-
-
- @Autowired
private IApproveProcessService approveProcessService;
/**銆�
* 鑾峰彇閮ㄩ棬鍒楄〃
@@ -58,7 +49,7 @@
*/
@PostMapping("/add")
@Transactional(rollbackFor = Exception.class)
- @ApiOperation(value = "娣诲姞瀹℃壒")
+ @Operation(summary = "娣诲姞瀹℃壒")
public AjaxResult add(@RequestBody ApproveProcessVO approveProcessVO) throws Exception {
if (approveProcessVO == null) {
return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
@@ -74,7 +65,7 @@
* @return
*/
@GetMapping("/get")
- @ApiOperation(value = "瀹℃壒璇︽儏")
+ @Operation(summary = "瀹℃壒璇︽儏")
public AjaxResult get(ApproveGetAndUpdateVo approveGetAndUpdateVo){
if (approveGetAndUpdateVo.getId() == null || approveGetAndUpdateVo.getId().isEmpty()) {
return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
@@ -89,7 +80,7 @@
*/
@PostMapping("/update")
@Transactional(rollbackFor = Exception.class)
- @ApiOperation(value = "鏇存柊瀹℃壒")
+ @Operation(summary = "鏇存柊瀹℃壒")
public AjaxResult update(@RequestBody ApproveGetAndUpdateVo approveGetAndUpdateVo) throws IOException {
if (approveGetAndUpdateVo == null) {
return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
@@ -102,7 +93,7 @@
* @return
*/
@GetMapping("/list")
- @ApiOperation(value = "鑾峰彇瀹℃壒鍒楄〃")
+ @Operation(summary = "鑾峰彇瀹℃壒鍒楄〃")
public AjaxResult list(Page page, ApproveProcess approveProcess) {
return AjaxResult.success(approveProcessService.listAll(page, approveProcess));
}
@@ -113,17 +104,17 @@
* @return
*/
@DeleteMapping("/deleteIds")
- @ApiOperation(value = "鍒犻櫎瀹℃壒")
+ @Operation(summary = "鍒犻櫎瀹℃壒")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult deleteIds(@RequestBody Long[] ids) {
- if (ids == null || ids.length == 0) {
+ public AjaxResult deleteIds(@RequestBody List<Long> ids) {
+ if (ids == null || ids.size() == 0) {
return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
}
approveProcessService.delApprove(ids);
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
- @ApiOperation(value = "鍏嚭绠＄悊瀵煎嚭")
+ @Operation(summary = "鍏嚭绠＄悊瀵煎嚭")
@PostMapping("/exportOne")
public void exportOne(HttpServletResponse response) {
List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
@@ -133,7 +124,7 @@
util.exportExcel(response, accountExpenses, "鍏嚭绠＄悊瀵煎嚭");
}
- @ApiOperation(value = "璇峰亣绠＄悊瀵煎嚭")
+ @Operation(summary = "璇峰亣绠＄悊瀵煎嚭")
@PostMapping("/exportTwo")
public void exportTwo(HttpServletResponse response) {
List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
@@ -143,7 +134,7 @@
util.exportExcel(response, accountExpenses, "璇峰亣绠＄悊瀵煎嚭");
}
- @ApiOperation(value = "鍑哄樊绠＄悊瀵煎嚭")
+ @Operation(summary = "鍑哄樊绠＄悊瀵煎嚭")
@PostMapping("/exportThree")
public void exportThree(HttpServletResponse response) {
List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
@@ -153,7 +144,7 @@
util.exportExcel(response, accountExpenses, "鍑哄樊绠＄悊瀵煎嚭");
}
- @ApiOperation(value = "鎶ラ攢绠＄悊瀵煎嚭")
+ @Operation(summary = "鎶ラ攢绠＄悊瀵煎嚭")
@PostMapping("/exportFour")
public void exportFour(HttpServletResponse response) {
List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
@@ -163,7 +154,7 @@
util.exportExcel(response, accountExpenses, "鎶ラ攢绠＄悊瀵煎嚭");
}
- @ApiOperation(value = "閲囪喘鐢宠瀵煎嚭")
+ @Operation(summary = "閲囪喘鐢宠瀵煎嚭")
@PostMapping("/exportFive")
public void exportFive(HttpServletResponse response) {
List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
@@ -173,7 +164,7 @@
util.exportExcel(response, accountExpenses, "閲囪喘鐢宠瀵煎嚭");
}
- @ApiOperation(value = "鍗忓悓瀹℃壒瀵煎嚭")
+ @Operation(summary = "鍗忓悓瀹℃壒瀵煎嚭")
@PostMapping("/exportZero")
public void exportZero(HttpServletResponse response) {
List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
@@ -182,4 +173,14 @@
ExcelUtil<ApproveProcess> util = new ExcelUtil<ApproveProcess>(ApproveProcess.class);
util.exportExcel(response, accountExpenses, "鍗忓悓瀹℃壒瀵煎嚭");
}
+
+ @Operation(summary = "鍗遍櫓浣滀笟瀹℃壒瀵煎嚭")
+ @PostMapping("/exportEight")
+ public void exportEight(HttpServletResponse response) {
+ List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
+ .eq(ApproveProcess::getApproveDelete, 0)
+ .eq(ApproveProcess::getApproveType, 8));
+ ExcelUtil<ApproveProcess> util = new ExcelUtil<ApproveProcess>(ApproveProcess.class);
+ util.exportExcel(response, accountExpenses, "鍗遍櫓浣滀笟瀹℃壒瀵煎嚭");
+ }
}
--
Gitblit v1.9.3