解决保存检定记录时的一些问题

lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/EquipVerification.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.file.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springblade.core.mp.base.BaseEntity;
@@ -51,11 +52,33 @@ public class EquipVerification extends BaseEntity {
      * 设备id
      */
     private String instrumentId;
+    /**
+     * 设备id
+     */
+    private String code;
     /**
      * 设备名称
      */
     @ApiModelProperty(value = "设备名称")
     private String equipName;
+    /**
+     * 设备情况
+     */
+    @TableField(exist = false)
+    private String equipStatus;
+    /**
+     * 检定情况
+     */
+    @TableField(exist = false)
+    private String verificationInfo;
+    /**
+     * 检定时间（仅给记录表用）
+     */
+    @ApiModelProperty(value = "检定时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(exist = false)
+    private LocalDateTime verificationTime;
     /**
      * 规格型号
      */
@@ -95,4 +118,11 @@ public class EquipVerification extends BaseEntity {
 //    private Integer status;
     @ApiModelProperty(value = "检定提前提示的天数")
     private Integer warnBefore;
+
+    /**
+     * 检定人
+     */
+    @ApiModelProperty(value = "检定人")
+    @TableField(exist = false)
+    private long verificationUser;
 }

lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/EquipVerificationLog.java

@@ -78,7 +78,7 @@ public class EquipVerificationLog extends BaseEntity {
     @ApiModelProperty(value = "检定时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime verification_time;
+    private LocalDateTime verificationTime;
     /**
      * 检定周期（天）
      */
@@ -93,8 +93,20 @@ public class EquipVerificationLog extends BaseEntity {
     @ApiModelProperty(value = "检定轮数")
     private Integer cicleNum;
 
-    //设备情况
+    /**
+     * 设备id
+     */
+    private String code;
+    /**
+     * 设备情况
+     */
     private String equipStatus;
-    //检定情况
-    private String verification_info;
+    /**
+     * 检定情况
+     */
+    private String verificationInfo;
+    /**
+     * 检定人姓名
+     */
+    private String verificationUserName;
 }

lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationController.java

@@ -105,7 +105,7 @@ public class EquipVerificationController extends BladeController {
      */
     @PostMapping("/verification")
     @ApiOperation(value="保存检定记录")
-    public R verification(@RequestBody EquipVerificationVO e){
+    public R verification(@RequestBody EquipVerification e){
         equipVerificationLogService.insertLog(e);
         return R.success("检定成功");
     }

lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationLogController.java

@@ -50,7 +50,7 @@ public class EquipVerificationLogController extends BladeController {
                     .like(EquipVerificationLog::getEquipModel,equipVerificationLog.getEquipName()).or()
                     .like(EquipVerificationLog::getManufacturerOrBrand,equipVerificationLog.getEquipName());
         }
-        wrapper.orderByDesc(EquipVerificationLog::getCreateTime);
+        wrapper.orderByDesc(EquipVerificationLog::getVerificationTime);
         return R.data(equipVerificationLogService.page(Condition.getPage(query), wrapper));
     }
 

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

@@ -17,18 +17,11 @@
 package org.springblade.file.service.impl;
 
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.core.secure.BladeUser;
-import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.file.entity.EquipVerification;
 import org.springblade.file.entity.EquipVerificationLog;
-import org.springblade.file.enums.EquipVerificationEnum;
 import org.springblade.file.mapper.EquipVerificationLogMapper;
 import org.springblade.file.mapper.EquipVerificationMapper;
 import org.springblade.file.service.IEquipVerificationLogService;
-import org.springblade.file.service.IEquipVerificationService;
-import org.springblade.file.vo.EquipVerificationVO;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,8 +31,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
-import java.util.List;
-import java.util.Optional;
 
 /**
  * 仪器检定管理 服务实现类
@@ -79,6 +70,7 @@ public class EquipVerificationLogServiceImpl extends BaseServiceImpl<EquipVerifi
         log.setVerificationUser(e.getVerificationUser());
         User userR = userClient.userInfoById(e.getVerificationUser()).getData();
         log.setVerificationUserName(userR.getName());
+        log.setManufacturerOrBrand(e.getManufacturerOrBrand());
 
         //当前日期
         LocalDate localDate = LocalDate.now();
@@ -100,7 +92,7 @@ public class EquipVerificationLogServiceImpl extends BaseServiceImpl<EquipVerifi
             }else{
                 verificationDay = enableDate.plusDays(((between / e.getCycle())) * e.getCycle());
             }
-
+            e.setStatus(1);
             e.setLastVerificationTime(verificationDay.atTime(0, 0,0));
             equipVerificationMapper.updateById(e);
         }