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/ProcessDealController.java | 9 ++-------
1 files changed, 2 insertions(+), 7 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 a14c7b7..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;
@@ -28,12 +29,6 @@
@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) {
@@ -50,7 +45,7 @@
@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