应收款管理-根据入账日查询

yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiCommissionExpectedController.java

@@ -283,7 +283,7 @@ public class ApiCommissionExpectedController {
         if (!CollectionUtils.isEmpty(allExpectedIdList)) {
         if (!CollectionUtils.isEmpty(allExpectedIdList)) {
             receivableReportPage = commissionExpectedService.receivableReportPage(reportPage, allExpectedIdList);
             receivableReportPage = commissionExpectedService.receivableReportPage(reportPage, allExpectedIdList);
         }
         }
-        enrichReceivableReportWithCompanyName(receivableReportPage);
+//        enrichReceivableReportWithCompanyName(receivableReportPage);
         receivableReportPage = convertProductName(receivableReportPage);
         receivableReportPage = convertProductName(receivableReportPage);
         // 组装返回结果
         // 组装返回结果
         ReceivableReportResponse response = new ReceivableReportResponse();
         ReceivableReportResponse response = new ReceivableReportResponse();

yd-csf-service/src/main/resources/mappers/CommissionExpectedMapper.xml

@@ -74,7 +74,7 @@
             MAX(ce.reconciliation_company_biz_id) as reconciliationCompanyBizId,
             MAX(ce.reconciliation_company_biz_id) as reconciliationCompanyBizId,
             ce.commission_period as commissionPeriod,
             ce.commission_period as commissionPeriod,
             MAX(ce.total_period) as totalPeriod,
             MAX(ce.total_period) as totalPeriod,
-            DATE_ADD(DATE_ADD(MAX(p.effective_date), INTERVAL 2 MONTH), INTERVAL (ce.commission_period - 1) YEAR) as commissionDate,
+            MAX(ce.commission_date) as commissionDate,
             ifnull(avg(ce.commission_ratio), 0) as commissionRatio,
             ifnull(avg(ce.commission_ratio), 0) as commissionRatio,
             ifnull(sum(ce.amount), 0) as amount,
             ifnull(sum(ce.amount), 0) as amount,
             MAX(ce.currency) as currency,
             MAX(ce.currency) as currency,