Browse Source

详情添加返回发票信息

lyhzzz 2 years ago
parent
commit
882b7b0b8d

+ 7 - 1
src/main/java/com/fdkankan/sale/service/impl/RepairInfoService.java

@@ -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);

+ 4 - 0
src/main/java/com/fdkankan/sale/vo/response/RepairDetailVo.java

@@ -27,8 +27,12 @@ public class RepairDetailVo {
 
     private RepairComment repairComment;
 
+    private RepairInvoice repairInvoice;
+
     private  List<Fault> faultList;
 
     private String lastRepairId;
 
+    private Integer applyInvoice = 0;
+
 }