From 13d0ba433a03f0ad6cc7d7166b4a656afd761796 Mon Sep 17 00:00:00 2001 From: swj <1211312234@qq.com> Date: Thu, 22 Sep 2022 08:53:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=BE=E5=BC=80=E6=96=B0=E5=A2=9E=E6=88=96?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=AA=E5=99=A8=E6=A3=80=E5=AE=9A=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=8F=90=E4=BA=A4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EquipVerificationController.java | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationController.java b/lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationController.java index 1ac9c06..16a7c58 100644 --- a/lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationController.java +++ b/lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationController.java @@ -101,11 +101,10 @@ public class EquipVerificationController extends BladeController { * @param e (updateVerification) * @return */ - @PostMapping("verification") + @PostMapping("/verification") @ApiOperation(value="保存检定记录") public R verification(@RequestBody EquipVerification e){ equipVerificationLogService.insertLog(e); - return R.success("检定成功"); } @@ -114,7 +113,7 @@ public class EquipVerificationController extends BladeController { * @param e (EquipVerificationLog) * @return */ - @PutMapping("updateVerification") + @PutMapping("/updateVerification") @ApiOperation(value = "修改检定记录" ) public R updateVerification(@RequestBody EquipVerificationLog e){ boolean b = equipVerificationLogService.updateById(e); @@ -128,16 +127,11 @@ public class EquipVerificationController extends BladeController { /** * 新增或修改 仪器检定管理 */ -// @PostMapping("/submit") -// @ApiOperationSupport(order = 6) -// @ApiOperation(value = "新增或修改", notes = "传入equipVerification") -// public R submit(@Valid @RequestBody EquipVerification equipVerification) { -// limsClient.updateStatus(equipVerification.getInstrumentId()); -// return R.status(equipVerificationService.saveOrUpdate(equipVerification)); -// } - - - - - + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入equipVerification") + public R submit(@Valid @RequestBody EquipVerification equipVerification) { + limsClient.updateStatus(equipVerification.getInstrumentId()); + return R.status(equipVerificationService.saveOrUpdate(equipVerification)); + } }