hai 1 ano
pai
achega
9fc736c011

+ 1 - 0
platform-dao/src/main/java/com/platform/dao/dto/check/CheckJobDTO.java

@@ -24,6 +24,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class CheckJobDTO extends BaseDTO implements Serializable {
+    private Integer sbNotStatus;
     private Integer record;//1:代表保养记录
     private List<Integer> standardLevelList;
     private List<Integer> periodTypeList;

+ 3 - 0
platform-dao/src/main/resources/mapper/check/CheckJobMapper.xml

@@ -211,6 +211,9 @@
                 #{item}
             </foreach>
         </if>
+        <if test="sbNotStatus!=null">
+            and sbInfo.status !=#{sbNotStatus}
+        </if>
 
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.check.CheckJobDTO"

+ 2 - 1
platform-service/src/main/java/com/platform/service/check/impl/CheckJobServiceImpl.java

@@ -235,8 +235,9 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
     @Override
     public void deleteScrapSbCheckJobs() {
         CheckJobDTO dto = new CheckJobDTO();
-        dto.setSbStatus(SbInfoStatusEnum.SCRAPED.getValue());
+        dto.setSbNotStatus(SbInfoStatusEnum.IN_USE.getValue());
         List<CheckJobVO> list = mapper.selectList(dto);
+
         if (list.size()>0){
             List<String> ids = list.stream().map(CheckJobVO::getId).collect(Collectors.toList());
             Weekend<CheckJob> weekend = new Weekend<>(CheckJob.class);