发佣检核保单报表优化-1

yd-api/src/main/resources/mapper/agms/AgmsFortuneMapper.xml

@@ -449,8 +449,8 @@
 
 
             (select name from ag_acl_channel where id = f.channel_id) '18' /*渠道*/,
             (select name from ag_acl_channel where id = f.channel_id) '18' /*渠道*/,
             coalesce(l.s1_id,l.s2_id,l.s3_id) as '19' /*FYC体系*/,
             coalesce(l.s1_id,l.s2_id,l.s3_id) as '19' /*FYC体系*/,
-            pra.name '20' /*销售经纪人*/,
-            ps.practitioner_level '21' /*经纪人职级*/,
+            l.practitioner_name '20' /*销售经纪人*/,
+            l.practitioner_level '21' /*经纪人职级*/,
             if(f.id=min(f.id),f.grade_commission_rate,'') '22' /*职级率*/,
             if(f.id=min(f.id),f.grade_commission_rate,'') '22' /*职级率*/,
             sum(case when drop_option_code ='C01' then f.referral_amount else null end) '23' /*首年销售佣金*/,
             sum(case when drop_option_code ='C01' then f.referral_amount else null end) '23' /*首年销售佣金*/,
             sum(case when drop_option_code ='C02' then f.referral_amount else null end) '24' /*续年销售佣金*/,
             sum(case when drop_option_code ='C02' then f.referral_amount else null end) '24' /*续年销售佣金*/,
@@ -771,7 +771,7 @@
             l.customer_id
             l.customer_id
 
 
         FROM ag_acl_customer_fortune f
         FROM ag_acl_customer_fortune f
-        INNER JOIN ag_acl_life_insurance_practitioner l on l.order_id = f.order_id and l.customer_id = f.customer_id
+        INNER JOIN ag_acl_life_insurance_practitioner l on l.order_id = f.order_id and l.practitioner_id = f.sale_practitioner_id
         LEFT JOIN ag_acl_customer_fortune_payout_batch pb on pb.id = f.payout_batch_id
         LEFT JOIN ag_acl_customer_fortune_payout_batch pb on pb.id = f.payout_batch_id
         LEFT JOIN ag_acl_practitioner pra on pra.customer_id = f.customer_id
         LEFT JOIN ag_acl_practitioner pra on pra.customer_id = f.customer_id
         LEFT JOIN ag_acl_practitioner_setting ps on ps.practitioner_id = pra.id
         LEFT JOIN ag_acl_practitioner_setting ps on ps.practitioner_id = pra.id
@@ -783,7 +783,7 @@
         <foreach collection="list1" item="item" open="(" separator="," close=")">
         <foreach collection="list1" item="item" open="(" separator="," close=")">
             #{item,jdbcType=BIGINT}
             #{item,jdbcType=BIGINT}
         </foreach>
         </foreach>
-        GROUP BY f.order_id, l.customer_id
+        GROUP BY f.order_id,f.sale_practitioner_id
     </sql>
     </sql>
 
 
     <select id="querySheet2Data" resultType="java.util.LinkedHashMap">
     <select id="querySheet2Data" resultType="java.util.LinkedHashMap">