1

src/main/java/com/fdkankan/sale/service/impl/RepairInfoService.java

@@ -369,7 +369,7 @@ public class RepairInfoService {
             totalAmount = BigDecimal.ZERO;
         }
         vo.setPriceListExcelVos(excelVos);
-        vo.setTotalCount(totalAmount);
+        vo.setTotalCount(totalAmount.compareTo(BigDecimal.ZERO) <=0 ?BigDecimal.ZERO:totalAmount);
         vo.setPriceListDate(priceData);
         String priceData2 = "";
         List<RepairLog> repairLogList = repairLogService.getByRepairIdAndStatus(repairId, 50);

src/main/java/com/fdkankan/sale/service/impl/RepairTesterService.java

@@ -1,4 +1,5 @@
 package com.fdkankan.sale.service.impl;
+import java.math.BigDecimal;
 import java.net.URL;
 import java.net.URLEncoder;
 import java.util.Date;
@@ -42,6 +43,8 @@ public class RepairTesterService {
     IRepairRegisterService repairRegisterService;
     @Autowired
     RepairSupplyService repairSupplyService;
+    @Autowired
+    IPriceListService priceListService;
 
 
     /**
@@ -83,7 +86,8 @@ public class RepairTesterService {
             repairTestService.save(entity);
 
             List<RepairRegisterPartVo> partVoList = repairSupplyService.partInfo(repair.getRepairId(), 1);
-            if(StatusUtil.getWarranty(repair.getWarrantyType()) ){
+            BigDecimal payAmount = priceListService.getAmountByRepairId(repair.getRepairId());
+            if(StatusUtil.getWarranty(repair.getWarrantyType()) || payAmount.compareTo(BigDecimal.ZERO) <=0){
                 if(partVoList.size() >0){
                     repairLogService.saveBySysUser(userId,testParam.getRepairId(), RepairStatusEnum.TO_BE_RECOVERED.status(),repair.getStatus(),"测试通过",entity.getTestId());
                 }else {