From 4497f5b1e322eba5ec519ebc1955317ed656aa8e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 26 十二月 2024 14:31:15 +0800
Subject: [PATCH] Merge branch 'master' into cnas
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 43 +++++++++++++++++++++++++++++++++++--------
1 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
index 1dc996a..339e4e6 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
@@ -5,13 +5,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
-import com.yuanchu.mom.dto.InsOrderPlanDTO;
-import com.yuanchu.mom.dto.InsProductDto;
-import com.yuanchu.mom.dto.InsProductResultDto;
-import com.yuanchu.mom.dto.SubmitPlanDto;
+import com.yuanchu.mom.dto.*;
+import com.yuanchu.mom.mapper.InsSampleUserMapper;
import com.yuanchu.mom.pojo.InsOrderFile;
import com.yuanchu.mom.pojo.InsOrderState;
import com.yuanchu.mom.pojo.InsProductResult;
+import com.yuanchu.mom.pojo.InsSampleUser;
import com.yuanchu.mom.service.*;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.InsProductResultVo;
@@ -44,6 +43,8 @@
private InsProductService insProductService;
private InsOrderStateService insOrderStateService;
+
+ private InsSampleUserMapper insSampleUserMapper;
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "鑾峰彇妫�楠屼换鍔″垪琛�")
@@ -123,6 +124,13 @@
return num == 1 ? Result.success() : Result.fail("鎻愪氦澶辫触锛岄儴鍒嗛」鐩繕鏈繘琛屾楠�");
}
+ @ValueClassify("妫�楠屼换鍔�")
+ @ApiOperation(value = "妫�楠屼换鍔℃挙閿�鎻愪氦")
+ @PostMapping("/cancelSubmitPlan")
+ public Result cancelSubmitPlan(Integer orderStateId) {
+ return Result.success(insOrderPlanService.cancelSubmitPlan(orderStateId));
+ }
+
@ValueClassify("璁惧")
@ApiOperation(value = "鏄惁鍏佽淇敼閲囬泦鍊�")
@DeleteMapping("/isItAllowedToModifyTheCollectedValues")
@@ -144,6 +152,13 @@
@ValueAuth
public Result<?> saveInsContext2(@RequestBody InsProductResultDto insProductResultDtos) {
return Result.success(insOrderPlanService.saveInsContext2(insProductResultDtos));
+ }
+
+ @ApiOperation(value = "鐢佃矾璇曢獙鐨勪繚瀛樻楠屽唴瀹�(杩斿洖/鎻愪氦)")
+ @PostMapping("/saveInsContext2s")
+ @ValueAuth
+ public Result<?> saveInsContext2s(@RequestBody InsProductResultDtos insProductResultDtos) {
+ return Result.success(insOrderPlanService.saveInsContext2s(insProductResultDtos));
}
@ApiOperation(value = "娓╂箍搴﹁瘯楠�+鍔熺巼璇曢獙鐨勪繚瀛樻楠屽唴瀹�")
@@ -238,15 +253,15 @@
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "鎵爜鎶ユ(鍏ュ簱)")
@PostMapping("/scanInsOrderState")
- public Result scanInsOrderState(String sonLaboratory, String sampleCode, String trees) {
- return Result.success(insOrderPlanService.scanInsOrderState(sonLaboratory, sampleCode, trees));
+ public Result scanInsOrderState(String sonLaboratory, String sampleCode, String trees,String entrustCode) {
+ return Result.success(insOrderPlanService.scanInsOrderState(sonLaboratory, sampleCode, trees,entrustCode));
}
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "鎵爜鍑哄簱")
@PostMapping("/outInsOrderState")
- public Result outInsOrderState(String sonLaboratory, String sampleCode) {
- return Result.success(insOrderPlanService.outInsOrderState(sonLaboratory, sampleCode));
+ public Result outInsOrderState(String sonLaboratory, String sampleCode,String entrustCode) {
+ return Result.success(insOrderPlanService.outInsOrderState(sonLaboratory, sampleCode,entrustCode));
}
@ValueAuth
@@ -256,4 +271,16 @@
return Result.success(insOrderPlanService.preview(id));
}
+ @ValueAuth
+ @PostMapping("/getCheckUser")
+ @ApiOperation("鑾峰彇褰撳墠妫�楠屼换鍔＄殑鎵�鏈夋楠屽憳淇℃伅")
+ //杩欓噷鐨勪紶鍙傛槸鏍峰搧id,绛夋楠屼换鍔￠偅鍧楀叏鏀逛簡涔嬪悗杩欓噷灏辨病闂
+ public Result<?> getCheckUser(Integer id,String sonLaboratory) {
+ List<InsSampleUser> insSampleUsers = insSampleUserMapper.selectList(Wrappers.<InsSampleUser>lambdaQuery()
+ .eq(InsSampleUser::getState, 0) //妫�楠屼汉
+ .eq(InsSampleUser::getInsSampleId, id)
+ .eq(InsSampleUser::getSonLaboratory, sonLaboratory));
+ return Result.success(insSampleUsers);
+ }
+
}
--
Gitblit v1.9.3