续年佣金计算-来佣比对优化2

yd-api/src/main/java/com/yd/api/commission/service/impl/LifeCommissionServiceImpl.java

@@ -76,7 +76,7 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
     @Override
     public CheckComeCommissionResponseVO updateCommissionCheckStatus(CheckComeCommissionRequestVO requestVO) {
         CheckComeCommissionResponseVO resp = new CheckComeCommissionResponseVO();
-        List<ComeCommissionParams> paramsList = requestVO.getOrderIds();
+        List<ComeCommissionParams> paramsList = requestVO.getParamsList();
         String status = requestVO.getCheckStatus();
         String loginId = requestVO.getLoginId();
         String checkBatch = requestVO.getCheckBatch();
@@ -310,7 +310,7 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
 
     private void createCSV(List<ComeCommissionVO> dataList, HttpServletResponse response) {
         String charset = "UTF-8"; // 读取字符编码
-        String[] columnName = new String[]{"序号","检核年月","保险公司","保单号","保费","来佣率","来佣金额","来佣状态 ","经纪人","经纪人类型","下单时间","购买方案","产品险种","保险种类","缴费年限","保障期间"};
+        String[] columnName = new String[]{"序号","来佣编号","预计来佣年月","实际来佣年月","检核年月","保险公司","保单号","保费","来佣率","来佣金额","来佣状态 ","经纪人","经纪人类型","下单时间","购买方案","产品险种","保险种类","缴费年限","保障期间"};
         String tableName = "YD_Export_ComeCommission";
         String CSV_COLUMN_SEPARATOR = ",";//CSV文件列分隔符
         String CSV_ROW_SEPARATOR = "\r\n";//CSV文件行分隔符
@@ -326,6 +326,9 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
             for (int i = 0; i < dataList.size(); i++) {
                 ComeCommissionVO info = dataList.get(i);//遍历每个对象
                 buf.append(i + 1).append(CSV_COLUMN_SEPARATOR);
+                buf.append(info.getCommissionNo()).append(CSV_COLUMN_SEPARATOR);
+                buf.append(info.getCommissionYear()).append(CSV_COLUMN_SEPARATOR);
+                buf.append(info.getCommissionTime()).append(CSV_COLUMN_SEPARATOR);
                 buf.append("\t").append(info.getCheckDate() == null ? "" : info.getCheckDate()).append("\t").append(CSV_COLUMN_SEPARATOR);
                 buf.append(info.getInsurerName()).append(CSV_COLUMN_SEPARATOR);
                 buf.append("\t").append(info.getPolicyNo()).append("\t").append(CSV_COLUMN_SEPARATOR);

yd-api/src/main/java/com/yd/api/commission/vo/lifecommission/CheckComeCommissionRequestVO.java

@@ -3,7 +3,7 @@ package com.yd.api.commission.vo.lifecommission;
 import java.util.List;
 
 public class CheckComeCommissionRequestVO {
-    private List<ComeCommissionParams> orderIds;
+    private List<ComeCommissionParams> paramsList;
     private String checkStatus;
     private String loginId;
     /**
@@ -11,14 +11,6 @@ public class CheckComeCommissionRequestVO {
      */
     private String checkBatch;
 
-    public List<ComeCommissionParams> getOrderIds() {
-        return orderIds;
-    }
-
-    public void setOrderIds(List<ComeCommissionParams> orderIds) {
-        this.orderIds = orderIds;
-    }
-
     public String getCheckStatus() {
         return checkStatus;
     }
@@ -43,4 +35,11 @@ public class CheckComeCommissionRequestVO {
         this.checkBatch = checkBatch;
     }
 
+    public List<ComeCommissionParams> getParamsList() {
+        return paramsList;
+    }
+
+    public void setParamsList(List<ComeCommissionParams> paramsList) {
+        this.paramsList = paramsList;
+    }
 }