优化

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

@@ -51,7 +51,7 @@
         position.name as positionName, position.id as positionId,count(1) as waitNum
         from t_sb_position position left join t_sb_info info on position.id=info.position_id left join t_check_job job
         on info.id = job.sb_id
-        where job.status = 1 and position .id in
+        where (job.status = 1 or job.status =2) and position .id in
         <foreach item="item" index="index" collection="list" open="(" close=")" separator=",">
             #{item}
         </foreach>

platform-rest/src/main/resources/application-dev.yml

@@ -84,6 +84,7 @@ ignore:
     - /sqarepartmanage/spare-part-info/**
     - /store/in-store-forms/**
     - /store/out-store-forms/**
+    - /check/jobs/**
 upload:
   root-dir: D://data//xian
 

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

@@ -209,6 +209,19 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
         checkJobDTO.setCheckUserId(userInfo.getUserId());
         checkJobDTO.setType(2);
         List<CheckJobVO> checkJobVOS = mapper.selectList(checkJobDTO);
+
+        //加上已过期的任务
+        checkJobDTO = new CheckJobDTO();
+        checkJobDTO.setSearchEndTime(LocalDateTime.parse(firstDay,df));
+        checkJobDTO.setCheckUserId(userInfo.getUserId());
+        checkJobDTO.setType(2);
+        List<Integer> statusList = new ArrayList<>();
+        statusList.add(1);
+        statusList.add(2);
+        checkJobDTO.setStatusList(statusList);
+        checkJobDTO.setReceiveOvertime(true);
+        List<CheckJobVO> checkJobVOS1 = mapper.selectList(checkJobDTO);
+        checkJobVOS.addAll(checkJobVOS1);
         return checkJobVOS;
     }