楚江erp：台账报表统计逻辑调整

@@ -51,6 +51,7 @@ import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.YearMonth;
+import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.time.temporal.TemporalAdjusters;
 import java.util.*;
@@ -483,6 +484,16 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
     public PageResult<ReceiptLedgerReportBo> report(Integer pageIndex, Integer pageSize, ReceiptLedgerReportVo vo) {
         Assert.greaterThanZero(pageIndex);
         Assert.greaterThanZero(pageSize);
+        // 获取当月1号和当前时间
+        LocalDateTime endTime = LocalDateTime.now();
+        LocalDateTime startTime = LocalDate.now().withDayOfMonth(1).atStartOfDay();
+        if (vo.getStartTime() == null) {
+            vo.setStartTime(startTime);
+        }
+        if (vo.getEndTime() == null) {
+            vo.setEndTime(endTime);
+        }
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         // 开启分页
         PageHelperUtil.startPage(pageIndex, pageSize);
         List<ReceiptLedgerReportBo> dataList = getBaseMapper().report(vo);
@@ -491,11 +502,15 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
             return result;
         }
         List<String> shortNames = dataList.stream().map(ReceiptLedgerReportBo::getCustomerShortName).distinct().collect(Collectors.toList());
-        // 根据简称获取台账明细数据
-        Map<String, List<ReceiptLedgerInfo>> agreementDataMap = getLedgerInfoByShortName(shortNames, Boolean.FALSE);
-        Map<String, List<ReceiptLedgerInfo>> overdueDataMap = getLedgerInfoByShortName(shortNames, Boolean.TRUE);
+        // 获取当月所有台账明细数据（内贸）
+        QueryReceiptLedgerInfoVo ledgerInfoVo = new QueryReceiptLedgerInfoVo();
+        ledgerInfoVo.setType("INSIDE");
+        ledgerInfoVo.setCreateTimeStart(startTime.format(formatter));
+        ledgerInfoVo.setCreateTimeEnd(endTime.format(formatter));
+        List<ReceiptLedgerInfo> ledgerInfoList = getBaseMapper().query(ledgerInfoVo);
         // 统计各个阶段欠款金额数据
-        List<Map<String, Object>> debtAmountList = getBaseMapper().statisticsDebtByShortName(shortNames, null, "INSIDE");
+        List<Map<String, Object>> debtAmountList = getBaseMapper().statisticsDebtByShortName(shortNames, null, "INSIDE"
+                , vo.getStartTime(), vo.getEndTime());
         if (CollectionUtils.isEmpty(debtAmountList)) {
             return result;
         }
@@ -511,6 +526,7 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
             List<Map<String, Object>> list = debtMap.computeIfAbsent(shortName, k -> new ArrayList<>());
             list.add(map);
         }
+        Set<String> customerNames = new HashSet<>();
         // 获取待交付订货单数
         Map<String, Long> orderCountMap = shipmentsOrderInfoService.countWaitDeliveredOrder(customerNameList);
         for (ReceiptLedgerReportBo report : dataList) {
@@ -520,28 +536,19 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
                 continue;
             }
             long waitDeliveredOrderTotal = 0;
-            List<String> creditStatusList = new ArrayList<>();
-            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);
                 if (reportDetail == null) {
                     reportDetail = new ReceiptLedgerReportDetail();
+                    reportDetail.setCustomerName(customerName);
                 }
-                reportDetail.setCustomerName(customerName);
-                if ("AGREEMENT".equals(debtStatus) || "DEPOSIT".equals(debtStatus)) {
-                    BigDecimal agreement = reportDetail.getAgreement();
-                    if (agreement == null) {
-                        agreement = debtAmount;
-                    } else {
-                        agreement = agreement.add(debtAmount);
-                    }
-                    reportDetail.setAgreement(valueConvert(agreement));
+                if ("AGREEMENT".equals(debtStatus)) {
+                    reportDetail.setAgreement(valueConvert(debtAmount));
                     reportDetail.setTimingStatus("约定内");
                 } else if ("FIRST_COORDINATE".equals(debtStatus)) {
                     reportDetail.setFirstCoordinate(valueConvert(debtAmount));
@@ -553,17 +560,13 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
                     reportDetail.setClearDebt(valueConvert(debtAmount));
                     reportDetail.setTimingStatus("超期3");
                 }
-                // 计算超额数据（授信状态）
-                String creditStatus = calculateExcess(debtAmount, report.getQuota());
-                if (StringUtils.isNotBlank(creditStatus)) {
-                    report.setCreditStatus(creditStatus);
-                    creditStatusList.add(creditStatus);
-                }
                 // 统计待交付订单数
                 Long count = orderCountMap.get(customerName);
-                if (count != null) {
+                if (count != null && !customerNames.contains(customerName)) {
                     waitDeliveredOrderTotal += count;
                     reportDetail.setWaitDeliveredOrder(count);
+                    // 防止重复相加
+                    customerNames.add(customerName);
                 }
                 // 计算总欠款
                 BigDecimal debtTotal = reportDetail.getDebtTotal();
@@ -577,22 +580,28 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
             }
             List<ReceiptLedgerReportDetail> details = new ArrayList<>(reportDetailMap.values());
             if (CollectionUtils.isNotEmpty(details)) {
-                // 转换成万元
                 for (ReceiptLedgerReportDetail detail : details) {
+                    // 转换成万元
                     BigDecimal debtTotal = detail.getDebtTotal();
                     detail.setDebtTotal(valueConvert(debtTotal));
+                    // 计算超额数据（授信状态）
+                    String creditStatus = calculateExcess(debtTotal, report.getQuota());
+                    if (StringUtils.isNotBlank(creditStatus)) {
+                        detail.setCreditStatus(creditStatus);
+                    }
                 }
             }
             report.setDetailList(details);
 
             // 处理约定内、一次协调、二次协调、清欠小计数据
-            handleSubtotal(agreementDataMap, overdueDataMap, report);
-            // 授时状态
-            report.setTimingStatus(getHighestPriorityStatus(debtStates));
+            handleSubtotal(ledgerInfoList, report);
             // 授信状态
-            report.setCreditStatus(findMaxPercentageString(creditStatusList));
-            report.setWaitDeliveredOrderTotal(waitDeliveredOrderTotal);
             BigDecimal debtTotal = report.getDebtTotal();
+            String creditStatus = calculateExcess(debtTotal, report.getQuota());
+            if (StringUtils.isNotBlank(creditStatus)) {
+                report.setCreditStatus(creditStatus);
+            }
+            report.setWaitDeliveredOrderTotal(waitDeliveredOrderTotal);
             report.setDebtTotal(valueConvert(debtTotal));
         }
         return result;
@@ -1032,13 +1041,111 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
     /**
      * 处理“小计”数据
      *
-     * @param agreementDataMap    约定内数据集合
-     * @param overdueDataMap      逾期数据集合
-     * @param report              报表数据
+     * @param ledgerInfoList    台账明细数据
+     * @param report            报表数据
      */
-    private void handleSubtotal(Map<String, List<ReceiptLedgerInfo>> agreementDataMap, Map<String, List<ReceiptLedgerInfo>> overdueDataMap
-            , ReceiptLedgerReportBo report) {
-        String customerShortName = report.getCustomerShortName();
+    private void handleSubtotal(List<ReceiptLedgerInfo> ledgerInfoList, ReceiptLedgerReportBo report) {
+        if (CollectionUtils.isEmpty(ledgerInfoList) || report == null) {
+            return;
+        }
+        BigDecimal debtTotal = report.getDebtTotal();
+        // 约定内欠款
+        BigDecimal agreement = getAgreementDebt(ledgerInfoList, report);
+        if (agreement.compareTo(debtTotal) >= 0) {
+            report.setAgreementTotal(valueConvert(debtTotal));
+            report.setTimingStatus("约定内");
+            return;
+        }
+        // 一次协调欠款
+        BigDecimal firstCoordinate = BigDecimal.ZERO;
+        for (ReceiptLedgerInfo ledgerInfo : ledgerInfoList) {
+            String customerShortName = report.getCustomerShortName();
+            if (!customerShortName.equals(ledgerInfo.getCustomerShortName())) {
+                continue;
+            }
+            BigDecimal startAccountReceivable = ledgerInfo.getStartAccountReceivable();
+            String debtStatus = ledgerInfo.getDebtStatus();
+            if ("FIRST_COORDINATE".equals(debtStatus)) {
+                firstCoordinate = firstCoordinate.add(startAccountReceivable);
+            }
+        }
+        if (firstCoordinate.add(agreement).compareTo(debtTotal) >= 0) {
+            BigDecimal difference = debtTotal.subtract(agreement);
+            report.setAgreementTotal(valueConvert(agreement));
+            report.setFirstCoordinateTotal(valueConvert(difference));
+            report.setTimingStatus("超期1");
+            return;
+        }
+        // 二次协调欠款
+        BigDecimal secondCoordinate = BigDecimal.ZERO;
+        for (ReceiptLedgerInfo ledgerInfo : ledgerInfoList) {
+            String customerShortName = report.getCustomerShortName();
+            if (!customerShortName.equals(ledgerInfo.getCustomerShortName())) {
+                continue;
+            }
+            BigDecimal startAccountReceivable = ledgerInfo.getStartAccountReceivable();
+            String debtStatus = ledgerInfo.getDebtStatus();
+            if ("SECOND_COORDINATE".equals(debtStatus)) {
+                secondCoordinate = secondCoordinate.add(startAccountReceivable);
+            }
+        }
+        BigDecimal secondCoordinateDifference = debtTotal.subtract(agreement).subtract(firstCoordinate);
+        if (secondCoordinate.add(firstCoordinate).add(agreement).compareTo(debtTotal) >= 0) {
+            report.setAgreementTotal(valueConvert(agreement));
+            report.setFirstCoordinateTotal(valueConvert(firstCoordinate));
+            report.setSecondCoordinateTotal(valueConvert(secondCoordinateDifference));
+            report.setTimingStatus("超期2");
+            return;
+        }
+        // 清欠阶段欠款
+        BigDecimal clearDebt = BigDecimal.ZERO;
+        for (ReceiptLedgerInfo ledgerInfo : ledgerInfoList) {
+            String customerShortName = report.getCustomerShortName();
+            if (!customerShortName.equals(ledgerInfo.getCustomerShortName())) {
+                continue;
+            }
+            BigDecimal startAccountReceivable = ledgerInfo.getStartAccountReceivable();
+            String debtStatus = ledgerInfo.getDebtStatus();
+            if ("CLEAR_DEBTS".equals(debtStatus)) {
+                clearDebt = clearDebt.add(startAccountReceivable);
+            }
+        }
+        report.setAgreementTotal(valueConvert(agreement));
+        report.setFirstCoordinateTotal(valueConvert(firstCoordinate));
+        report.setSecondCoordinateTotal(valueConvert(secondCoordinate));
+        report.setTimingStatus("超期3");
+        if (clearDebt.add(secondCoordinate).add(firstCoordinate).add(agreement).compareTo(debtTotal) >= 0) {
+            BigDecimal difference = secondCoordinateDifference.subtract(secondCoordinate);
+            report.setClearDebtTotal(valueConvert(difference));
+        } else {
+            report.setClearDebtTotal(valueConvert(clearDebt));
+        }
+    }
+
+    /**
+     * 获取约定内欠款小计
+     *
+     * @param ledgerInfoList    应收款台账明细数据
+     * @param report            报表数据
+     * @return                  BigDecimal
+     */
+    private static BigDecimal getAgreementDebt(List<ReceiptLedgerInfo> ledgerInfoList, ReceiptLedgerReportBo report) {
+        BigDecimal agreement = BigDecimal.ZERO;
+        for (ReceiptLedgerInfo ledgerInfo : ledgerInfoList) {
+            String customerShortName = report.getCustomerShortName();
+            if (!customerShortName.equals(ledgerInfo.getCustomerShortName())) {
+                continue;
+            }
+            BigDecimal startAccountReceivable = ledgerInfo.getStartAccountReceivable();
+            String debtStatus = ledgerInfo.getDebtStatus();
+            if ("AGREEMENT".equals(debtStatus) || "SETTLE_UP".equals(debtStatus)) {
+                agreement = agreement.add(startAccountReceivable);
+            } else if ("DEPOSIT".equals(debtStatus)) {
+                BigDecimal endAccountReceivable = ledgerInfo.getEndAccountReceivable();
+                agreement = agreement.add(endAccountReceivable.abs());
+            }
+        }
+        return agreement;
     }
 
 
@@ -1099,8 +1206,12 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
             }
             data.setSettleTerm(credit.getCompanySettlementPeriod());
         }
-        data.setDeptId(deptId);
-        data.setRegion(region);
+        if (StringUtils.isNotBlank(deptId) && !deptId.equals("null")) {
+            data.setDeptId(deptId);
+        }
+        if (StringUtils.isNotBlank(region) && !region.equals("null")) {
+            data.setRegion(region);
+        }
         data.setCustomerId(shipmentsOrderInfo.getCustomerId());
         data.setShipmentDate(shipmentsOrderInfo.getShipmentsDate());
 

@@ -7,6 +7,7 @@ import com.lframework.xingyun.sc.vo.ledger.receipt.QueryReceiptLedgerInfoVo;
 import com.lframework.xingyun.sc.vo.ledger.receipt.ReceiptLedgerReportVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -57,7 +58,7 @@ public interface ReceiptLedgerInfoMapper extends BaseMapper<ReceiptLedgerInfo> {
      * @return              List<Map<String, BigDecimal>>
      */
     List<Map<String, Object>> statisticsDebtByShortName(@Param("shortNames") List<String> shortNames, @Param("debtStatusList") List<String> debtStatusList
-            , @Param("type") String type);
+            , @Param("type") String type, @Param("startTime") LocalDateTime startTime, @Param("endTime") LocalDateTime endTime);
 
     /**
      * 根据客户简称获取台账明细数据

@@ -87,6 +87,9 @@ public class QueryReceiptLedgerInfoVo extends PageVo implements BaseVo, Serializ
     @ApiModelProperty("厂别")
     private String factoryType;
 
+    /**
+     * 欠款状态
+     */
     @ApiModelProperty("欠款状态")
     private String debtStatus;
 

@@ -7,6 +7,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 @Data
 public class ReceiptLedgerReportVo extends PageVo implements BaseVo, Serializable {
@@ -54,4 +55,16 @@ public class ReceiptLedgerReportVo extends PageVo implements BaseVo, Serializabl
      */
     @ApiModelProperty("导出类型")
     private String exportType;
+
+    /**
+     * 开始时间
+     */
+    @ApiModelProperty("开始时间")
+    private LocalDateTime startTime;
+
+    /**
+     * 结束时间
+     */
+    @ApiModelProperty("结束时间")
+    private LocalDateTime endTime;
 }

@@ -237,9 +237,11 @@
         left join sys_dept d on tb.dept_id = d.id
         left join sys_dept r on tb.region = r.id
         left join customer_credit cc on tb.customer_id = cc.company_id
-        left join receipt_ledger_info rl on tb.id = rl.customer_short_id
+        left join receipt_ledger_info rl on tb.id = rl.customer_short_id and rl.del_flag = false
         <where>
             and rl.type = 'INSIDE'
+            -- 只统计当月数据
+            and rl.create_time >= #{vo.startTime} and rl.create_time &lt;= #{vo.endTime}
             <if test="vo.customerType != null and vo.customerType != ''">
                 and tb.type = #{vo.customerType}
             </if>
@@ -269,6 +271,9 @@
         inner join base_data_customer_short cs on tb.customer_id = cs.customer_id
         inner join base_data_customer c on tb.customer_id = c.id
         <where>
+            and tb.del_flag = false
+            -- 只统计当月数据
+            and tb.create_time >= #{startTime} and tb.create_time &lt;= #{endTime}
             <if test="type != null and type != ''">
                 and tb.type = #{type}
             </if>
@@ -292,6 +297,7 @@
         from receipt_ledger_info tb
         left join base_data_customer_short cs on tb.customer_id = cs.customer_id
         <where>
+            and tb.del_flag = false
             <if test="type != null and type != ''">
                 and tb.type = #{type}
             </if>