保单发佣明细报表2.8

yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsFortuneServiceImpl.java

@@ -1123,7 +1123,7 @@ public class AgmsFortuneServiceImpl implements AgmsFortuneService {
             if (practitionerId_values.length > 1) {
             if (practitionerId_values.length > 1) {
                 for (int j = 0; j < practitionerId_values.length; j++) {
                 for (int j = 0; j < practitionerId_values.length; j++) {
                     String[] split = practitionerId_values[j].split("-");
                     String[] split = practitionerId_values[j].split("-");
-                    if (StringUtils.isNotBlank(split[0])) {
+                    if (StringUtils.isNotBlank(split[0]) && split.length == 2) {
                         Long practitionerId = Long.valueOf(split[0]);
                         Long practitionerId = Long.valueOf(split[0]);
                         AclPractitioner practitioner = aclPractitionerMap.get(practitionerId);
                         AclPractitioner practitioner = aclPractitionerMap.get(practitionerId);
                         if (practitioner != null) {
                         if (practitioner != null) {

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

@@ -446,7 +446,7 @@
             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' /*渠道*/,
-            null as '19' /*FYC体系*/,
+            coalesce(l.s1_id,l.s2_id,l.s3_id) as '19' /*FYC体系*/,
             pra.name '20' /*销售经纪人*/,
             pra.name '20' /*销售经纪人*/,
             ps.practitioner_level '21' /*经纪人职级*/,
             ps.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' /*职级率*/,
@@ -548,25 +548,25 @@
 
 
             l.s1_id '43' /*所属S1分部*/,
             l.s1_id '43' /*所属S1分部*/,
             (case when l.s1_team_leader_id is not null then
             (case when l.s1_team_leader_id is not null then
-            (SELECT calculation_rate
+            (SELECT group_concat(calculation_rate)
                 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 t.drop_option_code ='C08' and order_id=f.order_id and t.sale_practitioner_id=l.practitioner_id and a.id=l.s1_team_leader_id
                 where t.drop_option_code ='C08' and order_id=f.order_id and t.sale_practitioner_id=l.practitioner_id and a.id=l.s1_team_leader_id
                 ) else null end) '44' /*S1团队达标奖金率*/,
                 ) else null end) '44' /*S1团队达标奖金率*/,
             (case when l.s1_team_leader_id is not null then
             (case when l.s1_team_leader_id is not null then
-            (SELECT 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 t.drop_option_code ='C08' and order_id=f.order_id and t.sale_practitioner_id=l.practitioner_id and a.id=l.s1_team_leader_id
                 where t.drop_option_code ='C08' and order_id=f.order_id and t.sale_practitioner_id=l.practitioner_id and a.id=l.s1_team_leader_id
                 ) else null end) '45' /*'S1团队达标奖金￥（季度）'*/,
                 ) else null end) '45' /*'S1团队达标奖金￥（季度）'*/,
             (case when l.s1_team_leader_id is not null then
             (case when l.s1_team_leader_id is not null then
-            (SELECT calculation_rate
+            (SELECT group_concat(calculation_rate)
                 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 t.drop_option_code ='C10' and order_id=f.order_id and t.sale_practitioner_id=l.practitioner_id and a.id=l.s1_team_leader_id
                 where t.drop_option_code ='C10' and order_id=f.order_id and t.sale_practitioner_id=l.practitioner_id and a.id=l.s1_team_leader_id
                 ) else null end) '46' /*S1团队长辅导津贴比率*/,
                 ) else null end) '46' /*S1团队长辅导津贴比率*/,
             (case when l.s1_team_leader_id is not null then
             (case when l.s1_team_leader_id is not null then
-                (SELECT 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 t.drop_option_code ='C10' and order_id=f.order_id and t.sale_practitioner_id=l.practitioner_id and a.id=l.s1_team_leader_id
                 where t.drop_option_code ='C10' and order_id=f.order_id and t.sale_practitioner_id=l.practitioner_id and a.id=l.s1_team_leader_id
@@ -580,28 +580,28 @@
                 null) as '48' /*S1续期绩效奖金*/,
                 null) as '48' /*S1续期绩效奖金*/,
 
 
             l.s2_id '49' /*所属S2体系*/,
             l.s2_id '49' /*所属S2体系*/,
-            (SELECT calculation_rate
+            (SELECT group_concat(calculation_rate)
             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 t.drop_option_code ='C08' and order_id=f.order_id and t.sale_practitioner_id=l.practitioner_id and a.id=l.s2_team_leader_id
             where t.drop_option_code ='C08' and order_id=f.order_id and t.sale_practitioner_id=l.practitioner_id and a.id=l.s2_team_leader_id
                 ) '50' /*S2团队达标奖金率*/,
                 ) '50' /*S2团队达标奖金率*/,
-            (SELECT 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 t.drop_option_code ='C08' and order_id=f.order_id and t.sale_practitioner_id=l.practitioner_id and a.id=l.s2_team_leader_id
             where t.drop_option_code ='C08' and order_id=f.order_id and t.sale_practitioner_id=l.practitioner_id and a.id=l.s2_team_leader_id
                 ) '51' /*'S2团队达标奖金￥（季度）'*/,
                 ) '51' /*'S2团队达标奖金￥（季度）'*/,
-            (SELECT calculation_rate
+            (SELECT group_concat(calculation_rate)
             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 t.drop_option_code ='C10' and order_id=f.order_id and t.sale_practitioner_id=l.practitioner_id and a.id=l.s2_team_leader_id
             where t.drop_option_code ='C10' and order_id=f.order_id and t.sale_practitioner_id=l.practitioner_id and a.id=l.s2_team_leader_id
                 ) '52' /*S2团队长辅导津贴比率*/,
                 ) '52' /*S2团队长辅导津贴比率*/,
-            (SELECT 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 t.drop_option_code ='C10' and order_id=f.order_id and t.sale_practitioner_id=l.practitioner_id and a.id=l.s2_team_leader_id
             where t.drop_option_code ='C10' and order_id=f.order_id and t.sale_practitioner_id=l.practitioner_id and a.id=l.s2_team_leader_id
                 ) '53' /*S2团队长辅导津贴*/,
                 ) '53' /*S2团队长辅导津贴*/,
             if(f.commission_period!=1,
             if(f.commission_period!=1,
-                (SELECT 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 t.drop_option_code ='C08' and order_id=f.order_id and t.sale_practitioner_id=l.practitioner_id and a.id=l.s2_team_leader_id
                 where t.drop_option_code ='C08' and order_id=f.order_id and t.sale_practitioner_id=l.practitioner_id and a.id=l.s2_team_leader_id
@@ -609,22 +609,22 @@
                 null) as '54' /*S2续期绩效奖金*/,
                 null) as '54' /*S2续期绩效奖金*/,
 
 
             l.s3_id '55' /*所属S3纵队*/,
             l.s3_id '55' /*所属S3纵队*/,
-            (SELECT calculation_rate
+            (SELECT group_concat(calculation_rate)
             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 t.drop_option_code ='C08' and order_id=f.order_id and t.sale_practitioner_id=l.practitioner_id and a.id=l.s3_team_leader_id
             where t.drop_option_code ='C08' and order_id=f.order_id and t.sale_practitioner_id=l.practitioner_id and a.id=l.s3_team_leader_id
                 ) '56' /*S3团队达标奖金率*/,
                 ) '56' /*S3团队达标奖金率*/,
-            (SELECT 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 t.drop_option_code ='C08' and order_id=f.order_id and t.sale_practitioner_id=l.practitioner_id and a.id=l.s3_team_leader_id
             where t.drop_option_code ='C08' and order_id=f.order_id and t.sale_practitioner_id=l.practitioner_id and a.id=l.s3_team_leader_id
                 ) '57' /*'S3团队达标奖金￥（季度）'*/,
                 ) '57' /*'S3团队达标奖金￥（季度）'*/,
-            (SELECT calculation_rate
+            (SELECT group_concat(calculation_rate)
             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 t.drop_option_code ='C10' and order_id=f.order_id and t.sale_practitioner_id=l.practitioner_id and a.id=l.s3_team_leader_id
             where t.drop_option_code ='C10' and order_id=f.order_id and t.sale_practitioner_id=l.practitioner_id and a.id=l.s3_team_leader_id
                 ) '58' /*S3团队长辅导津贴比率*/,
                 ) '58' /*S3团队长辅导津贴比率*/,
-            (SELECT 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 t.drop_option_code ='C10' and order_id=f.order_id and t.sale_practitioner_id=l.practitioner_id and a.id=l.s3_team_leader_id
             where t.drop_option_code ='C10' and order_id=f.order_id and t.sale_practitioner_id=l.practitioner_id and a.id=l.s3_team_leader_id