保存检定记录并更新设备信息

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

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

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("检定成功");
     }

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<EquipVerificationLog> {
 
-    void insertLog(EquipVerification e);
+    void insertLog(EquipVerificationVO e);
 
 }

lab-service/lab-file/src/main/java/org/springblade/file/service/impl/EquipVerificationLogServiceImpl.java

@@ -58,7 +58,7 @@ public class EquipVerificationLogServiceImpl extends BaseServiceImpl<EquipVerifi
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertLog(EquipVerification e){
+    public void insertLog(EquipVerificationVO e){
         //当前日期
         LocalDateTime localDateTime = LocalDateTime.now();
 
@@ -68,10 +68,10 @@ public class EquipVerificationLogServiceImpl extends BaseServiceImpl<EquipVerifi
         log.setEquipModel(e.getEquipModel());
         log.setInstrumentId(e.getInstrumentId());
         log.setTenantId(e.getTenantId());
-        log.setVerification_time(localDateTime);
-        BladeUser bladeUser = AuthUtil.getUser();
-        log.setVerificationUser(bladeUser.getUserId());
-
+        log.setVerification_time(e.getVerificationTime());
+        log.setVerificationUser(e.getVerificationUser());
+        log.setEquipStatus(e.getEquipStatus());
+        log.setVerification_info(e.getVerificationInfo());
         //当前日期
         LocalDate localDate = LocalDate.now();
         LocalDateTime enableTime = e.getEnableTime();