From 9f19d3a24f8474bf6f9eb9401888c44b34b381e6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 21 十一月 2024 14:29:50 +0800
Subject: [PATCH] 第一次改动(检验任务与样品关联,附件与样品关联,报告与样品关联)
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 48 +++++++++++++++++++++++++-----------------------
1 files changed, 25 insertions(+), 23 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 0036898..1dc996a 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
@@ -75,13 +75,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));
}
@@ -89,29 +90,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("妫�楠屼换鍔�")
@@ -132,9 +133,9 @@
@ApiOperation(value = "淇濆瓨妫�楠屽唴瀹�")
@PostMapping("/saveInsContext")
@ValueAuth
- public Result<?> saveInsContext(String param,Integer num) {
+ public Result<?> saveInsContext(String param, Integer num) {
Map<String, Object> param2 = JSON.parseObject(param, Map.class);
- insOrderPlanService.saveInsContext(param2,num);
+ insOrderPlanService.saveInsContext(param2, num);
return Result.success();
}
@@ -165,15 +166,15 @@
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "涓婁紶闄勪欢")
@PostMapping("/uploadFile")
- public Result<?> uploadFile(Integer orderId, MultipartFile file) {
- return Result.success(insOrderPlanService.uploadFile(orderId, file));
+ public Result<?> uploadFile(Integer orderId, MultipartFile file, String sonLaboratory,Integer sampleId) {
+ return Result.success(insOrderPlanService.uploadFile(orderId, file, sonLaboratory,sampleId));
}
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "鍒犻櫎闄勪欢")
@PostMapping("/delfile")
public Result<?> delfile(Integer id) {
- return Result.success(insOrderFileService.removeById(id));
+ return Result.success(insOrderFileService.delfile(id));
}
@ValueAuth
@@ -212,7 +213,7 @@
@ApiOperation(value = "鐢佃矾璇曢獙鐐瑰嚮妫�楠岄�夋嫨鐗堟湰")
@PostMapping("/chooseVersion")
@ValueAuth
- public Result<?> chooseVersion(Integer orderStateId,Integer version) {
+ public Result<?> chooseVersion(Integer orderStateId, Integer version) {
InsOrderState orderState = new InsOrderState();
orderState.setId(orderStateId);
orderState.setVersion(version);
@@ -229,28 +230,29 @@
@ValueAuth
@PostMapping("/getInsProduct2")
@ApiOperation("鏌ョ湅妫�楠屽巻鍙�")
- public Result<?> getInsProduct2(Integer id, Integer type, String laboratory, HttpServletRequest request,Integer num) {
- return Result.success(insOrderPlanService.getInsProduct2(id, type, laboratory, request,num));
+ //杩欓噷鐨刬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));
}
@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) {
+ return Result.success(insOrderPlanService.scanInsOrderState(sonLaboratory, sampleCode, trees));
}
@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) {
+ return Result.success(insOrderPlanService.outInsOrderState(sonLaboratory, sampleCode));
}
@ValueAuth
@PostMapping("/preview")
@ApiOperation("棰勮鏂囦欢")
- public Result<?> preview(Integer id)throws Exception {
+ public Result<?> preview(Integer id) throws Exception {
return Result.success(insOrderPlanService.preview(id));
}
--
Gitblit v1.9.3