发佣检核保单报表优化-3

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

@@ -988,7 +988,7 @@ public class AgmsFortuneServiceImpl implements AgmsFortuneService {
     }
     }
 
 
     private void generateSheet2(XSSFWorkbook wkb, List<Long> fortuneIdList, List<Long> fortuneIdList2) {
     private void generateSheet2(XSSFWorkbook wkb, List<Long> fortuneIdList, List<Long> fortuneIdList2) {
-        XSSFSheet sheet2 = wkb.createSheet("保单发佣清算明细报表");
+        XSSFSheet sheet2 = wkb.createSheet("保单清算明细报表");
         // 1.设置表头
         // 1.设置表头
         String[] columnName = new String[]{"序号", "对账月", "投保人", "保单号", "保司", "保费", "产品", "承保时间", "年期",
         String[] columnName = new String[]{"序号", "对账月", "投保人", "保单号", "保司", "保费", "产品", "承保时间", "年期",
                 "FYC%", "业绩折标率%", "分佣%", "业绩%", "RYC%", "保单FYC", "佣金FYC", "业绩FYC", "保单RYC", "佣金RYC", "渠道",
                 "FYC%", "业绩折标率%", "分佣%", "业绩%", "RYC%", "保单FYC", "佣金FYC", "业绩FYC", "保单RYC", "佣金RYC", "渠道",
@@ -1052,8 +1052,6 @@ public class AgmsFortuneServiceImpl implements AgmsFortuneService {
         AclPractitioner practitioner = null;
         AclPractitioner practitioner = null;
         //所属体系
         //所属体系
         AclPractitionerSubordinateSystem subordinateSystem = null;
         AclPractitionerSubordinateSystem subordinateSystem = null;
-        //数据字典
-        MdDropOptions dropOptions = null;
 
 
         Map<String, Object> item = null;
         Map<String, Object> item = null;
         for (int i = 0; i < list.size(); i++) {
         for (int i = 0; i < list.size(); i++) {
@@ -1063,11 +1061,7 @@ public class AgmsFortuneServiceImpl implements AgmsFortuneService {
                 subordinateSystem = subordinateSystemMap.get(Long.valueOf(item.get("19").toString()));
                 subordinateSystem = subordinateSystemMap.get(Long.valueOf(item.get("19").toString()));
                 item.put("19", subordinateSystem != null ? subordinateSystem.getName() : null);
                 item.put("19", subordinateSystem != null ? subordinateSystem.getName() : null);
             }
             }
-            //经纪人职级 [21]
-            if (null != item.get("21") && StringUtils.isNotBlank(item.get("21").toString())) {
-                dropOptions = systemConfigService.getDropOptionInfo("practitioner_level", item.get("21").toString(), "practitioner_level");
-                item.put("21", dropOptions != null ? dropOptions.getDropOptionName() : null);
-            }
+
             //续期辅导人 [25]
             //续期辅导人 [25]
             if (null != item.get("25") && StringUtils.isNotBlank(item.get("25").toString())) {
             if (null != item.get("25") && StringUtils.isNotBlank(item.get("25").toString())) {
                 String[] ids = item.get("25").toString().split(",");
                 String[] ids = item.get("25").toString().split(",");