|
|
|
|
@ -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)); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|