Skip to content

Y
yd-backend
Commit a23ab04d by jianan
Options

保单发佣明细报表2.4

parent 8b463ca4
Showing with 3 additions and 42 deletions
yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsFortuneServiceImpl.java
...@@ -1000,7 +1000,7 @@ public class AgmsFortuneServiceImpl implements AgmsFortuneService { ...@@ -1000,7 +1000,7 @@ public class AgmsFortuneServiceImpl implements AgmsFortuneService {
"所属 S1分部", "S1团队达标奖金率", "S1团队达标奖金￥（季度）", "S1团队长辅导津贴比率", "S1团队长辅导津贴", "S1续期绩效奖金", "所属 S1分部", "S1团队达标奖金率", "S1团队达标奖金￥（季度）", "S1团队长辅导津贴比率", "S1团队长辅导津贴", "S1续期绩效奖金",
"所属 S2体系", "S2团队达标奖金率", "S2团队达标奖金￥（季度）", "S2团队长辅导津贴比率", "S2团队长辅导津贴", "S2续期绩效奖金", "所属 S2体系", "S2团队达标奖金率", "S2团队达标奖金￥（季度）", "S2团队长辅导津贴比率", "S2团队长辅导津贴", "S2续期绩效奖金",
"所属 S3纵队", "S3团队达标奖金率", "S3团队达标奖金￥（季度）", "S3团队长辅导津贴比率", "S3团队长辅导津贴", "所属 S3纵队", "S3团队达标奖金率", "S3团队达标奖金￥（季度）", "S3团队长辅导津贴比率", "S3团队长辅导津贴",
"育成人", "育成人职级", "育成奖金率", "育成金额", "S1育成人", "S1育成人职级", "S1育成奖金率", "S1育成金额",
"C14直接销售加码佣金率", "C14直接销售加码佣金", "C14直接销售加码佣金率", "C14直接销售加码佣金",
"基本法属性", "S01-首年度销售佣金", "S03-首年度辅导奖金", "基本法属性", "S01-首年度销售佣金", "S03-首年度辅导奖金",
"R01-首年度直接销售佣金（旧）", "R02-续年度直接销售拥金(旧)", "R03-续年度辅导佣金(旧)", "R04-续年度绩效奖金(旧)", "R01-首年度直接销售佣金（旧）", "R02-续年度直接销售拥金(旧)", "R03-续年度辅导佣金(旧)", "R04-续年度绩效奖金(旧)",
...@@ -1079,21 +1079,6 @@ public class AgmsFortuneServiceImpl implements AgmsFortuneService { ...@@ -1079,21 +1079,6 @@ public class AgmsFortuneServiceImpl implements AgmsFortuneService {
} }
item.put("25", Joiner.on(",").join(Arrays.asList(ids))); item.put("25", Joiner.on(",").join(Arrays.asList(ids)));
} }
//推荐人 [30]
if (null != item.get("30") && StringUtils.isNotBlank(item.get("30").toString())) {
practitioner = aclPractitionerMap.get(Long.valueOf(item.get("30").toString()));
item.put("30", practitioner != null ? practitioner.getName() : null);
}
//一代辅导人 [35]
if (null != item.get("35") && StringUtils.isNotBlank(item.get("35").toString())) {
practitioner = aclPractitionerMap.get(Long.valueOf(item.get("35").toString()));
item.put("35", practitioner != null ? practitioner.getName() : null);
}
//二代辅导人 [39]
if (null != item.get("39") && StringUtils.isNotBlank(item.get("39").toString())) {
practitioner = aclPractitionerMap.get(Long.valueOf(item.get("39").toString()));
item.put("39", practitioner != null ? practitioner.getName() : null);
}
//所属S1分部 [43] //所属S1分部 [43]
if (null != item.get("43") && StringUtils.isNotBlank(item.get("43").toString())) { if (null != item.get("43") && StringUtils.isNotBlank(item.get("43").toString())) {
subordinateSystem = subordinateSystemMap.get(Long.valueOf(item.get("43").toString())); subordinateSystem = subordinateSystemMap.get(Long.valueOf(item.get("43").toString()));
...@@ -1109,11 +1094,7 @@ public class AgmsFortuneServiceImpl implements AgmsFortuneService { ...@@ -1109,11 +1094,7 @@ public class AgmsFortuneServiceImpl implements AgmsFortuneService {
subordinateSystem = subordinateSystemMap.get(Long.valueOf(item.get("55").toString())); subordinateSystem = subordinateSystemMap.get(Long.valueOf(item.get("55").toString()));
item.put("55", subordinateSystem != null ? subordinateSystem.getName() : null); item.put("55", subordinateSystem != null ? subordinateSystem.getName() : null);
} }
//育成人 [60]
if (null != item.get("60") && StringUtils.isNotBlank(item.get("60").toString())) {
practitioner = aclPractitionerMap.get(Long.valueOf(item.get("60").toString()));
item.put("60", practitioner != null ? practitioner.getName() : null);
}
//44-47 //44-47
item.put("44", this.processMerge(item.get("44"), aclPractitionerMap)); item.put("44", this.processMerge(item.get("44"), aclPractitionerMap));
item.put("45", this.processMerge(item.get("45"), aclPractitionerMap)); item.put("45", this.processMerge(item.get("45"), aclPractitionerMap));
...@@ -1132,27 +1113,7 @@ public class AgmsFortuneServiceImpl implements AgmsFortuneService { ...@@ -1132,27 +1113,7 @@ public class AgmsFortuneServiceImpl implements AgmsFortuneService {
//71-72 //71-72
item.put("71", this.processMerge(item.get("71"), aclPractitionerMap)); item.put("71", this.processMerge(item.get("71"), aclPractitionerMap));
item.put("72", this.processMerge(item.get("72"), aclPractitionerMap)); item.put("72", this.processMerge(item.get("72"), aclPractitionerMap));
//73,74,77,80,84
if (null != item.get("73") && StringUtils.isNotBlank(item.get("73").toString())) {
practitioner = aclPractitionerMap.get(Long.valueOf(item.get("73").toString()));
item.put("73", practitioner != null ? practitioner.getName() : null);
}
if (null != item.get("74") && StringUtils.isNotBlank(item.get("74").toString())) {
practitioner = aclPractitionerMap.get(Long.valueOf(item.get("74").toString()));
item.put("74", practitioner != null ? practitioner.getName() : null);
}
if (null != item.get("77") && StringUtils.isNotBlank(item.get("77").toString())) {
practitioner = aclPractitionerMap.get(Long.valueOf(item.get("77").toString()));
item.put("77", practitioner != null ? practitioner.getName() : null);
}
if (null != item.get("80") && StringUtils.isNotBlank(item.get("80").toString())) {
practitioner = aclPractitionerMap.get(Long.valueOf(item.get("80").toString()));
item.put("80", practitioner != null ? practitioner.getName() : null);
}
if (null != item.get("84") && StringUtils.isNotBlank(item.get("84").toString())) {
practitioner = aclPractitionerMap.get(Long.valueOf(item.get("84").toString()));
item.put("84", practitioner != null ? practitioner.getName() : null);
}
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment