From f07557c57e8c67a05b913011cc8df38d4523ee0e Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 31 七月 2024 09:49:37 +0800
Subject: [PATCH] 去除检验任务提交样品编号字段
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 64 +++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 13 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 a8a3b82..c325808 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,20 +5,20 @@
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.pojo.InsOrderFile;
import com.yuanchu.mom.service.InsOrderFileService;
import com.yuanchu.mom.service.InsOrderPlanService;
+import com.yuanchu.mom.service.InsProductService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;
@@ -35,6 +35,8 @@
private InsOrderFileService insOrderFileService;
+ private InsProductService insProductService;
+
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "鑾峰彇妫�楠屼换鍔″垪琛�")
@PostMapping("/selectInsOrderPlanList")
@@ -45,7 +47,7 @@
return Result.success(insOrderPlanService.selectInsOrderPlanList(page, insOrderPlanDTO));
}
- @ValueClassify("妫�楠屼换鍔�")
+ @ValueAuth
@ApiOperation(value = "妫�楠屽崟璇︽儏-浠诲姟鍒囨崲")
@PostMapping("/inspectionOrderDetailsTaskSwitching")
public Result inspectionOrderDetailsTaskSwitching(@RequestBody Map<String, Object> data) throws Exception {
@@ -69,18 +71,32 @@
return Result.success(insOrderPlanService.doInsOrder(id, laboratory));
}
+ @ApiOperation(value = "鍒囨崲鍏夌氦/鍏夌氦甯﹁褰曟ā鐗堟煡璇㈡楠屽唴瀹�")
+ @PostMapping("/getReportModel")
+ @ValueAuth
+ public Result<?> getReportModel(Integer sampleId) {
+ return Result.success(insOrderPlanService.getReportModel(sampleId));
+ }
+
@ValueAuth
@PostMapping("/getInsProduct")
@ApiOperation("鑾峰彇妫�楠岄」鐩拰妯℃澘鍐呭")
- public Result<?> getInsProduct(Integer id, Integer type, String laboratory) {
- return Result.success(insOrderPlanService.getInsProduct(id, type, laboratory));
+ public Result<?> getInsProduct(Integer id, Integer type, String laboratory, HttpServletRequest request) {
+ return Result.success(insOrderPlanService.getInsProduct(id, type, laboratory, request));
}
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "浠诲姟浜ゆ帴")
@PostMapping("/upPlanUser")
- public Result<?> upPlanUser(Integer userId, Integer orderId) {
- return Result.success(insOrderPlanService.upPlanUser(userId, orderId));
+ public Result<?> upPlanUser(Integer userId, Integer orderId,String sonLaboratory) {
+ return Result.success(insOrderPlanService.upPlanUser(userId, orderId, sonLaboratory));
+ }
+
+ @ValueAuth
+ @ApiOperation(value = "鍒ゆ柇浜ゆ帴鐨勮瘯楠屽")
+ @PostMapping("/upPlanUser2")
+ public Result<?> upPlanUser2(Integer orderId) {
+ return Result.success(insOrderPlanService.upPlanUser2(orderId));
}
@ValueClassify("妫�楠屼换鍔�")
@@ -90,7 +106,7 @@
return Result.success(insOrderPlanService.verifyPlan(orderId, laboratory, type, tell));
}
- @ValueClassify("妫�楠屼换鍔�")
+ @ValueAuth
@ApiOperation(value = "鏍￠獙妫�楠屼换鍔℃彁浜�")
@PostMapping("/checkSubmitPlan")
public Result<?> checkSubmitPlan(Integer orderId, String laboratory) {
@@ -100,9 +116,16 @@
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "妫�楠屼换鍔℃彁浜�")
@PostMapping("/submitPlan")
- public Result<?> submitPlan(Integer orderId, String laboratory, Integer verifyUser) {
- int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser);
+ public Result<?> submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode) {
+ int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser, entrustCode);
return num == 1 ? Result.success() : Result.fail("鎻愪氦澶辫触锛岄儴鍒嗛」鐩繕鏈繘琛屾楠�");
+ }
+
+ @ValueClassify("璁惧")
+ @ApiOperation(value = "鏄惁鍏佽淇敼閲囬泦鍊�")
+ @DeleteMapping("/isItAllowedToModifyTheCollectedValues")
+ public Result<?> isItAllowedToModifyTheCollectedValues() {
+ return Result.success();
}
@ApiOperation(value = "淇濆瓨妫�楠屽唴瀹�")
@@ -114,7 +137,7 @@
return Result.success();
}
- @ValueClassify("妫�楠屼换鍔�")
+ @ValueAuth
@ApiOperation(value = "鏌ョ湅妫�楠屽崟涓嬬殑闄勪欢鍒楄〃")
@PostMapping("/getFileList")
public Result<?> getFileList(@RequestBody Map<String, Object> data) throws Exception {
@@ -138,6 +161,7 @@
return Result.success(insOrderFileService.removeById(id));
}
+ @ValueAuth
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "涓嬭浇闄勪欢")
@PostMapping("/downFile")
@@ -148,4 +172,18 @@
map.put("fileUrl", insOrderFile.getFileUrl());
return Result.success(map);
}
+
+ @ApiOperation(value = "濉啓娓╁害涓庢箍搴�")
+ @PostMapping("/write")
+ @ValueAuth
+ public Result<?> write(@RequestBody InsProductDto insProductDto) {
+ return Result.success(insProductService.write(insProductDto));
+ }
+
+ @ValueAuth
+ @ApiOperation(value = "娓╁害寰幆鏌ョ湅鍒楄〃鏁版嵁(鍖呮嫭閫氳繃鏍峰搧id,寰幆娆℃暟,娓╁害,寰幆娆℃暟杩涜绛涢��)")
+ @PostMapping("/temCycle")
+ public Result<?> temCycle(Integer sampleId, String inspectionItem, String inspectionItemSubclass) {
+ return Result.success(insOrderPlanService.temCycle(sampleId, inspectionItem, inspectionItemSubclass));
+ }
}
--
Gitblit v1.9.3