渠道发佣报表13-预览薪资单，渠道服务费 D01 ,D02 加在 【个人销售】下

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java

@@ -1431,7 +1431,10 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         responseBody.setOtherCommissionList(newOtherCommissionLis);
         responseBody.setOtherCommissionList(newOtherCommissionLis);
         //C11 独立经纪人展业津贴
         //C11 独立经纪人展业津贴
         responseBody.setIndependentBrokerAllowanceList(c11List);
         responseBody.setIndependentBrokerAllowanceList(c11List);
-
+        //D01 首年渠道服务费
+        responseBody.setChannelFristYearCommissionList(d01List);
+        //D02 续年渠道服务费
+        responseBody.setChannelRenewalYearCommissionList(d02List);
     }
     }
 
 
     /**
     /**

yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/SearchStaffSalaryDetailsResponseBody.java

@@ -50,7 +50,8 @@ public class SearchStaffSalaryDetailsResponseBody {
     private List<RenewalYearPerformanceCommission> breedingBonusList;//育成奖金
     private List<RenewalYearPerformanceCommission> breedingBonusList;//育成奖金
     private List<Commission> independentBrokerAllowanceList;//独立经纪人展业津贴
     private List<Commission> independentBrokerAllowanceList;//独立经纪人展业津贴
     private List<Commission> direcSalesAddWeightList;//直接销售加码佣金
     private List<Commission> direcSalesAddWeightList;//直接销售加码佣金
-
+    private List<Commission> channelFristYearCommissionList;//D01-首年渠道服务费
+    private List<Commission> channelRenewalYearCommissionList;//D02-续年渠道服务费
 
 
 
 
     public SearchStaffSalaryDetailsResponseBody() {
     public SearchStaffSalaryDetailsResponseBody() {
@@ -248,4 +249,20 @@ public class SearchStaffSalaryDetailsResponseBody {
     public void setDirecSalesAddWeightList(List<Commission> direcSalesAddWeightList) {
     public void setDirecSalesAddWeightList(List<Commission> direcSalesAddWeightList) {
         this.direcSalesAddWeightList = direcSalesAddWeightList;
         this.direcSalesAddWeightList = direcSalesAddWeightList;
     }
     }
+
+    public List<Commission> getChannelFristYearCommissionList() {
+        return channelFristYearCommissionList;
+    }
+
+    public void setChannelFristYearCommissionList(List<Commission> channelFristYearCommissionList) {
+        this.channelFristYearCommissionList = channelFristYearCommissionList;
+    }
+
+    public List<Commission> getChannelRenewalYearCommissionList() {
+        return channelRenewalYearCommissionList;
+    }
+
+    public void setChannelRenewalYearCommissionList(List<Commission> channelRenewalYearCommissionList) {
+        this.channelRenewalYearCommissionList = channelRenewalYearCommissionList;
+    }
 }
 }

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

@@ -1007,11 +1007,7 @@
             sum(case when f.drop_option_code ='D01' then f.referral_amount else null end) '14' /*D01首年渠道服务费*/,
             sum(case when f.drop_option_code ='D01' then f.referral_amount else null end) '14' /*D01首年渠道服务费*/,
             sum(case when f.drop_option_code ='D02' then f.referral_amount else null end) '15' /*D02续年渠道服务费*/,
             sum(case when f.drop_option_code ='D02' then f.referral_amount else null end) '15' /*D02续年渠道服务费*/,
 
 
-            IF(f.rule_id is null, if(o.settlement_rule_type=1,'简单基本法','标准基本法'),
-                (select (case settlement_rule_type when 1 then '简单基本法' when 2 then '标准基本法' when 3 then '特殊结算' when 4 then if(o.settlement_rule_type=1,'简单基本法','标准基本法') end)
-                from ag_settlement_rule_base where id = f.rule_id
-                )
-            ) '16' /*基本法属性*/,
+            '特殊结算' as '16' /*基本法属性*/,
             sum(case when f.drop_option_code ='D91' then f.referral_amount else null end) as '17' /*D91渠道加扣款1*/,
             sum(case when f.drop_option_code ='D91' then f.referral_amount else null end) as '17' /*D91渠道加扣款1*/,
             sum(case when f.drop_option_code ='D92' then f.referral_amount else null end) as '18' /*D92渠道加扣款2*/,
             sum(case when f.drop_option_code ='D92' then f.referral_amount else null end) as '18' /*D92渠道加扣款2*/,