新单跟进v2

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

@@ -69,13 +69,13 @@
         select
         select
             null as receivableNo,
             null as receivableNo,
             ce.policy_no as policyNo,
             ce.policy_no as policyNo,
-            ce.reconciliation_company as reconciliationCompany,
+            MAX(ce.reconciliation_company) as reconciliationCompany,
             ce.commission_period as commissionPeriod,
             ce.commission_period as commissionPeriod,
-            ce.total_period as totalPeriod,
-            DATE_ADD(DATE_ADD(p.effective_date, INTERVAL 2 MONTH), INTERVAL (ce.commission_period - 1) YEAR) as commissionDate,
+            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,
             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,
-            ce.currency as currency,
+            MAX(ce.currency) as currency,
             ifnull(sum(ce.expected_amount), 0) as hkdAmount,
             ifnull(sum(ce.expected_amount), 0) as hkdAmount,
             ifnull(sum(ce.paid_amount), 0) as paidAmount,
             ifnull(sum(ce.paid_amount), 0) as paidAmount,
             ifnull(sum(ce.expected_amount) - sum(ce.paid_amount), 0) as unpaidAmount,
             ifnull(sum(ce.expected_amount) - sum(ce.paid_amount), 0) as unpaidAmount,
@@ -88,10 +88,10 @@
                 else 0
                 else 0
             end as unpaidRatio,
             end as unpaidRatio,
             ifnull(avg(ce.default_exchange_rate), 0) as exchangeRate,
             ifnull(avg(ce.default_exchange_rate), 0) as exchangeRate,
-            p.insurance_company as insuranceCompany,
-            p.product_name as productName,
+            MAX(p.insurance_company) as insuranceCompany,
+            MAX(p.product_name) as productName,
             ifnull(avg(ce.premium), 0) as premium,
             ifnull(avg(ce.premium), 0) as premium,
-            p.currency as policyCurrency
+            MAX(p.currency) as policyCurrency
         from commission_expected ce
         from commission_expected ce
         left join policy p on ce.policy_no = p.policy_no
         left join policy p on ce.policy_no = p.policy_no
         <where>
         <where>