From f206c80520a83a28b3caa91a3fbbd9d039dd8456 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期二, 22 四月 2025 16:10:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb
---
cnas-process/src/main/java/com/ruoyi/process/controller/ProcessTotaldealController.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessTotaldealController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessTotaldealController.java
index 88826c0..44f3005 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessTotaldealController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessTotaldealController.java
@@ -9,6 +9,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
import java.util.Map;
/**
@@ -16,7 +17,7 @@
* 妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�昏〃(鍘嗗彶) 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-02 03:59:09
*/
@RestController
@@ -33,23 +34,41 @@
return Result.success(processTotaldealService.pageProcessTotaldeal(page, processTotaldeal));
}
+ @ApiOperation(value = "鏂板妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�")
+ @PostMapping("/addProcessTotaldeal")
+ public Result addProcessTotaldeal(@RequestBody Map<String, String> param) {
+ String month = param.get("month");
+ return Result.success(processTotaldealService.addProcessTotaldeal(month));
+ }
+
@ApiOperation(value = "鎻愪氦妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�")
@PostMapping("/submitProcessTotaldeal")
- public Result submitProcessTotaldeal(Integer id) {
+ public Result submitProcessTotaldeal(@RequestBody Map<String, Integer> param) {
+ Integer id = param.get("id");
return Result.success(processTotaldealService.submitProcessTotaldeal(id));
}
@ApiOperation(value = "瀹℃牳妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�")
@PostMapping("/checkProcessTotaldeal")
- public Result checkProcessTotaldeal(Integer id, String state) {
+ public Result checkProcessTotaldeal(@RequestBody Map<String, Object> param) {
+ Integer id = (Integer) param.get("id");
+ String state = (String) param.get("state");
return Result.success(processTotaldealService.checkProcessTotaldeal(id, state));
}
@ApiOperation(value = "鎵瑰噯妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�")
@PostMapping("/ratifyProcessTotaldeal")
- public Result ratifyProcessTotaldeal(Integer id,String state) {
+ public Result ratifyProcessTotaldeal(@RequestBody Map<String, Object> param) {
+ Integer id = (Integer) param.get("id");
+ String state = (String) param.get("state");
return Result.success(processTotaldealService.ratifyProcessTotaldeal(id,state));
}
+ @ApiOperation(value = "瀵煎嚭妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�")
+ @GetMapping("/exportProcessTotaldeal")
+ public void exportProcessTotaldeal(Integer id, HttpServletResponse response) {
+ processTotaldealService.exportProcessTotaldeal(id,response);
+ }
+
}
--
Gitblit v1.9.3