渠道发佣报表9

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

@@ -1287,7 +1287,7 @@ public class AgmsFortuneServiceImpl implements AgmsFortuneService {
 
 
     private void createCSV(List<FortunePayToOrderInfo> fortunePayToOrderInfos, HttpServletResponse response) {
     private void createCSV(List<FortunePayToOrderInfo> fortunePayToOrderInfos, HttpServletResponse response) {
         String charset = "UTF-8"; // 读取字符编码
         String charset = "UTF-8"; // 读取字符编码
-        String[] columnName = new String[]{"序号", "预计发佣年月", "经纪人", "佣金", "应发佣金", "首年销售佣金(fyc)", "保单号", "保费", "佣金率", "发佣状态", "佣金类型", "手机号", "职级", "分公司", "营业部", "体系", "购买方案"};
+        String[] columnName = new String[]{"序号", "预计发佣年月", "所属渠道", "经纪人", "佣金", "应发佣金", "首年销售佣金(fyc)", "保单号", "保费", "佣金率", "发佣状态", "佣金类型", "手机号", "职级", "分公司", "营业部", "体系", "购买方案"};
         String tableName = "YD_Export_Fortune_Pay";
         String tableName = "YD_Export_Fortune_Pay";
         String CSV_COLUMN_SEPARATOR = ",";//CSV文件列分隔符
         String CSV_COLUMN_SEPARATOR = ",";//CSV文件列分隔符
         String CSV_ROW_SEPARATOR = "\r\n";//CSV文件行分隔符
         String CSV_ROW_SEPARATOR = "\r\n";//CSV文件行分隔符
@@ -1304,7 +1304,8 @@ public class AgmsFortuneServiceImpl implements AgmsFortuneService {
                 FortunePayToOrderInfo info = fortunePayToOrderInfos.get(i);//遍历每个对象
                 FortunePayToOrderInfo info = fortunePayToOrderInfos.get(i);//遍历每个对象
                 buf.append(i + 1).append(CSV_COLUMN_SEPARATOR);
                 buf.append(i + 1).append(CSV_COLUMN_SEPARATOR);
                 buf.append(info.getPayoutYearmonth()).append(CSV_COLUMN_SEPARATOR);
                 buf.append(info.getPayoutYearmonth()).append(CSV_COLUMN_SEPARATOR);
-                buf.append(info.getPractitionerName() == null ? info.getChannelName() : info.getPractitionerName()).append(CSV_COLUMN_SEPARATOR);
+                buf.append(info.getChannelName() == null ? "" : info.getChannelName()).append(CSV_COLUMN_SEPARATOR);
+                buf.append(info.getPractitionerName() == null ? "" : info.getPractitionerName()).append(CSV_COLUMN_SEPARATOR);
                 buf.append(info.getCommissionAmount() == null ? 0 : info.getCommissionAmount()).append(CSV_COLUMN_SEPARATOR);
                 buf.append(info.getCommissionAmount() == null ? 0 : info.getCommissionAmount()).append(CSV_COLUMN_SEPARATOR);
                 buf.append(info.getReferralAmount() == null ? 0 : info.getReferralAmount()).append(CSV_COLUMN_SEPARATOR);
                 buf.append(info.getReferralAmount() == null ? 0 : info.getReferralAmount()).append(CSV_COLUMN_SEPARATOR);
                 buf.append(info.getFycAmount() == null ? 0 : info.getFycAmount()).append(CSV_COLUMN_SEPARATOR);
                 buf.append(info.getFycAmount() == null ? 0 : info.getFycAmount()).append(CSV_COLUMN_SEPARATOR);