优化

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

@@ -42,6 +42,11 @@ public class ExportSbInfoVO implements Serializable {
      */
     @Excel(name = "设备名称(必填)")
     private String name;
+    /**
+     * 是否强检1：强检，2：非强检
+     */
+    @Excel(name = "是否强检1:强检，2：非强检")
+    private Integer checkType;
     /**
      * 设备名称
      */

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

@@ -2710,6 +2710,13 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
                     if (vo.getCheckPeriod() != null) {
                         tempInfo.setIsMeasure(1);
                     }
+                    if (vo.getCheckType()!=null){
+                        if (vo.getCheckType() instanceof Integer&&(vo.getCheckType()==1||vo.getCheckType()==2)) {
+                            tempInfo.setCheckType(vo.getCheckType());
+                        }else {
+                            throw new BusinessException("第" + i + "行,检定是否强检填写有误，请检查！");
+                        }
+                    }
                     if (tempInfo.getIsMeasure() != null && tempInfo.getIsMeasure() == 1) {
                         if (tempInfo.getNextCheckDate() == null) {
                             if (tempInfo.getCheckDate() != null) {