Skip to content

Y
yd-backend
Commit bb361a7f by jianan
Options

【线上来佣比对】 

导出优化2
parent 13b91fb9
Showing with 49 additions and 8 deletions
yd-api/src/main/java/com/yd/api/commission/service/impl/LifeCommissionServiceImpl.java
...@@ -375,12 +375,24 @@ public class LifeCommissionServiceImpl implements LifeCommissionService { ...@@ -375,12 +375,24 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
Long practitionerId = null; Long practitionerId = null;
ComeCommissionVO comeCommissionVO = null; ComeCommissionVO comeCommissionVO = null;
MdDropOptions dropOption = null;
for (int i = 0; i < dataList.size(); i++) { for (int i = 0; i < dataList.size(); i++) {
comeCommissionVO = dataList.get(i); comeCommissionVO = dataList.get(i);
practitionerId = comeCommissionVO.getPractitionerId(); practitionerId = comeCommissionVO.getPractitionerId();
self = aclPractitionerMap.get(practitionerId); self = aclPractitionerMap.get(practitionerId);
if ("1".equals(comeCommissionVO.getCommissionType())) {
dropOption = systemConfigService.getDropOption("Base_Commission_Item", comeCommissionVO.getCommissionItem());
comeCommissionVO.setCommissionTypeName("基础来佣");
} else {
dropOption = systemConfigService.getDropOption("Special_Commission_Type", comeCommissionVO.getCommissionItem());
comeCommissionVO.setCommissionTypeName("特殊激励来佣");
}
if (dropOption != null) {
comeCommissionVO.setCommissionItemName(dropOption.getDropOptionName());
}
if (self != null) { if (self != null) {
if (self.getSubordinateSystemId() != null) { if (self.getSubordinateSystemId() != null) {
subordinateSystem = subordinateSystemMap.get(self.getSubordinateSystemId()); subordinateSystem = subordinateSystemMap.get(self.getSubordinateSystemId());
...@@ -537,9 +549,9 @@ public class LifeCommissionServiceImpl implements LifeCommissionService { ...@@ -537,9 +549,9 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
private void createCSV(List<ComeCommissionVO> dataList, HttpServletResponse response) { private void createCSV(List<ComeCommissionVO> dataList, HttpServletResponse response) {
String charset = "UTF-8"; // 读取字符编码 String charset = "UTF-8"; // 读取字符编码
String[] columnName = new String[]{"序号", "来佣编号", "预计来佣年月", "实际来佣年月", "检核年月", "保险公司", "保险分公司", String[] columnName = new String[]{"序号", "来佣编号", "预计来佣年月", "实际来佣年月", "检核年月", "银盾出单机构", "保险公司", "保险分公司",
"保单号", "保费", "来佣率", "来佣金额", "来佣状态 ", "经纪人", "经纪人类型", "下单时间", "购买方案", "产品险种", "保险种类", "缴费年限", "保障期间", "保单号", "保费", "来佣类型", "来佣项目", "来佣率", "来佣金额", "来佣状态 ", "经纪人", "S3纵队", "S2体系", "S1分部", "经纪人类型",
"银盾出单机构", "S3纵队", "S2体系", "S1分部" "下单时间", "购买方案", "产品险种", "保险种类", "缴费年限", "保障期间"
}; };
String tableName = "YD_Export_ComeCommission"; String tableName = "YD_Export_ComeCommission";
String CSV_COLUMN_SEPARATOR = ",";//CSV文件列分隔符 String CSV_COLUMN_SEPARATOR = ",";//CSV文件列分隔符
...@@ -560,14 +572,23 @@ public class LifeCommissionServiceImpl implements LifeCommissionService { ...@@ -560,14 +572,23 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
buf.append("\t").append(info.getCommissionYear()).append("\t").append(CSV_COLUMN_SEPARATOR); buf.append("\t").append(info.getCommissionYear()).append("\t").append(CSV_COLUMN_SEPARATOR);
buf.append("\t").append(info.getCommissionTime()).append("\t").append(CSV_COLUMN_SEPARATOR); buf.append("\t").append(info.getCommissionTime()).append("\t").append(CSV_COLUMN_SEPARATOR);
buf.append("\t").append(info.getCheckDate()).append("\t").append(CSV_COLUMN_SEPARATOR); buf.append("\t").append(info.getCheckDate()).append("\t").append(CSV_COLUMN_SEPARATOR);
buf.append(info.getYdBrachName()).append(CSV_COLUMN_SEPARATOR);
buf.append(info.getInsurerName()).append(CSV_COLUMN_SEPARATOR); buf.append(info.getInsurerName()).append(CSV_COLUMN_SEPARATOR);
buf.append(info.getInsurerBrachName()).append(CSV_COLUMN_SEPARATOR); buf.append(info.getInsurerBrachName()).append(CSV_COLUMN_SEPARATOR);
buf.append("\t").append(info.getPolicyNo()).append("\t").append(CSV_COLUMN_SEPARATOR); buf.append("\t").append(info.getPolicyNo()).append("\t").append(CSV_COLUMN_SEPARATOR);
buf.append(info.getOrderPrice()).append(CSV_COLUMN_SEPARATOR); buf.append(info.getOrderPrice()).append(CSV_COLUMN_SEPARATOR);
buf.append(info.getCommissionTypeName()).append(CSV_COLUMN_SEPARATOR);
buf.append(info.getCommissionItemName()).append(CSV_COLUMN_SEPARATOR);
buf.append(info.getCommissionRate()).append(CSV_COLUMN_SEPARATOR); buf.append(info.getCommissionRate()).append(CSV_COLUMN_SEPARATOR);
buf.append(info.getCommissionAmount()).append(CSV_COLUMN_SEPARATOR); buf.append(info.getCommissionAmount()).append(CSV_COLUMN_SEPARATOR);
buf.append(this.transferCommissionCheckStatus(info.getCommissionCheckStatus())).append(CSV_COLUMN_SEPARATOR); buf.append(this.transferCommissionCheckStatus(info.getCommissionCheckStatus())).append(CSV_COLUMN_SEPARATOR);
buf.append(info.getName()).append(CSV_COLUMN_SEPARATOR); buf.append(info.getName()).append(CSV_COLUMN_SEPARATOR);
buf.append(info.getS3SubordinateSystemName()).append(CSV_COLUMN_SEPARATOR);
buf.append(info.getS2SubordinateSystemName()).append(CSV_COLUMN_SEPARATOR);
buf.append(info.getSubordinateSystemName()).append(CSV_COLUMN_SEPARATOR);
if ("27".equals(info.getPractitionerTypeId())) { if ("27".equals(info.getPractitionerTypeId())) {
buf.append("产险").append(CSV_COLUMN_SEPARATOR); buf.append("产险").append(CSV_COLUMN_SEPARATOR);
} else if ("28".equals(info.getPractitionerTypeId())) { } else if ("28".equals(info.getPractitionerTypeId())) {
...@@ -580,11 +601,7 @@ public class LifeCommissionServiceImpl implements LifeCommissionService { ...@@ -580,11 +601,7 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
buf.append(info.getPlanCategoryName()).append(CSV_COLUMN_SEPARATOR); buf.append(info.getPlanCategoryName()).append(CSV_COLUMN_SEPARATOR);
buf.append(info.getCategoryName()).append(CSV_COLUMN_SEPARATOR); buf.append(info.getCategoryName()).append(CSV_COLUMN_SEPARATOR);
buf.append(info.getPayTerm()).append(CSV_COLUMN_SEPARATOR); buf.append(info.getPayTerm()).append(CSV_COLUMN_SEPARATOR);
buf.append(info.getCoverageTerm() == null ? "/" : info.getCoverageTerm().substring(1)).append(CSV_COLUMN_SEPARATOR); buf.append(info.getCoverageTerm() == null ? "/" : info.getCoverageTerm()).append(CSV_COLUMN_SEPARATOR);
buf.append(info.getYdBrachName()).append(CSV_COLUMN_SEPARATOR);
buf.append(info.getS3SubordinateSystemName()).append(CSV_COLUMN_SEPARATOR);
buf.append(info.getS2SubordinateSystemName()).append(CSV_COLUMN_SEPARATOR);
buf.append(info.getSubordinateSystemName()).append(CSV_COLUMN_SEPARATOR);
buf.append(CSV_ROW_SEPARATOR); buf.append(CSV_ROW_SEPARATOR);
} }
......
yd-api/src/main/java/com/yd/api/commission/vo/lifecommission/ComeCommissionVO.java
...@@ -74,6 +74,9 @@ public class ComeCommissionVO { ...@@ -74,6 +74,9 @@ public class ComeCommissionVO {
} }
public String getInsurerName() { public String getInsurerName() {
if (StringUtils.isBlank(insurerName)) {
return StringUtils.EMPTY;
}
return insurerName; return insurerName;
} }
...@@ -82,6 +85,9 @@ public class ComeCommissionVO { ...@@ -82,6 +85,9 @@ public class ComeCommissionVO {
} }
public String getPlanName() { public String getPlanName() {
if (StringUtils.isBlank(planName)) {
return StringUtils.EMPTY;
}
return planName; return planName;
} }
...@@ -90,6 +96,9 @@ public class ComeCommissionVO { ...@@ -90,6 +96,9 @@ public class ComeCommissionVO {
} }
public String getPolicyNo() { public String getPolicyNo() {
if (StringUtils.isBlank(policyNo)) {
return StringUtils.EMPTY;
}
return policyNo; return policyNo;
} }
...@@ -98,6 +107,9 @@ public class ComeCommissionVO { ...@@ -98,6 +107,9 @@ public class ComeCommissionVO {
} }
public String getOrderPrice() { public String getOrderPrice() {
if (StringUtils.isBlank(orderPrice)) {
return "/";
}
return orderPrice; return orderPrice;
} }
...@@ -106,6 +118,9 @@ public class ComeCommissionVO { ...@@ -106,6 +118,9 @@ public class ComeCommissionVO {
} }
public String getCommissionRate() { public String getCommissionRate() {
if (StringUtils.isBlank(commissionRate)) {
return StringUtils.EMPTY;
}
return commissionRate; return commissionRate;
} }
...@@ -130,6 +145,9 @@ public class ComeCommissionVO { ...@@ -130,6 +145,9 @@ public class ComeCommissionVO {
} }
public String getOrderDate() { public String getOrderDate() {
if (StringUtils.isBlank(orderDate)) {
return "/";
}
return orderDate; return orderDate;
} }
...@@ -157,6 +175,9 @@ public class ComeCommissionVO { ...@@ -157,6 +175,9 @@ public class ComeCommissionVO {
} }
public String getCategoryName() { public String getCategoryName() {
if (StringUtils.isBlank(categoryName)) {
return StringUtils.EMPTY;
}
return categoryName; return categoryName;
} }
...@@ -165,6 +186,9 @@ public class ComeCommissionVO { ...@@ -165,6 +186,9 @@ public class ComeCommissionVO {
} }
public String getPlanCategoryName() { public String getPlanCategoryName() {
if (StringUtils.isBlank(planCategoryName)) {
return StringUtils.EMPTY;
}
return planCategoryName; return planCategoryName;
} }
......
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