From 30719c188841c8c1bdec37c4153b9fdcfc74012c Mon Sep 17 00:00:00 2001
From: yitonglei <ytl653@163.com>
Date: Thu, 22 Sep 2022 16:23:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=A3=80=E5=AE=9A=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=B9=B6=E6=9B=B4=E6=96=B0=E8=AE=BE=E5=A4=87=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../springblade/file/entity/EquipVerificationLog.java  |  5 +++++
 .../org/springblade/file/vo/EquipVerificationVO.java   |  9 +++++++++
 .../file/controller/EquipVerificationController.java   |  2 +-
 .../file/service/IEquipVerificationLogService.java     |  2 +-
 .../service/impl/EquipVerificationLogServiceImpl.java  | 10 +++++-----
 5 files changed, 21 insertions(+), 7 deletions(-)

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<EquipVerificationLog> {
 
-    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<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();