From 04602a0ffb70e1640938d6e6727593d23f183ba7 Mon Sep 17 00:00:00 2001
From: JaxCen <1694546944@qq.com>
Date: Tue, 29 Oct 2024 23:18:56 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90admin=E3=80=91=E4=BF=AE=E6=94=B9#=201.?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=81=E8=B4=A7=E5=8D=95=E7=B4=AF=E8=AE=A1?=
 =?UTF-8?q?=E4=BA=A4=E8=B4=A7=E6=95=B0=E9=87=8F=E5=92=8C=E6=9C=AA=E4=BA=A4?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/RepairOrderShippingServiceImpl.java  | 35 ++++++++++++-------
 1 file changed, 23 insertions(+), 12 deletions(-)

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<ReleaseRecordListExcel> releaseRecordListExcelList = new LinkedList<>();
+            int undeliveredQuantity = 0;
             for (Long id : repairOrderShippingMap.keySet()) {
+                List<ReleaseRecordListExcel> 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();