diff --git a/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/EquipVerificationLog.java b/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/EquipVerificationLog.java index c4c5144..c3bce29 100644 --- a/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/EquipVerificationLog.java +++ b/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/EquipVerificationLog.java @@ -92,4 +92,9 @@ public class EquipVerificationLog extends BaseEntity { @ApiModelProperty(value = "检定轮数") private Integer cicleNum; + + //设备情况 + private String equipStatus; + //检定情况 + private String verification_info; } diff --git a/lab-service-api/lab-file-api/src/main/java/org/springblade/file/vo/EquipVerificationVO.java b/lab-service-api/lab-file-api/src/main/java/org/springblade/file/vo/EquipVerificationVO.java index b088e76..21e8709 100644 --- a/lab-service-api/lab-file-api/src/main/java/org/springblade/file/vo/EquipVerificationVO.java +++ b/lab-service-api/lab-file-api/src/main/java/org/springblade/file/vo/EquipVerificationVO.java @@ -53,4 +53,13 @@ public class EquipVerificationVO extends EquipVerification { @ApiModelProperty(value = "更新人名称") private String updateUserName; + + //设备情况 + private String equipStatus; + //检定情况 + private String verificationInfo; + //检定人 + private long verificationUser; + //检定时间 + private LocalDateTime verificationTime; } 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 16a7c58..10763fc 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 @@ -103,7 +103,7 @@ public class EquipVerificationController extends BladeController { */ @PostMapping("/verification") @ApiOperation(value="保存检定记录") - public R verification(@RequestBody EquipVerification e){ + public R verification(@RequestBody EquipVerificationVO e){ equipVerificationLogService.insertLog(e); return R.success("检定成功"); } diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/service/IEquipVerificationLogService.java b/lab-service/lab-file/src/main/java/org/springblade/file/service/IEquipVerificationLogService.java index 217f19a..c3c677f 100644 --- a/lab-service/lab-file/src/main/java/org/springblade/file/service/IEquipVerificationLogService.java +++ b/lab-service/lab-file/src/main/java/org/springblade/file/service/IEquipVerificationLogService.java @@ -30,6 +30,6 @@ import org.springblade.file.vo.EquipVerificationVO; */ public interface IEquipVerificationLogService extends BaseService { - void insertLog(EquipVerification e); + void insertLog(EquipVerificationVO e); } diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/EquipVerificationLogServiceImpl.java b/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/EquipVerificationLogServiceImpl.java index d7767aa..fa656dc 100644 --- a/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/EquipVerificationLogServiceImpl.java +++ b/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/EquipVerificationLogServiceImpl.java @@ -58,7 +58,7 @@ public class EquipVerificationLogServiceImpl extends BaseServiceImpl