fix(大屏模块): 更新bug

dev-statistical/src/main/java/com/tykj/dev/statistical/service/impl/BigScreenServiceImpl.java

@@ -22,6 +22,7 @@ import com.tykj.dev.device.user.subject.entity.Area;
 import com.tykj.dev.device.user.subject.entity.Units;
 import com.tykj.dev.device.user.subject.entity.User;
 import com.tykj.dev.misc.base.BusinessEnum;
+import com.tykj.dev.misc.base.StatusEnum;
 import com.tykj.dev.misc.utils.StringSplitUtil;
 import com.tykj.dev.statistical.cache.StatisticalCache;
 import com.tykj.dev.statistical.service.BigScreenService;
@@ -148,7 +149,10 @@ public class BigScreenServiceImpl implements BigScreenService {
         centerNum.setDeviceAddCount((int) deviceLibraryDao.findAll().stream().filter(deviceLibrary -> deviceLibrary.getCreateTime()!=null&&isPresentYear(deviceLibrary.getCreateTime())).count());
         //故障率
         Set<Integer> repairDeviceIds = new HashSet<>();
-        List<Task> tasks = taskDao.findAllByBusinessType(BusinessEnum.REPAIR.id).stream().filter(task -> task.getParentTaskId()==null).collect(Collectors.toList());
+        List<Task> businessList = taskDao.findAllByBusinessType(BusinessEnum.REPAIR.id);
+        List<Task> tasks = businessList.stream()
+                .filter(task -> task.getParentTaskId()==null && !task.getBillStatus().equals(StatusEnum.END.id) && !task.getBillStatus().equals(StatusEnum.REVOKEALLOTTASK.id))
+                .collect(Collectors.toList());
         List<RepairSendBill> repairSendBills = tasks.stream()
                 .map(task -> repairBillService.getOne(task.getBillId()))
                 .map(repairBill -> repairSendBillDao.findByDeviceRepairBillId(repairBill.getId()))
@@ -170,7 +174,8 @@ public class BigScreenServiceImpl implements BigScreenService {
     @Override
     public RepairNum getRepairNum() {
         RepairNum repairNum = new RepairNum();
-        List<Task> tasks = taskDao.findAllByBusinessType(BusinessEnum.REPAIR.id).stream().filter(task -> task.getParentTaskId()==null).collect(Collectors.toList());
+        List<Task> tasks = taskDao.findAllByBusinessType(BusinessEnum.REPAIR.id).stream()
+                .filter(task -> task.getParentTaskId()==null && !task.getBillStatus().equals(StatusEnum.END.id) && !task.getBillStatus().equals(StatusEnum.REVOKEALLOTTASK.id)).collect(Collectors.toList());
         List<List<RepairDetail>> repairDetails = tasks.stream()
                 .map(task -> repairBillService.getOne(task.getBillId()))
                 .map(repairBill -> repairDetailDao.findByDeviceRepairBillId(repairBill.getId()))
@@ -224,7 +229,8 @@ public class BigScreenServiceImpl implements BigScreenService {
     @Override
     public List<RepairDevice> getRepairDevices() {
         List<RepairDevice> repairDevices = new ArrayList<>();
-        List<Task> tasks = taskDao.findAllByBusinessType(BusinessEnum.REPAIR.id).stream().filter(task -> task.getParentTaskId()==null).collect(Collectors.toList());
+        List<Task> tasks = taskDao.findAllByBusinessType(BusinessEnum.REPAIR.id).stream()
+                .filter(task -> task.getParentTaskId()==null && !task.getBillStatus().equals(StatusEnum.END.id) && !task.getBillStatus().equals(StatusEnum.REVOKEALLOTTASK.id)).collect(Collectors.toList());
         List<List<RepairDetail>> repairDetails = tasks.stream()
                 .map(task -> repairBillService.getOne(task.getBillId()))
                 .map(repairBill -> repairDetailDao.findByDeviceRepairBillId(repairBill.getId()))