Merge remote-tracking branch 'origin/dev' into dev

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

@@ -435,7 +435,9 @@
 
 
     <sql id="sheet2Data1" >
     <sql id="sheet2Data1" >
         select
         select
-            (SELECT t.commission_time FROM ag_po_order_commission t WHERE t.id= f.commission_id) '0' /*对账月*/,
+            ifnull((SELECT t.commission_time FROM ag_po_order_commission t WHERE t.id= f.commission_id),
+                if(f.payout_batch_id is not null,(SELECT t.payout_yearmonth FROM ag_acl_customer_fortune_payout_batch t WHERE t.id= f.payout_batch_id), '')
+                ) '0' /*对账月*/,
             (select name from ag_acl_policyholder where order_id = f.order_id and type=2) '1',
             (select name from ag_acl_policyholder where order_id = f.order_id and type=2) '1',
             o.policy_no '2',
             o.policy_no '2',
             i.name '3' /*保司*/,
             i.name '3' /*保司*/,
@@ -456,9 +458,14 @@
             if(f.commission_period!=1,f.referral_amount,'') '17' /*佣金RYC*/,
             if(f.commission_period!=1,f.referral_amount,'') '17' /*佣金RYC*/,
 
 
             (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体系*/,
-            l.practitioner_name '20' /*销售经纪人*/,
-            l.practitioner_level '21' /*经纪人职级*/,
+            ifnull(coalesce(l.s1_id,l.s2_id,l.s3_id),(SELECT a.subordinate_system_id from ag_acl_practitioner a where a.id = f.sale_practitioner_id)) as '19' /*FYC体系*/,
+            ifnull(l.practitioner_name,(select t.name from ag_acl_practitioner t where t.id = f.sale_practitioner_id)) '20' /*销售经纪人*/,
+            ifnull(l.practitioner_level,
+                    (SELECT drop_option_code from ag_acl_practitioner a
+                    LEFT JOIN ag_acl_practitioner_setting b on b.practitioner_id = a.id
+                    LEFT JOIN ag_md_drop_options op1 ON op1.id = b.practitioner_level
+                    where a.id = f.sale_practitioner_id
+                    )) '21' /*经纪人职级*/,
             if(f.grade_commission_rate is not null,f.grade_commission_rate,'100') '22' /*职级率*/,
             if(f.grade_commission_rate is not null,f.grade_commission_rate,'100') '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' /*续年销售佣金*/,
@@ -697,7 +704,7 @@
 
 
             if(o.settlement_rule_type=1,'简单基本法','标准基本法') '66' /*基本法属性*/,
             if(o.settlement_rule_type=1,'简单基本法','标准基本法') '66' /*基本法属性*/,
             sum(case when drop_option_code ='S01' then f.referral_amount else null end) '67' /*S01-首年度销售佣金*/,
             sum(case when drop_option_code ='S01' then f.referral_amount else null end) '67' /*S01-首年度销售佣金*/,
-         	(SELECT GROUP_CONCAT(CONCAT_WS('-', t.practitioner_id, referral_amount))
+         	(SELECT GROUP_CONCAT(referral_amount)
             FROM ag_acl_customer_fortune t
             FROM ag_acl_customer_fortune t
             LEFT JOIN ag_acl_practitioner a ON a.customer_id = t.customer_id
             LEFT JOIN ag_acl_practitioner a ON a.customer_id = t.customer_id
             WHERE drop_option_code ='S03' AND order_id=f.order_id AND sale_practitioner_id = l.practitioner_id 
             WHERE drop_option_code ='S03' AND order_id=f.order_id AND sale_practitioner_id = l.practitioner_id 
@@ -824,7 +831,7 @@
             f.order_id,
             f.order_id,
             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.practitioner_id = f.sale_practitioner_id
+        LEFT 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_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
         LEFT JOIN ag_po_order o on o.id = f.order_id
         LEFT JOIN ag_po_order o on o.id = f.order_id