From d828d03c0b23d163c042e88cb21b8b15b1e6dedd Mon Sep 17 00:00:00 2001 From: Crunchy <3114200645@qq.com> Date: 星期二, 06 八月 2024 10:33:36 +0800 Subject: [PATCH] 数采bug修复 --- inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 11 ++++++----- 1 files changed, 6 insertions(+), 5 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 dfdb382..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 @@ -18,6 +18,7 @@ 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; @@ -80,8 +81,8 @@ @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("妫�楠屼换鍔�") @@ -115,12 +116,12 @@ @ValueClassify("妫�楠屼换鍔�") @ApiOperation(value = "妫�楠屼换鍔℃彁浜�") @PostMapping("/submitPlan") - public Result<?> submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode, String sampleCode) { - int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser, entrustCode, sampleCode); + 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("妫�楠屼换鍔�") + @ValueClassify("璁惧") @ApiOperation(value = "鏄惁鍏佽淇敼閲囬泦鍊�") @DeleteMapping("/isItAllowedToModifyTheCollectedValues") public Result<?> isItAllowedToModifyTheCollectedValues() { -- Gitblit v1.9.3