xwh修改pdf

kmall-admin/src/main/java/com/kmall/admin/service/impl/statistics/MonthlyCustomersServiceImpl.java

@@ -43,17 +43,27 @@ public class MonthlyCustomersServiceImpl implements MonthlyCustomersService {
         // 按照实体类的日期进行升序排序
         monthlySalesGrowthEntities = monthlySalesGrowthEntities.stream().sorted(Comparator.comparing(MonthlySalesGrowthEntity::getYearAndMonth)).collect(Collectors.toList());
         for (String date : dateList) {
+            boolean flag = false;
             for (MonthlySalesGrowthEntity monthlySalesGrowthEntity : monthlySalesGrowthEntities) {
 
                 String totalSales = monthlySalesGrowthEntity.getTotalSales();
                 String taotalCustomers = monthlySalesGrowthEntity.getTotalCustomers();
                 String totalNumber = monthlySalesGrowthEntity.getTotalNumber();
-
-                totalNumberList.add(monthlySalesGrowthEntity.getYearAndMonth().equals(date) ? totalNumber : "0"); // 销售数量
-                totalSalesList.add(monthlySalesGrowthEntity.getYearAndMonth().equals(date)?totalSales:"0"); // 销售额
-                taotalCustomersList.add(monthlySalesGrowthEntity.getYearAndMonth().equals(date)?taotalCustomers:"0"); // 客单数
                 String avgBasketSale = new BigDecimal(totalSales).divide(new BigDecimal(totalNumber), 3, RoundingMode.HALF_UP).toString(); // 客单价
-                avgBasketSaleList.add(monthlySalesGrowthEntity.getYearAndMonth().equals(date)?avgBasketSale:"0");
+                if (monthlySalesGrowthEntity.getYearAndMonth().equals(date)){
+                    totalNumberList.add( totalNumber ); // 销售数量
+                    totalSalesList.add(totalSales); // 销售额
+                    taotalCustomersList.add(taotalCustomers); // 客单数
+                    avgBasketSaleList.add(avgBasketSale);
+                    flag = true;
+                    break;
+                }
+            }
+            if (!flag){
+                totalNumberList.add( "0" ); // 销售数量
+                totalSalesList.add("0"); // 销售额
+                taotalCustomersList.add("0"); // 客单数
+                avgBasketSaleList.add("0");
             }
         }
 
@@ -115,16 +125,21 @@ public class MonthlyCustomersServiceImpl implements MonthlyCustomersService {
         // 按照实体类的日期进行升序排序
         monthlySalesGrowthEntities = monthlySalesGrowthEntities.stream().sorted(Comparator.comparing(MonthlySalesGrowthEntity::getYearAndWeek)).collect(Collectors.toList());
         for (String date : dateList) {
+            boolean flag = false;
             for (MonthlySalesGrowthEntity monthlySalesGrowthEntity : monthlySalesGrowthEntities) {
                 String totalSales = monthlySalesGrowthEntity.getTotalSales();
                 String taotalCustomers = monthlySalesGrowthEntity.getTotalCustomers();
                 String totalNumber = monthlySalesGrowthEntity.getTotalNumber();
-
-                totalNumberList.add(monthlySalesGrowthEntity.getYearAndWeek().equals(date) ? totalNumber : "0"); // 销售数量
-                totalSalesList.add(monthlySalesGrowthEntity.getYearAndWeek().equals(date)?totalSales:"0"); // 销售额
-                taotalCustomersList.add(monthlySalesGrowthEntity.getYearAndWeek().equals(date)?taotalCustomers:"0"); // 客单数
                 String avgBasketSale = new BigDecimal(totalSales).divide(new BigDecimal(totalNumber), 3, RoundingMode.HALF_UP).toString(); // 客单价
-                avgBasketSaleList.add(monthlySalesGrowthEntity.getYearAndWeek().equals(date)?avgBasketSale:"0");
+
+                if (monthlySalesGrowthEntity.getYearAndWeek().equals(date) ){
+                    totalNumberList.add(totalNumber); // 销售数量
+                    totalSalesList.add(totalSales); // 销售额
+                    taotalCustomersList.add(monthlySalesGrowthEntity.getYearAndWeek().equals(date)?taotalCustomers:"0"); // 客单数
+
+                    avgBasketSaleList.add(monthlySalesGrowthEntity.getYearAndWeek().equals(date)?avgBasketSale:"0");
+                }
+
             }
         }