[任务 使用报告] bug修改

dev-task/src/main/java/com/tykj/dev/device/task/controller/TaskController.java

@@ -403,8 +403,11 @@ public class TaskController {
         }else if (billStatus==1209){
             map.remove("1209");
             map.remove("1220");
+            map.remove("1217");
         }else if (billStatus==1220){
             map.remove("1220");
+        }else if (billStatus == 1215 && !map.containsKey("1218")){
+            map.remove("1220");
         }
         return map;
 

dev-usereport/src/main/java/com/tykj/dev/device/usereport/service/impl/DeviceUseReportServiceImpl.java

@@ -22,6 +22,10 @@ import com.tykj.dev.device.repair.subject.domin.RepairDetail;
 import com.tykj.dev.device.repair.subject.domin.RepairSendBill;
 import com.tykj.dev.device.scrap.repository.ScrapBillDao;
 import com.tykj.dev.device.scrap.subject.domin.ScrapBill;
+import com.tykj.dev.device.sendback.entity.domain.DeviceRepelDetail;
+import com.tykj.dev.device.sendback.entity.vo.PagingVo;
+import com.tykj.dev.device.sendback.entity.vo.RepelManagementVo;
+import com.tykj.dev.device.sendback.service.RepelQueryService;
 import com.tykj.dev.device.storage.repository.StorageBillDao;
 import com.tykj.dev.device.storage.subject.domin.StorageBill;
 import com.tykj.dev.device.user.subject.service.UserPublicService;
@@ -75,7 +79,10 @@ public class DeviceUseReportServiceImpl implements DeviceUseReportService {
     DeviceLibraryDao deviceLibraryDao;
 
     @Autowired
-    private DeviceDestroyBillDao deviceDestroyBillDao;
+    private DeviceDestroyBillDao deviceDesroyBillDao;
+
+    @Autowired
+    private RepelQueryService repelQueryService;
 
     @Autowired
     private RepairSendBillDao repairSendBillDao;
@@ -231,15 +238,16 @@ public class DeviceUseReportServiceImpl implements DeviceUseReportService {
                 retiredNum = retiredNum + packingLibraryEntities2.size();
             }
         }
-        //清退状态筛选list
-        List<Integer> sendBackStatusList = new ArrayList<>();
-        sendBackStatusList.add(3);
-        sendBackStatusList.add(4);
-        sendBackStatusList.add(6);
+
         //筛选出清退账单
-//        List<SendBackBillDetail> sendBackBillDetailEntities = sendBackBillDetailDao.findAll().stream()
-//                .filter(sendBackBillDetailEntity -> sendBackStatusList.contains(sendBackBillDetailEntity.getSendBackStatus()) && sendBackBillDetailEntity.getSendUnit().equals(userUtils.getCurrentUserUnitName()) && sendBackBillDetailEntity.getSendTime().after(date) && sendBackBillDetailEntity.getSendTime().before(date2))
-//                .collect(toList());
+        RepelManagementVo repelManagementVo=new RepelManagementVo();
+        repelManagementVo.setUnitName(userUtils.getCurrentUserUnitName());
+        repelManagementVo.setPage(0);
+        repelManagementVo.setSize(2);
+        repelManagementVo.setTime(deviceUseReportCreateVo.startTime.getTime());
+        repelManagementVo.setEndTime(deviceUseReportCreateVo.endTime.getTime());
+        PagingVo pagingVo = repelQueryService.clearedDeviceList(repelManagementVo);
+        sendBackNum=pagingVo.getTotal();
 //        //累加清退数量
 //        if (sendBackBillDetailEntities.size() > 0) {
 //            for (SendBackBillDetail s : sendBackBillDetailEntities) {