From dfd3d024da6b3966d11d6e8619ce0fb19a58264b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 22 四月 2025 13:47:16 +0800
Subject: [PATCH] 7.4样品的处置调整
---
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessTotaldealServiceImpl.java | 1 +
cnas-process/src/main/java/com/ruoyi/process/controller/ProcessDealController.java | 9 ++-------
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessDealServiceImpl.java | 16 ----------------
cnas-process/src/main/java/com/ruoyi/process/service/ProcessDealService.java | 2 --
cnas-process/src/main/java/com/ruoyi/process/controller/ProcessTotaldealController.java | 3 ++-
5 files changed, 5 insertions(+), 26 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)));
}
}
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 8dcee8a..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
@@ -36,7 +36,8 @@
@ApiOperation(value = "鏂板妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�")
@PostMapping("/addProcessTotaldeal")
- public Result addProcessTotaldeal(String month) {
+ public Result addProcessTotaldeal(@RequestBody Map<String, String> param) {
+ String month = param.get("month");
return Result.success(processTotaldealService.addProcessTotaldeal(month));
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/ProcessDealService.java b/cnas-process/src/main/java/com/ruoyi/process/service/ProcessDealService.java
index ff895b4..18f18c9 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/ProcessDealService.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/ProcessDealService.java
@@ -16,6 +16,4 @@
* @since 2024-11-02 02:50:19
*/
public interface ProcessDealService extends IService<ProcessDeal> {
-
- IPage<ProcessDeal> pageProcessDeal(Page page, ProcessDeal processDeal);
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessDealServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessDealServiceImpl.java
index 47a2972..89dc84b 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessDealServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessDealServiceImpl.java
@@ -33,20 +33,4 @@
@Transactional(rollbackFor = Exception.class)
public class ProcessDealServiceImpl extends ServiceImpl<ProcessDealMapper, ProcessDeal> implements ProcessDealService {
- @Resource
- private ProcessDealMapper processDealMapper;
-
-
- @Autowired
- private UserMapper userMapper;
-
- @Resource
- private ProcessTotaldealMapper processTotaldealMapper;
-
- @Override
- public IPage<ProcessDeal> pageProcessDeal(Page page, ProcessDeal processDeal) {
- Integer userId = SecurityUtils.getUserId().intValue();
- processDeal.setCreateUser(userId);
- return processDealMapper.pageProcessDeal(page, QueryWrappers.queryWrappers(processDeal));
- }
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessTotaldealServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessTotaldealServiceImpl.java
index 831469c..02126e0 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessTotaldealServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessTotaldealServiceImpl.java
@@ -129,6 +129,7 @@
processTotaldeal.setRatifyUser(userId);
processTotaldeal.setRatifyState(state);
if (state.equals("涓嶉�氳繃")) {
+ processTotaldeal.setExamineState(state);
processTotaldeal.setSubmitState("寰呮彁浜�");
}
return processTotaldealMapper.updateById(processTotaldeal);
--
Gitblit v1.9.3