From 6b1886314fd18f34740c96bb4fd86046600dd2c0 Mon Sep 17 00:00:00 2001 From: 晏有为 <13214124+yan-youwei@user.noreply.gitee.com> Date: 星期四, 16 五月 2024 17:08:36 +0800 Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-after --- inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 10 ++++++---- 1 files changed, 6 insertions(+), 4 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 dc3972f..44a38a5 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 @@ -1,5 +1,6 @@ package com.yuanchu.mom.controller; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yuanchu.mom.annotation.ValueAuth; import com.yuanchu.mom.annotation.ValueClassify; @@ -64,16 +65,17 @@ @ValueClassify("妫�楠屼换鍔�") @ApiOperation(value = "妫�楠屼换鍔℃彁浜�") @PostMapping("/submitPlan") - public Result<?> submitPlan(Integer orderId, String laboratory) { - int num = insOrderPlanService.submitPlan(orderId, laboratory); + public Result<?> submitPlan(Integer orderId, String laboratory, Integer verifyUser) { + int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser); return num==1?Result.success():Result.fail("鎻愪氦澶辫触锛岄儴鍒嗛」鐩繕鏈繘琛屾楠�"); } @ApiOperation(value = "淇濆瓨妫�楠屽唴瀹�") @PostMapping("/saveInsContext") @ValueAuth - public Result<?> saveInsContext(@RequestBody Map<String, Object> param){ - insOrderPlanService.saveInsContext(param); + public Result<?> saveInsContext(String param){ + Map<String, Object> param2 = JSON.parseObject(param, Map.class); + insOrderPlanService.saveInsContext(param2); return Result.success(); } } -- Gitblit v1.9.3