From 234b0ac195934b34c06045b2d2ef0f10e239dd8e Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期三, 23 四月 2025 00:06:54 +0800
Subject: [PATCH] 系统合并

---
 cnas-process/src/main/java/com/ruoyi/process/controller/ProcessDealController.java |   20 +++++---------------
 1 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessDealController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessDealController.java
index 15ac088..e04b93b 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessDealController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessDealController.java
@@ -1,5 +1,6 @@
 package com.ruoyi.process.controller;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.Result;
 import com.ruoyi.common.utils.JackSonUtil;
@@ -17,7 +18,7 @@
  * 妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃� 鍓嶇鎺у埗鍣�
  * </p>
  *
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
  * @since 2024-11-02 02:50:19
  */
 @RestController
@@ -28,34 +29,23 @@
     @Resource
     private ProcessDealService processDealService;
 
-    @ApiOperation(value = "鏌ヨ妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃鎯�")
-    @GetMapping("/pageProcessDeal")
-    public Result pageProcessDeal(ProcessDeal processDeal, Page page) throws Exception {
-        return Result.success(processDealService.pageProcessDeal(page, processDeal));
-    }
-
     @ApiOperation(value = "鏂板妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�")
     @PostMapping("/addProcessDeal")
     public Result addProcessDeal(@RequestBody ProcessDeal processDeal) {
-        return Result.success(processDealService.addProcessDeal(processDeal));
+        return Result.success(processDealService.saveOrUpdate(processDeal));
     }
 
     @ApiOperation(value = "鍒犻櫎妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�")
     @DeleteMapping("/delProcessDeal")
     public Result delProcessDeal(Integer id) {
-        return Result.success(processDealService.delProcessDeal(id));
+        return Result.success(processDealService.removeById(id));
     }
 
-    @ApiOperation(value = "淇敼妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�")
-    @PostMapping("/doProcessDeal")
-    public Result doProcessDeal(@RequestBody ProcessDeal processDeal) {
-        return Result.success(processDealService.doProcessDeal(processDeal));
-    }
 
     @ApiOperation(value = "鏌ョ湅妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�")
     @GetMapping("/getProcessDeal")
     public Result getProcessDeal(Integer id) {
-        return Result.success(processDealService.getById(id));
+        return Result.success(processDealService.list(Wrappers.<ProcessDeal>lambdaQuery().eq(ProcessDeal::getTotaldealId,id)));
     }
 
 }

--
Gitblit v1.9.3