diff --git a/admin/src/main/java/com/hcy/admin/service/order/impl/RepairOrderShippingServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/order/impl/RepairOrderShippingServiceImpl.java index 89278c2..eb0086e 100644 --- a/admin/src/main/java/com/hcy/admin/service/order/impl/RepairOrderShippingServiceImpl.java +++ b/admin/src/main/java/com/hcy/admin/service/order/impl/RepairOrderShippingServiceImpl.java @@ -503,20 +503,21 @@ public class RepairOrderShippingServiceImpl implements IRepairOrderShippingServi releaseRecordListExcel.setTheQuantityShipped(count1); //累计交货数量 - Integer accumulativeQuantity = cdqMap.get(key); + /*Integer accumulativeQuantity = cdqMap.get(key); if(accumulativeQuantity != null){ + undeliveredQuantity++; int num = accumulativeQuantity + 1; releaseRecordListExcel.setAccumulativeQuantityShipped(num); cdqMap.put(key,num); //未交数量 - releaseRecordListExcel.setUndeliveredQuantity(count - num); + releaseRecordListExcel.setUndeliveredQuantity(count - undeliveredQuantity); }else{ cdqMap.put(key,1); accumulativeQuantity = 1; releaseRecordListExcel.setAccumulativeQuantityShipped(accumulativeQuantity); //未交数量 releaseRecordListExcel.setUndeliveredQuantity(count - accumulativeQuantity); - } + }*/ //维修结论 if(item.getMaintenanceResult() != null){ @@ -542,14 +543,15 @@ public class RepairOrderShippingServiceImpl implements IRepairOrderShippingServi index++; // 序号累计 }else{ //累计交货数量 - Integer accumulativeQuantity = cdqMap.get(key); - if(accumulativeQuantity != null){ - int num = accumulativeQuantity + 1; - releaseRecordListExcel.setAccumulativeQuantityShipped(num); - cdqMap.put(key,num); - //未交数量 - releaseRecordListExcel.setUndeliveredQuantity(releaseRecordListExcel.getOrderAmount() - num); - } +// Integer accumulativeQuantity = cdqMap.get(key); +// if(accumulativeQuantity != null){ +// int num = accumulativeQuantity + 1; +// releaseRecordListExcel.setAccumulativeQuantityShipped(num); +// cdqMap.put(key,num); +// //未交数量 +// releaseRecordListExcel.setUndeliveredQuantity(releaseRecordListExcel.getOrderAmount() - num); +// } + if(item.getMaintenanceResult() != null){ String result; if(item.getMaintenanceResult() == 0){ @@ -587,13 +589,22 @@ public class RepairOrderShippingServiceImpl implements IRepairOrderShippingServi } List releaseRecordListExcelList = new LinkedList<>(); + int undeliveredQuantity = 0; for (Long id : repairOrderShippingMap.keySet()) { + List recordListExcels = repairOrderShippingMap.get(id); + for (ReleaseRecordListExcel recordListExcel : recordListExcels) { + undeliveredQuantity += recordListExcel.getTheQuantityShipped(); + recordListExcel.setAccumulativeQuantityShipped(undeliveredQuantity); + recordListExcel.setUndeliveredQuantity(recordListExcel.getOrderAmount() - undeliveredQuantity); + } releaseRecordListExcelList.addAll(repairOrderShippingMap.get(id)); } WriteSheet sheet = EasyExcel.writerSheet(0).build(); writer.fill(offerDetail, sheet); - writer.fill(releaseRecordListExcelList, fillConfig, sheet); + writer.fill(releaseRecordListExcelList + + , fillConfig, sheet); writer.finish(); out.close();