4and5-保单发佣明细报表5

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

@@ -1002,7 +1002,7 @@ public class AgmsFortuneServiceImpl implements AgmsFortuneService {
                 // 每行序号
                 rownum.createCell(0).setCellValue(i + 1);
                 for (int j = 0; j < columnName.length; j++) {
-                    rownum.createCell(j + 1).setCellValue(values.get(j + "") != null ? values.get(j + "").toString() : "");
+                    rownum.createCell(j + 1).setCellValue(values.get(j + "") != null ? values.get(j + "").toString() : null);
                 }
             }
         }

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

@@ -450,8 +450,8 @@
             pra.name '20' /*销售经纪人*/,
             ps.practitioner_level '21' /*经纪人职级*/,
             if(f.id=min(f.id),f.grade_commission_rate,'') '22' /*职级率*/,
-            sum(case when drop_option_code ='C01' then f.referral_amount else '' end) '23' /*首年销售佣金*/,
-            sum(case when drop_option_code ='C02' then f.referral_amount else '' end) '24' /*续年销售佣金*/,
+            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' /*续年销售佣金*/,
 
             if(f.commission_period!=1,l.mentor_id,'') '25' /*续期辅导人*/,
             if(f.commission_period!=1,
@@ -461,15 +461,15 @@
                 (SELECT group_concat(referral_amount) from ag_acl_customer_fortune where order_id=f.order_id and drop_option_code ='C06' and practitioner_id = l.mentor_id),
                 '') '27' /*续期辅导奖*/,
 
-            sum(case when drop_option_code ='C04' then f.calculation_rate else '' end) '28' /*'经纪人月销售加码奖金%'*/,
-            sum(case when drop_option_code ='C04' then f.referral_amount else '' end) '29' /*经纪人月销售加码奖金*/,
+            sum(case when drop_option_code ='C04' then f.calculation_rate else null end) '28' /*'经纪人月销售加码奖金%'*/,
+            sum(case when drop_option_code ='C04' then f.referral_amount else null end) '29' /*经纪人月销售加码奖金*/,
 
             l.introducer_id '30' /*推荐人*/,
             (SELECT group_concat(calculation_rate) from ag_acl_customer_fortune where order_id=f.order_id and drop_option_code ='C05' and practitioner_id = l.introducer_id) '31' /*个人推荐率*/,
             (SELECT group_concat(referral_amount) from ag_acl_customer_fortune where order_id=f.order_id and drop_option_code ='C05' and practitioner_id = l.introducer_id) '32' /*个人推荐奖￥*/,
 
-            sum(case when drop_option_code ='C15' then f.calculation_rate else '' end) '33' /*体系推荐率*/,
-            sum(case when drop_option_code ='C15' then f.referral_amount else '' end) '34' /*体系推荐奖金￥*/,
+            sum(case when drop_option_code ='C15' then f.calculation_rate else null end) '33' /*体系推荐率*/,
+            sum(case when drop_option_code ='C15' then f.referral_amount else null end) '34' /*体系推荐奖金￥*/,
 
             l.mentor_id '35' /*一代辅导人*/,
             l.mentor_level '36' /*一代辅导人职级*/,
@@ -506,12 +506,12 @@
             (SELECT group_concat(calculation_rate) from ag_acl_customer_fortune where drop_option_code ='C09' and order_id=f.order_id and practitioner_id = l.raise_id) '62' /*育成奖金率*/,
             (SELECT group_concat(referral_amount) from ag_acl_customer_fortune where drop_option_code ='C09' and order_id=f.order_id and practitioner_id = l.raise_id) '63' /*育成金额*/,
 
-            sum(case when drop_option_code ='C14' then f.calculation_rate else '' end) '64' /*C14直接销售加码佣金率*/,
-            sum(case when drop_option_code ='C14' then f.referral_amount else '' end) '65' /*C14直接销售加码佣金*/,
+            sum(case when drop_option_code ='C14' then f.calculation_rate else null end) '64' /*C14直接销售加码佣金率*/,
+            sum(case when drop_option_code ='C14' then f.referral_amount else null end) '65' /*C14直接销售加码佣金*/,
 
             if(o.settlement_rule_type=1,'简单基本法','标准基本法') '66' /*基本法属性*/,
-            sum(case when drop_option_code ='S01' then f.referral_amount else '' end) '67' /*S01-首年度销售佣金*/,
-            sum(case when drop_option_code ='S03' then f.referral_amount else '' end) '68' /*S03-首年度辅导奖金*/,
+            sum(case when drop_option_code ='S01' then f.referral_amount else null end) '67' /*S01-首年度销售佣金*/,
+            sum(case when drop_option_code ='S03' then f.referral_amount else null end) '68' /*S03-首年度辅导奖金*/,
 
             f.order_id,
             f.practitioner_id