From 7a268ed852ca462347cca383a6d0306ff54e1363 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 04 十一月 2024 15:05:21 +0800
Subject: [PATCH] 添加模版
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 55 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 32 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 0772bc0..88e2c02 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
@@ -8,8 +8,10 @@
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.pojo.InsOrderFile;
import com.yuanchu.mom.pojo.InsOrderState;
+import com.yuanchu.mom.pojo.InsProductResult;
import com.yuanchu.mom.service.*;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.InsProductResultVo;
@@ -87,7 +89,7 @@
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "浠诲姟浜ゆ帴")
@PostMapping("/upPlanUser")
- public Result<?> upPlanUser(Integer userId, Integer orderId,String sonLaboratory) {
+ public Result<?> upPlanUser(Integer userId, Integer orderId, String sonLaboratory) {
return Result.success(insOrderPlanService.upPlanUser(userId, orderId, sonLaboratory));
}
@@ -115,8 +117,8 @@
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "妫�楠屼换鍔℃彁浜�")
@PostMapping("/submitPlan")
- public Result<?> submitPlan(Integer orderId,String laboratory, Integer verifyUser, String entrustCode, String note,String term) {
- int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser, entrustCode,note,term);
+ public Result<?> submitPlan(@RequestBody SubmitPlanDto submitPlanDto) {
+ int num = insOrderPlanService.submitPlan(submitPlanDto);
return num == 1 ? Result.success() : Result.fail("鎻愪氦澶辫触锛岄儴鍒嗛」鐩繕鏈繘琛屾楠�");
}
@@ -130,10 +132,24 @@
@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();
+ }
+
+ @ApiOperation(value = "鐢佃矾璇曢獙鐨勪繚瀛樻楠屽唴瀹�")
+ @PostMapping("/saveInsContext2")
+ @ValueAuth
+ public Result<?> saveInsContext2(@RequestBody InsProductResultDto insProductResultDtos) {
+ return Result.success(insOrderPlanService.saveInsContext2(insProductResultDtos));
+ }
+
+ @ApiOperation(value = "娓╂箍搴﹁瘯楠�+鍔熺巼璇曢獙鐨勪繚瀛樻楠屽唴瀹�")
+ @PostMapping("/saveInsContext3")
+ @ValueAuth
+ public Result<?> saveInsContext3(@RequestBody InsProductResult insProductResult) {
+ return Result.success(insOrderPlanService.saveInsContext3(insProductResult));
}
@ValueAuth
@@ -149,15 +165,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) {
+ return Result.success(insOrderPlanService.uploadFile(orderId, file, sonLaboratory));
}
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "鍒犻櫎闄勪欢")
@PostMapping("/delfile")
public Result<?> delfile(Integer id) {
- return Result.success(insOrderFileService.removeById(id));
+ return Result.success(insOrderFileService.delfile(id));
}
@ValueAuth
@@ -186,13 +202,6 @@
return Result.success(insOrderStateService.jumpTeam(insOrderState));
}
- @ApiOperation(value = "鐢佃矾璇曢獙鐨勪繚瀛樻楠屽唴瀹�")
- @PostMapping("/saveInsContext2")
- @ValueAuth
- public Result<?> saveInsContext2(@RequestBody InsProductResultDto insProductResultDtos) {
- return Result.success(insOrderPlanService.saveInsContext2(insProductResultDtos));
- }
-
@ApiOperation(value = "鐢佃矾璇曢獙鐨勫垹闄ら娈�")
@PostMapping("/deleteInsContext")
@ValueAuth
@@ -203,7 +212,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);
@@ -220,28 +229,28 @@
@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));
+ 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