完成特种设备检定预警

platform-dao/src/main/java/com/platform/dao/dto/sb/SbInfoDTO.java

@@ -486,6 +486,8 @@ public class SbInfoDTO extends BaseDTO implements Serializable {
     private BigDecimal totalHours;//总行驶小时
     @FieldCompared(name="自定义类型",type = 1,value = "SB_USE_TYPE")
     private Integer useType;//自定义类型
+
+    private List<Integer> useTypeList;//自定义类型查询
     private LocalDate lastRepaireTime;//最近维修时间
     private Integer repaireTimes;//维修次数
 

platform-dao/src/main/resources/mapper/sb/SbInfoMapper.xml

@@ -505,6 +505,12 @@ user.real_name as saveUserName,sb.repair_dept_id
                 #{item}
             </foreach>
         </if>
+        <if test="useTypeList != null">
+            AND sb.use_type in
+            <foreach item="item" index="index" collection="useTypeList" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="useType != null">
             and sb.use_type = #{useType}
         </if>

platform-rest/src/main/java/com/platform/rest/controller/sb/SbInfoController.java

@@ -428,9 +428,9 @@ public class SbInfoController {
             result = sbInfoService.importListByAdd( file);
         }else if(type == 2){
             result = sbInfoService.importListByUpdateALl(file);
-        }else if(type == 3){
+        }else if(type == 3){// 废弃
             result = sbInfoService.importListByAddWithStandard(file);
-        } else if(type == 4){
+        } else if(type == 4){// 废弃
             result = sbInfoService.updateImportUpdateForLongYan(file);
         }
         return new R<>(result);

platform-rest/src/main/java/com/platform/rest/task/SbTask.java

@@ -28,7 +28,7 @@ public class SbTask {
 
 
     /**
-     * 待检定定时生成
+     * 待检定定时生成，包括计量设备和特种设备
      */
     public void generateSbMeasureLog() {
         sbInfoService.generateSbMeasureLog();

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

@@ -762,16 +762,19 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
     }
 
     /**
-     * 定时任务，对需要检定的进行检定状态设置，
+     * 定时任务，对需要检定的进行检定状态设置
+     * 范围：包括计量设备、特种设备、需要检定的（自检和外检都包括）
      * 1：根据设备的检定预警周期
      * 2：筛选
      * a) 检定状态为正常的
      * b) 当前日期+预警天数>有效期的
+     *
      */
     @Override
     public void generateSbMeasureLog() {
         SbInfoDTO record = new SbInfoDTO();
-        record.setUseType(SbUseType.BGCL.getValue());
+        // record.setUseType(SbUseType.BGCL.getValue());
+        record.setUseTypeList(Arrays.asList(SbUseType.BGCL.getValue(), SbUseType.TZSB.getValue()));
         record.setMeasureStatus(YesNoEnum.NO.getValue());
         record.setIsMeasure(YesNoEnum.YES.getValue());
         List<SbInfoVO> list = mapper.selectPageInfoForWarn(record);
@@ -2154,6 +2157,9 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
                     if (vo.getCheckPeriod() != null) {
                         tempInfo.setIsMeasure(1);
                     }
+                    if (vo.getUseType() == 5) {// 特种设备全部需要检定
+                        tempInfo.setIsMeasure(1);
+                    }
                     if (tempInfo.getIsMeasure() == 1) {
                         if (tempInfo.getNextCheckDate() == null) {
                             if (tempInfo.getCheckDate() != null) {