Commit 13292b02 by jianan

前端对接问题修复18

parent 9cfa9333
......@@ -6,7 +6,7 @@ import lombok.Data;
import java.math.BigDecimal;
/**
* 佣金统计VO 包含总金额、总入账金额、待入账金额、已入账比例(已入账金额/总金额)、总保单数
* 佣金统计VO
*/
@Data
public class CommissionStatisticsVO {
......
......@@ -98,7 +98,7 @@
COALESCE(SUM(e.expected_amount) - SUM(c.amount), 0) as pendingPaidAmount,
COALESCE(SUM(e.expected_amount) - SUM(c.amount), 0) as differenceAmount,
COUNT(DISTINCT c.policy_no) as totalPolicyCount,
COALESCE(SUM(CAST(c.premium AS DECIMAL(15,2))), 0) as totalPremium,
COALESCE(SUM(CAST(c.premium AS DECIMAL(15,2))*p.payment_term), 0) as totalPremium,
COUNT(DISTINCT c.reconciliation_company) as reconciliationCompanyCount,
COUNT(DISTINCT c.id) as totalCompareCommissionCount,
SUM(CASE WHEN c.status = '1' THEN 1 ELSE 0 END) as successCompareCommissionCount,
......@@ -107,7 +107,8 @@
LEFT JOIN commission_expected e ON c.policy_no = e.policy_no
AND c.commission_name = e.commission_name
AND c.commission_period = e.commission_period
AND c.currency = e.currency
-- AND c.currency = e.currency
LEFT JOIN policy p ON c.policy_no = p.policy_no
<where>
<if test="commissionIdList != null and commissionIdList.size > 0">
c.id IN
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment