导入优化

platform-dao/src/main/java/com/platform/dao/entity/sb/SbInfo.java

@@ -78,7 +78,7 @@ public class SbInfo implements Serializable {
      */
     private String zjm;
     /**
-     * 交保单号/位置y坐标
+     * 交保单号/位置y坐标/操作压力出口
      */
     private String jbdh;
     /**
@@ -86,7 +86,7 @@ public class SbInfo implements Serializable {
      */
     private Integer status;
     /**
-     * 发动机号/技术标识号
+     * 发动机号/技术标识号/操作温度出口
      */
     private String fdjh;
     /**

platform-dao/src/main/java/com/platform/dao/vo/export/sb/ExportSbInfoVO.java

@@ -1,14 +1,11 @@
 package com.platform.dao.vo.export.sb;
 
-import com.platform.dao.util.compare.annotation.FieldCompared;
 import com.platform.office.annotation.Excel;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import javax.persistence.Transient;
 import java.io.Serializable;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 
 /**
  * @Description 设备基础信息导出VO
@@ -165,4 +162,21 @@ public class ExportSbInfoVO implements Serializable {
     @Excel(name = "是否需要检定(必填;0:否;1:是)")
     private Integer isMeasure;
 
+    /**
+     * 操作压力
+     */
+    @Excel(name = "操作压力")
+    private String jbdh;
+
+    /**
+     * 操作温度
+     */
+    @Excel(name = "操作温度")
+    private String fdjh;
+
+    /**
+     * 介质
+     */
+    @Excel(name = "介质")
+    private String characterType;
 }

platform-service/src/main/java/com/platform/service/sb/impl/SbInfoServiceImpl.java

@@ -2169,7 +2169,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
                     if (vo.getUseType() == 5) {// 特种设备全部需要检定
                         tempInfo.setIsMeasure(1);
                     }
-                    if (tempInfo.getIsMeasure() == 1) {
+                    if (tempInfo.getIsMeasure() != null && tempInfo.getIsMeasure() == 1) {
                         if (tempInfo.getNextCheckDate() == null) {
                             if (tempInfo.getCheckDate() != null) {
                                 if (tempInfo.getCheckPeriod() != null) {