From 23eb9c9a21afc8ed065706f0e6494ee998a217b5 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 04 三月 2026 16:35:27 +0800
Subject: [PATCH] fix:1.班次页面：月度统计时间调整为上月26到本月25；班次支持右键添加批注 2.外购下单：KJNS域订单免检自动更新批次属性；外购下单-全部页新增【更新IFS批次属性】按钮，支持更新已提交订单的批次属性 3.资源要求-设备：设备核查计划：核查负责人回显问题修复；设备使用授权：检验项目导出数据错误问题修复
---
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