薪资单手工录入的数据，新增对象

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

@@ -1138,6 +1138,11 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         List<Commission> c08List = new ArrayList<>();
         List<RenewalYearPerformanceCommission> c09List = new ArrayList<>();
         List<RenewalYearPerformanceCommission> c10List = new ArrayList<>();
+        List<Commission> c11List =  new ArrayList<>();
+        List<RenewalYearPerformanceCommission> c12List =  new ArrayList<>();
+        List<Commission> c13List =  new ArrayList<>();
+
+
         List<OtherCommission> otherCommissionLis = new ArrayList<>();
         WithdrawQueryInfo info = new WithdrawQueryInfo();
         info.setPractitionerId(requestVO.getPractitionerId());
@@ -1145,7 +1150,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         List<WithdrawLabelInfo> list = agmsFortuneDalService.salaryPolicyNoDetails(info);
         if(null != list && list.size() >0){
             for(WithdrawLabelInfo withdrawLabelInfo : list){
-                if ("C01,C02,C03,C04,C05,C08,".indexOf(withdrawLabelInfo.getDropOptionCode()+",") != -1) {
+                if ("C01,C02,C03,C04,C05,C08,C11,C13,".indexOf(withdrawLabelInfo.getDropOptionCode()+",") != -1) {
                     Commission commission = new Commission();
                     commission.setCommission(withdrawLabelInfo.getReferralAmount().doubleValue());//佣金
                     commission.setCustomer(withdrawLabelInfo.getInsurerName());//保险公司
@@ -1183,10 +1188,16 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
                     if ("C08".equals(withdrawLabelInfo.getDropOptionCode())) {
                         c08List.add(commission);
                     }
+                    if ("C11".equals(withdrawLabelInfo.getDropOptionCode())) {
+                        c11List.add(commission);
+                    }
+                    if ("C13".equals(withdrawLabelInfo.getDropOptionCode())) {
+                        c13List.add(commission);
+                    }
                 }
 
-                //C07:间接辅导岗位津贴;C06:直接辅导岗位津贴;C09:育成奖金; 被育成体系的所有保单;C10:团队长辅导津贴
-                if ("C06,C07,C09,C10,".indexOf(withdrawLabelInfo.getDropOptionCode()+",") != -1) {
+                //C07:间接辅导岗位津贴;C06:直接辅导岗位津贴;C09:育成奖金; 被育成体系的所有保单;C10:团队长辅导津贴 C12:续年度绩效奖金
+                if ("C06,C07,C09,C10,C12,".indexOf(withdrawLabelInfo.getDropOptionCode()+",") != -1) {
                     RenewalYearPerformanceCommission renewalYearPerformanceCommission = new RenewalYearPerformanceCommission();
                     renewalYearPerformanceCommission.setComments(withdrawLabelInfo.getRemark());
                     renewalYearPerformanceCommission.setCommission(String.valueOf(withdrawLabelInfo.getReferralAmount()));
@@ -1216,6 +1227,10 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
                     if ("C10".equals(withdrawLabelInfo.getDropOptionCode())) {
                         c10List.add(renewalYearPerformanceCommission);
                     }
+                    if ("C12".equals(withdrawLabelInfo.getDropOptionCode())) {
+                        c12List.add(renewalYearPerformanceCommission);
+                    }
+
                 }
 
                 //C99:其他,C98:公司激励奖金,C97:其它税前加扣款,C96:加码奖金,C95:季度奖金,C94,银盾在线佣金
@@ -1241,12 +1256,12 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         responseBody.setMonthlySalesAddWeightList(c04List);//月度销售加码奖金
         //3,首年度辅导奖金 暂时没有
         responseBody.setFristYearCoachCommissionList(null);
-        //4,续年度辅导奖金 暂时没有
-        responseBody.setRenewalYearCoachCommissionList(null);
+        //4,续年度辅导奖金
+        responseBody.setRenewalYearCoachCommissionList(c13List);
         //5,首年度绩效奖金 暂时没有
         responseBody.setFirstYearPerformanceCommissionList(null);
-        //6,续年度绩效奖金 暂时没有
-        responseBody.setRenewalYearPerformanceCommissionList(null);
+        //6,续年度绩效奖金
+        responseBody.setRenewalYearPerformanceCommissionList(c12List);
         responseBody.setDirectCounselingList(c06List);//直接辅导岗位津贴
         responseBody.setIndirectCounselingList(c07List);//间接辅导岗位津贴
         responseBody.setBreedingBonusList(c09List);//育成奖金
@@ -1266,6 +1281,8 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         //   * 13.季度奖金-》备注
         //   * 14.银盾在线佣金-》H5
         responseBody.setOtherCommissionList(otherCommissionLis);
+        //C11 独立经纪人展业津贴
+        responseBody.setIndependentBrokerAllowanceList(c11List);
 
     }
 
@@ -1340,6 +1357,18 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         if ("C94".equals(commissionType)) {
             return "C-005";
         }
+        //C11:独立经纪人展业津贴
+        if ("C11".equals(commissionType)) {
+            return "A-004";
+        }
+        //C12:续年度绩效奖金
+        if ("C12".equals(commissionType)) {
+            return "B-007";
+        }
+        //C13:续年度辅导佣金
+        if ("C13".equals(commissionType)) {
+            return "B-002";
+        }
         return null;
     }
 

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

@@ -48,6 +48,7 @@ public class SearchStaffSalaryDetailsResponseBody {
     private List<RenewalYearPerformanceCommission> indirectCounselingList;//隔代辅导岗位津贴
     private List<RenewalYearPerformanceCommission> TLCoachingAllowanceList;//团队长辅导津贴
     private List<RenewalYearPerformanceCommission> breedingBonusList;//育成奖金
+    private List<Commission> independentBrokerAllowanceList;//独立经纪人展业津贴
 
 
 
@@ -231,4 +232,12 @@ public class SearchStaffSalaryDetailsResponseBody {
     public void setFycMeritsInfoList(List<Commission> fycMeritsInfoList) {
         this.fycMeritsInfoList = fycMeritsInfoList;
     }
+
+    public List<Commission> getIndependentBrokerAllowanceList() {
+        return independentBrokerAllowanceList;
+    }
+
+    public void setIndependentBrokerAllowanceList(List<Commission> independentBrokerAllowanceList) {
+        this.independentBrokerAllowanceList = independentBrokerAllowanceList;
+    }
 }