|
@@ -39,6 +39,8 @@ public class RepairInfoService {
|
|
|
IRepairCommentService repairCommentService;
|
|
|
@Autowired
|
|
|
IFaultService faultService;
|
|
|
+ @Autowired
|
|
|
+ IRepairInvoiceService repairInvoiceService;
|
|
|
|
|
|
|
|
|
public RepairDetailVo getDetailsByRepairId(String repairId) {
|
|
@@ -58,9 +60,13 @@ public class RepairInfoService {
|
|
|
RepairTestVo repairTestVo = repairTestService.getPassVoByRepairId(repairId);
|
|
|
RepairComment comment = repairCommentService.getByRepairId(repairId);
|
|
|
List<Fault> faultList = faultService.getByRepairId(repairId);
|
|
|
- List<Repair> repairList = repairService.getBySnCode(repair.getCameraSnCode());
|
|
|
String lastRepairId = repairService.getLastRepairId(repair.getCameraSnCode(),repair.getRepairId());
|
|
|
|
|
|
+ RepairInvoice repairInvoice = repairInvoiceService.getByRepairId(repairId);
|
|
|
+ if(repairInvoice !=null){
|
|
|
+ detailVo.setRepairInvoice(repairInvoice);
|
|
|
+ detailVo.setApplyInvoice(1);
|
|
|
+ }
|
|
|
|
|
|
detailVo.setCustomer(customer);
|
|
|
detailVo.setCustomerAddress(customerAddress);
|