feat(维修模块): clearTaskVo新增单据字段

dev-repair/src/main/java/com/tykj/dev/device/repair/service/impl/RepairDetailServiceImpl.java

@@ -7,6 +7,7 @@ import com.tykj.dev.device.library.service.DeviceLibraryService;
 import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
 import com.tykj.dev.device.library.subject.vo.Script;
 import com.tykj.dev.device.library.subject.vo.ScriptSaveVo;
+import com.tykj.dev.device.repair.repository.RepairBillDao;
 import com.tykj.dev.device.repair.repository.RepairDetailDao;
 import com.tykj.dev.device.repair.repository.RepairSendBillDao;
 import com.tykj.dev.device.repair.service.RepairDetailService;
@@ -62,6 +63,9 @@ public class RepairDetailServiceImpl implements RepairDetailService {
     @Autowired
     RepairSendBillDao repairSendBillDao;
 
+    @Autowired
+    private RepairBillDao repairBillDao;
+
     @Override
     public RepairDetail save(RepairDetail deviceRepairDetailEntity) {
         RepairDetail repairDetail = deviceRepairDetailDao.save(deviceRepairDetailEntity);
@@ -175,6 +179,15 @@ public class RepairDetailServiceImpl implements RepairDetailService {
                     clearTaskVo.setTaskId(tasks.get(0).getId());
                     billVos.add(billVo);
                     clearTaskVo.setBillVos(billVos);
+                    Optional<RepairBill> byId = repairBillDao.findById(v.getDeviceRepairBillId());
+                    byId.ifPresent(
+                            clearTaskVo::setRepairBill
+                    );
+                    byId.ifPresent(
+                            repairBill -> {
+                                clearTaskVo.setRepairSendBill(repairSendBillDao.findByDeviceRepairBillId(repairBill.getId()));
+                            }
+                    );
                     clearTaskVos.add(clearTaskVo);
                 }
         );
@@ -299,8 +312,11 @@ public class RepairDetailServiceImpl implements RepairDetailService {
         //过滤出装备在中办的
         List<RepairDetail> exceptionList = repairDetails.stream().filter(repairDetail -> repairDetail.getLocationUnit().contains("中办")).sorted(Comparator.comparing(RepairDetail::getCreateTime)).collect(Collectors.toList());
         repairDetails.removeAll(exceptionList);
-        //维修未入库
-        List<RepairDetail> repairIngList = repairDetails.stream().filter(repairDetail -> Objects.equals(repairDetail.getRepairStatus(), RepairStatusEnum.WAIT_REPAIR.id)).sorted(Comparator.comparing(RepairDetail::getCreateTime)).collect(Collectors.toList());
+        //维修未入库   等待维修分为接收区装备和市发起维修  修好退回待领取
+//        List<RepairDetail> repairIngList = repairDetails.stream().filter(repairDetail -> Objects.equals(repairDetail.getRepairStatus(), RepairStatusEnum.WAIT_REPAIR.id)).sorted(Comparator.comparing(RepairDetail::getCreateTime)).collect(Collectors.toList());
+        List<Integer> repairStatus1 = new ArrayList<>(Arrays.asList(RepairStatusEnum.WAIT_REPAIR.id,RepairStatusEnum.WAIT_RECEIVE.id));
+        List<RepairDetail> repairIngList = repairDetails.stream().filter(repairDetail -> repairStatus1.contains(repairDetail.getRepairStatus()))
+                .sorted(Comparator.comparing(RepairDetail::getCreateTime)).collect(Collectors.toList());
         //维修已入库
         List<Integer> repairStatus = new ArrayList<>(Arrays.asList(RepairStatusEnum.REPAIRING.id, RepairStatusEnum.WAIT_SEND.id));
         List<RepairDetail> endRepairList = repairDetails.stream().filter(repairDetail -> repairStatus.contains(repairDetail.getRepairStatus())).sorted(Comparator.comparing(RepairDetail::getCreateTime)).collect(Collectors.toList());

dev-repair/src/main/java/com/tykj/dev/device/repair/subject/vo/ClearTaskVo.java

 package com.tykj.dev.device.repair.subject.vo;
 
+import com.tykj.dev.device.repair.subject.domin.RepairBill;
+import com.tykj.dev.device.repair.subject.domin.RepairSendBill;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -22,6 +24,12 @@ public class ClearTaskVo {
     @ApiModelProperty(value = "维修单详情id", example = "1")
     private Integer repairDetailId;
 
+    @ApiModelProperty(value = "送修单", example = "1")
+    private RepairSendBill repairSendBill;
+
+    @ApiModelProperty(value = "维修单", example = "1")
+    private RepairBill repairBill;
+
     @ApiModelProperty(value = "账单id类", example = "1")
     private List<BillVo> billVos;
 }