[维修]添加taskId字段

dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairBillSelectController.java

@@ -16,10 +16,7 @@ import com.tykj.dev.device.repair.subject.domin.RepairBackBill;
 import com.tykj.dev.device.repair.subject.domin.RepairBill;
 import com.tykj.dev.device.repair.subject.domin.RepairDetail;
 import com.tykj.dev.device.repair.subject.domin.RepairSendBill;
-import com.tykj.dev.device.repair.subject.vo.RepairBillSelectVo;
-import com.tykj.dev.device.repair.subject.vo.RepairNum;
-import com.tykj.dev.device.repair.subject.vo.RepairTaskSelectVo;
-import com.tykj.dev.device.repair.subject.vo.TaskRemark;
+import com.tykj.dev.device.repair.subject.vo.*;
 import com.tykj.dev.device.task.service.TaskService;
 import com.tykj.dev.device.task.subject.bto.TaskBto;
 import com.tykj.dev.device.task.subject.vo.TaskSelectVo;
@@ -97,14 +94,19 @@ public class RepairBillSelectController {
         Page<RepairDetail> repairDetails = (Page)repairController.getRepairList(repairTaskSelectVo).getBody();
         //type=2的记录
         repairTaskSelectVo.setType(2);
-        Page<RepairDetail> repairDetails2 = (Page)repairController.getRepairList(repairTaskSelectVo).getBody();
+        Page<WaitingRepairEquipmentVo> waitingRepaireEquipmentVos = (Page) repairController.getRepairList(repairTaskSelectVo).getBody();
+//        Page<RepairDetail> repairDetails2 = (Page)repairController.getRepairList(repairTaskSelectVo).getBody();
         //type=3的记录
         repairTaskSelectVo.setType(3);
-        Page<RepairDetail> repairDetails3 = (Page)repairController.getRepairList(repairTaskSelectVo).getBody();
+//        Page<RepairDetail> repairDetails3 = (Page)repairController.getRepairList(repairTaskSelectVo).getBody();
+        Page<WaitingRepairEquipmentVo> waitingRepaireEquipmentVos2 = (Page) repairController.getRepairList(repairTaskSelectVo).getBody();
+
         //set数量
         repairNum.setNum1(Long.valueOf(repairDetails.getTotalElements()).intValue());
-        repairNum.setNum2(Long.valueOf(repairDetails2.getTotalElements()).intValue());
-        repairNum.setNum3(Long.valueOf(repairDetails3.getTotalElements()).intValue());
+//        repairNum.setNum2(Long.valueOf(repairDetails2.getTotalElements()).intValue());
+//        repairNum.setNum3(Long.valueOf(repairDetails3.getTotalElements()).intValue());
+        repairNum.setNum2(Long.valueOf(waitingRepaireEquipmentVos.getTotalElements()).intValue());
+        repairNum.setNum3(Long.valueOf(waitingRepaireEquipmentVos2.getTotalElements()).intValue());
         return ResponseEntity.ok(repairNum);
     }
 

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

@@ -18,4 +18,6 @@ public interface RepairBackBillService extends RepairPublicService<RepairBackBil
     void sendHash(List<RepairBackBill> repairBackBills);
 
     Page<RepairBackBill> getPage(RepairBillSelectVo deviceRepairBillSelectVo, Pageable pageable);
+
+
 }

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

@@ -26,4 +26,5 @@ public interface RepairSendBillService {
     RepairSendBill update(RepairSendBill deviceRepairSendBillEntity);
 
     void delete(Integer id);
+
 }

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

@@ -96,6 +96,7 @@ public class RepairSendBillServiceImpl implements RepairSendBillService {
         deviceRepairSendBillDao.deleteById(id);
     }
 
+
     private Specification<RepairSendBill> getSelectSpecification(RepairBillSelectVo deviceRepairBillSelectVo) {
         PredicateBuilder<RepairSendBill> predicateBuilder = Specifications.and();
         if (deviceRepairBillSelectVo != null) {

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

@@ -78,4 +78,10 @@ public class RepairReceiveVo {
 
     @ApiModelProperty(value = "单据保存vo")
     private List<ScriptSaveVo> scriptSaveVos;
+
+    @ApiModelProperty(value = "应出库装备数量")
+    private Integer sendingCount;
+
+    @ApiModelProperty(value = "已出库装备数量")
+    private Integer sendedCount;
 }