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 | 53 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 33 insertions(+), 20 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 ed69b35..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,10 +5,7 @@
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;
@@ -79,13 +76,14 @@
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "鎵ц妫�楠屾搷浣�")
@PostMapping("/doInsOrder")
- public Result<?> doInsOrder(Integer id, String laboratory) {
- return Result.success(insOrderPlanService.doInsOrder(id, laboratory));
+ public Result<?> doInsOrder(Integer sampleId, String laboratory) {
+ return Result.success(insOrderPlanService.doInsOrder(sampleId, laboratory));
}
@ValueAuth
@PostMapping("/getInsProduct")
@ApiOperation("鑾峰彇妫�楠岄」鐩拰妯℃澘鍐呭")
+ //杩欓噷鐨刬d灏辨槸鏍峰搧id
public Result<?> getInsProduct(Integer id, Integer type, String laboratory, HttpServletRequest request) {
return Result.success(insOrderPlanService.getInsProduct(id, type, laboratory, request));
}
@@ -93,29 +91,29 @@
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "浠诲姟浜ゆ帴")
@PostMapping("/upPlanUser")
- public Result<?> upPlanUser(Integer userId, Integer orderId, String sonLaboratory) {
- return Result.success(insOrderPlanService.upPlanUser(userId, orderId, sonLaboratory));
+ public Result<?> upPlanUser(Integer userId, Integer sampleId, String sonLaboratory) {
+ return Result.success(insOrderPlanService.upPlanUser(userId, sampleId, sonLaboratory));
}
@ValueAuth
@ApiOperation(value = "鍒ゆ柇浜ゆ帴鐨勮瘯楠屽")
@PostMapping("/upPlanUser2")
- public Result<?> upPlanUser2(Integer orderId) {
- return Result.success(insOrderPlanService.upPlanUser2(orderId));
+ public Result<?> upPlanUser2(Integer sampleId) {
+ return Result.success(insOrderPlanService.upPlanUser2(sampleId));
}
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "澶嶆牳妫�楠屼换鍔�")
@PostMapping("/verifyPlan")
- public Result<?> verifyPlan(Integer orderId, String laboratory, Integer type, String tell) throws IOException {
- return Result.success(insOrderPlanService.verifyPlan(orderId, laboratory, type, tell));
+ public Result<?> verifyPlan(Integer sampleId, String laboratory, Integer type, String tell) throws IOException {
+ return Result.success(insOrderPlanService.verifyPlan(sampleId, laboratory, type, tell));
}
@ValueAuth
@ApiOperation(value = "鏍￠獙妫�楠屼换鍔℃彁浜�")
@PostMapping("/checkSubmitPlan")
- public Result<?> checkSubmitPlan(Integer orderId, String laboratory) {
- return Result.success(insOrderPlanService.checkSubmitPlan(orderId, laboratory));
+ public Result<?> checkSubmitPlan(Integer sampleId, String laboratory) {
+ return Result.success(insOrderPlanService.checkSubmitPlan(sampleId, laboratory));
}
@ValueClassify("妫�楠屼换鍔�")
@@ -124,6 +122,13 @@
public Result<?> submitPlan(@RequestBody SubmitPlanDto submitPlanDto) {
int num = insOrderPlanService.submitPlan(submitPlanDto);
return num == 1 ? Result.success() : Result.fail("鎻愪氦澶辫触锛岄儴鍒嗛」鐩繕鏈繘琛屾楠�");
+ }
+
+ @ValueClassify("妫�楠屼换鍔�")
+ @ApiOperation(value = "妫�楠屼换鍔℃挙閿�鎻愪氦")
+ @PostMapping("/cancelSubmitPlan")
+ public Result cancelSubmitPlan(Integer orderStateId) {
+ return Result.success(insOrderPlanService.cancelSubmitPlan(orderStateId));
}
@ValueClassify("璁惧")
@@ -149,6 +154,13 @@
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 = "娓╂箍搴﹁瘯楠�+鍔熺巼璇曢獙鐨勪繚瀛樻楠屽唴瀹�")
@PostMapping("/saveInsContext3")
@ValueAuth
@@ -169,8 +181,8 @@
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "涓婁紶闄勪欢")
@PostMapping("/uploadFile")
- public Result<?> uploadFile(Integer orderId, MultipartFile file, String sonLaboratory) {
- return Result.success(insOrderPlanService.uploadFile(orderId, file, sonLaboratory));
+ public Result<?> uploadFile(Integer orderId, MultipartFile file, String sonLaboratory,Integer sampleId) {
+ return Result.success(insOrderPlanService.uploadFile(orderId, file, sonLaboratory,sampleId));
}
@ValueClassify("妫�楠屼换鍔�")
@@ -233,6 +245,7 @@
@ValueAuth
@PostMapping("/getInsProduct2")
@ApiOperation("鏌ョ湅妫�楠屽巻鍙�")
+ //杩欓噷鐨刬d鏄牱鍝乮d
public Result<?> getInsProduct2(Integer id, Integer type, String laboratory, HttpServletRequest request, Integer num) {
return Result.success(insOrderPlanService.getInsProduct2(id, type, laboratory, request, num));
}
@@ -240,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
--
Gitblit v1.9.3