楚江erp：应收款台账报表统计数据补充

@@ -121,5 +121,5 @@ public class ReceiptLedgerReportBo {
      * 待交付订单总数
      */
     @ApiModelProperty("待交付订单总数")
-    private Integer waitDeliveredOrderTotal;
+    private Long waitDeliveredOrderTotal;
 }

@@ -71,6 +71,6 @@ public class ReceiptLedgerReportDetail {
     /**
      * 待交付订单数量
      */
-    @ApiModelProperty("授时状态")
-    private Integer waitDeliveredOrder;
+    @ApiModelProperty("待交付订单数量")
+    private Long waitDeliveredOrder;
 }

@@ -28,6 +28,7 @@ import com.lframework.starter.common.utils.Assert;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
+import com.lframework.xingyun.sc.service.shipments.ShipmentsOrderInfoService;
 import com.lframework.xingyun.sc.utils.CommonUtil;
 import com.lframework.xingyun.sc.vo.ledger.receipt.*;
 import org.apache.commons.collections4.CollectionUtils;
@@ -61,6 +62,17 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
     private PurchaseOrderInfoService purchaseOrderInfoService;
     @Resource
     private PurchaseOrderLineService purchaseOrderLineService;
+    @Resource
+    private ShipmentsOrderInfoService shipmentsOrderInfoService;
+
+
+    // 定义状态优先级顺序（从高到低）
+    private static final List<String> STATUS_PRIORITY = Arrays.asList(
+            "CLEAR_DEBTS",
+            "SECOND_COORDINATE",
+            "FIRST_COORDINATE",
+            "AGREEMENT"
+    );
 
 
 
@@ -416,10 +428,16 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
         // 根据简称分组
         Map<String, List<Map<String, Object>>> debtMap = new HashMap<>();
         for (Map<String, Object> map : debtAmountList) {
+            String name = (String) map.get("name");
+            if (!customerNameList.contains(name)) {
+                customerNameList.add(name);
+            }
             String shortName = (String) map.get("short_name");
             List<Map<String, Object>> list = debtMap.computeIfAbsent(shortName, k -> new ArrayList<>());
             list.add(map);
         }
+        // 获取待交付订货单数
+        Map<String, Long> orderCountMap = shipmentsOrderInfoService.countWaitDeliveredOrder(customerNameList);
         for (ReceiptLedgerReportBo report : dataList) {
             String customerShortName = report.getCustomerShortName();
             List<Map<String, Object>> list = debtMap.get(customerShortName);
@@ -431,11 +449,13 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
             BigDecimal firstCoordinateTotal = BigDecimal.ZERO;
             BigDecimal secondCoordinateTotal = BigDecimal.ZERO;
             BigDecimal clearDebtTotal = BigDecimal.ZERO;
-            Integer waitDeliveredOrderTotal = 0;
-            Map<String, ReceiptLedgerReportDetail> reportDetailMap = new HashMap<>();
+            long waitDeliveredOrderTotal = 0;
+            List<String> debtStates = new ArrayList<>();
+            Map<String, ReceiptLedgerReportDetail> reportDetailMap = new LinkedHashMap<>();
             for (Map<String, Object> map : list) {
                 String customerName = (String) map.get("name");
                 String debtStatus = (String) map.get("debt_status");
+                debtStates.add(debtStatus);
                 BigDecimal debtAmount = (BigDecimal) map.get("debt_amount");
 
                 ReceiptLedgerReportDetail reportDetail = reportDetailMap.get(customerName);
@@ -443,20 +463,31 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
                     reportDetail = new ReceiptLedgerReportDetail();
                 }
                 reportDetail.setCustomerName(customerName);
+                reportDetail.setCreditStatus(debtStatus);
                 if ("AGREEMENT".equals(debtStatus)) {
                     reportDetail.setAgreement(valueConvert(debtAmount));
                     agreementTotal = agreementTotal.add(debtAmount);
+                    reportDetail.setCreditStatus("约定内");
                 } else if ("FIRST_COORDINATE".equals(debtStatus)) {
                     reportDetail.setFirstCoordinate(valueConvert(debtAmount));
                     firstCoordinateTotal = firstCoordinateTotal.add(debtAmount);
+                    reportDetail.setCreditStatus("超期1");
                 } else if ("SECOND_COORDINATE".equals(debtStatus)) {
                     reportDetail.setSecondCoordinate(valueConvert(debtAmount));
                     secondCoordinateTotal = secondCoordinateTotal.add(debtAmount);
+                    reportDetail.setCreditStatus("超期2");
                 } else if ("CLEAR_DEBTS".equals(debtStatus)) {
                     reportDetail.setClearDebt(valueConvert(debtAmount));
                     clearDebtTotal = clearDebtTotal.add(debtAmount);
+                    reportDetail.setCreditStatus("超期3");
                 }
                 debtTotal = debtTotal.add(debtAmount);
+                // 统计待交付订单数
+                Long count = orderCountMap.get(customerName);
+                if (count != null) {
+                    waitDeliveredOrderTotal += count;
+                    reportDetail.setWaitDeliveredOrder(count);
+                }
 
                 reportDetailMap.put(reportDetail.getCustomerName(), reportDetail);
             }
@@ -468,6 +499,8 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
             report.setFirstCoordinateTotal(valueConvert(firstCoordinateTotal));
             report.setSecondCoordinateTotal(valueConvert(secondCoordinateTotal));
             report.setClearDebtTotal(valueConvert(clearDebtTotal));
+            report.setCreditStatus(getHighestPriorityStatus(debtStates));
+            // 处理超额逻辑
             report.setWaitDeliveredOrderTotal(waitDeliveredOrderTotal);
         }
         return result;
@@ -608,4 +641,46 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
     }
+
+
+    /**
+     * 从多个状态中获取最高优先级的状态
+     *
+     * @param statusList    当前存在的状态列表
+     * @return              最高优先级的状态，如果没有匹配则返回null
+     */
+    public static String getHighestPriorityStatus(List<String> statusList) {
+        if (statusList == null || statusList.isEmpty()) {
+            return null;
+        }
+        String result = null;
+        Set<String> statusSet = new HashSet<>(statusList);
+        // 按照优先级顺序查找第一个匹配的状态
+        for (String status : STATUS_PRIORITY) {
+            if (statusSet.contains(status)) {
+                result = status;
+                break;
+            }
+        }
+        if (result == null) {
+            return null;
+        }
+        switch (result) {
+            case "AGREEMENT":
+                result = "约定内";
+                break;
+            case "FIRST_COORDINATE":
+                result = "超期1";
+                break;
+            case "SECOND_COORDINATE":
+                result = "超期2";
+                break;
+            case "CLEAR_DEBTS":
+                result = "超期3";
+                break;
+            default:
+                break;
+        }
+        return result;
+    }
 }

@@ -513,6 +513,25 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         return result;
     }
 
+    @Override
+    public Map<String, Long> countWaitDeliveredOrder(List<String> customerNames) {
+        if (CollectionUtils.isEmpty(customerNames)) {
+            return Collections.emptyMap();
+        }
+        List<Map<String, Object>> mapList = getBaseMapper().countWaitDeliveredOrder(customerNames);
+        if (CollectionUtils.isEmpty(mapList)) {
+            return Collections.emptyMap();
+        }
+        Map<String, Long> result = new HashMap<>();
+        for (Map<String, Object> map : mapList) {
+            String key = (String) map.get("name");
+            Long value = (Long) map.get("orderCount");
+
+            result.put(key, value);
+        }
+        return result;
+    }
+
 
     /**
      * 处理批次数据

@@ -47,4 +47,12 @@ public interface ShipmentsOrderInfoMapper extends BaseMapper<ShipmentsOrderInfo>
      * @return              List<Map<String, Double>>
      */
     List<Map<String, Object>> statisticsActualNum(@Param("customerIds") List<String> customerIds);
+
+    /**
+     * 统计待交付订单数
+     *
+     * @param customerNames 客户名称
+     * @return              Map<Integer, Integer>
+     */
+    List<Map<String, Object>> countWaitDeliveredOrder(@Param("customerNames") List<String> customerNames);
 }

@@ -108,4 +108,12 @@ public interface ShipmentsOrderInfoService extends BaseMpService<ShipmentsOrderI
      * @return              List<ShipmentsPlanDetail>
      */
     Map<String, Double> statisticsActualNum(List<String> customerIds);
+
+    /**
+     * 统计待交付订单数
+     *
+     * @param customerNames 客户名称
+     * @return              Map<Integer, Long>
+     */
+    Map<String, Long> countWaitDeliveredOrder(List<String> customerNames);
 }

@@ -128,4 +128,19 @@
         </foreach>
         group by o.customer_id
     </select>
+
+    <select id="countWaitDeliveredOrder" resultType="java.util.Map">
+        select c.name,count(distinct sd.order_id) as orderCount
+        from shipments_order_info tb
+        inner join shipments_plan_detail sd on tb.id = sd.shipment_order_id
+        inner join base_data_customer c on tb.customer_id = c.id
+        where tb.status = 'SHIPMENTS'
+        <if test="customerNames != null and customerNames.size() > 0">
+            and c.name in
+            <foreach collection="customerNames" open="(" separator="," close=")" item="name">
+                #{name}
+            </foreach>
+        </if>
+        group by c.name
+    </select>
 </mapper>