前端对接问题修复63

yd-csf-service/src/main/java/com/yd/csf/service/vo/CommissionExpectedExportDTO.java

@@ -15,22 +15,19 @@ import java.util.Date;
 @Data
 @Data
 @ContentRowHeight(15)
 @ContentRowHeight(15)
 @HeadRowHeight(20)
 @HeadRowHeight(20)
-@ColumnWidth(25)
+@ColumnWidth(20)
 public class CommissionExpectedExportDTO {
 public class CommissionExpectedExportDTO {
 
 
     @ExcelProperty("应收账款编号")
     @ExcelProperty("应收账款编号")
-    @ColumnWidth(20)
     private String receivableNo;
     private String receivableNo;
 
 
     @ExcelProperty("应收款类型")
     @ExcelProperty("应收款类型")
     private String commissionBizType;
     private String commissionBizType;
 
 
     @ExcelProperty("保单号")
     @ExcelProperty("保单号")
-    @ColumnWidth(20)
     private String policyNo;
     private String policyNo;
 
 
     @ExcelProperty("对账公司")
     @ExcelProperty("对账公司")
-    @ColumnWidth(20)
     private String reconciliationCompany;
     private String reconciliationCompany;
 
 
     @ExcelProperty("佣金期数")
     @ExcelProperty("佣金期数")
@@ -40,13 +37,13 @@ public class CommissionExpectedExportDTO {
     private Integer totalPeriod;
     private Integer totalPeriod;
 
 
     @ExcelProperty("来佣名称")
     @ExcelProperty("来佣名称")
-    @ColumnWidth(20)
     private String commissionName;
     private String commissionName;
 
 
     @ExcelProperty("来佣类型")
     @ExcelProperty("来佣类型")
     private String commissionType;
     private String commissionType;
 
 
     @ExcelProperty("预计入账比例(%)")
     @ExcelProperty("预计入账比例(%)")
+    @ColumnWidth(25)
     private BigDecimal commissionRatio;
     private BigDecimal commissionRatio;
 
 
     @ExcelProperty("来佣币种")
     @ExcelProperty("来佣币种")
@@ -54,7 +51,7 @@ public class CommissionExpectedExportDTO {
 
 
     @ExcelProperty("预计来佣日期")
     @ExcelProperty("预计来佣日期")
     @DateTimeFormat("yyyy-MM-dd")
     @DateTimeFormat("yyyy-MM-dd")
-    @ColumnWidth(15)
+    @ColumnWidth(25)
     private Date commissionDate;
     private Date commissionDate;
 
 
     @ExcelProperty("入账状态")
     @ExcelProperty("入账状态")
@@ -65,23 +62,21 @@ public class CommissionExpectedExportDTO {
     private String statusDesc;
     private String statusDesc;
 
 
     @ExcelProperty("预计入账金额(HKD)")
     @ExcelProperty("预计入账金额(HKD)")
-    @ColumnWidth(20)
+    @ColumnWidth(25)
     private BigDecimal expectedAmount;
     private BigDecimal expectedAmount;
 
 
     @ExcelProperty("已入账金额(HKD)")
     @ExcelProperty("已入账金额(HKD)")
-    @ColumnWidth(20)
+    @ColumnWidth(25)
     private BigDecimal paidAmount;
     private BigDecimal paidAmount;
 
 
     @ExcelProperty("已入账比例(%)")
     @ExcelProperty("已入账比例(%)")
-    @ColumnWidth(20)
     private BigDecimal paidRatio;
     private BigDecimal paidRatio;
 
 
     @ExcelProperty("待入账金额(HKD)")
     @ExcelProperty("待入账金额(HKD)")
-    @ColumnWidth(20)
+    @ColumnWidth(25)
     private BigDecimal pendingAmount;
     private BigDecimal pendingAmount;
 
 
     @ExcelProperty("待入账比例(%)")
     @ExcelProperty("待入账比例(%)")
-    @ColumnWidth(20)
     private BigDecimal pendingRatio;
     private BigDecimal pendingRatio;
 
 
     @ExcelProperty("备注")
     @ExcelProperty("备注")
@@ -104,7 +99,7 @@ public class CommissionExpectedExportDTO {
     public static CommissionExpectedExportDTO convertToExportDTO(CommissionExpected vo) {
     public static CommissionExpectedExportDTO convertToExportDTO(CommissionExpected vo) {
         CommissionExpectedExportDTO dto = new CommissionExpectedExportDTO();
         CommissionExpectedExportDTO dto = new CommissionExpectedExportDTO();
         dto.setReceivableNo(vo.getReceivableNo());
         dto.setReceivableNo(vo.getReceivableNo());
-        dto.setCommissionBizType(vo.getCommissionBizType());
+        dto.setCommissionBizType("R".equals(vo.getCommissionBizType()) ? "关联保单应收单" : "非关联保单应收单");
         dto.setPolicyNo(vo.getPolicyNo());
         dto.setPolicyNo(vo.getPolicyNo());
         dto.setReconciliationCompany(vo.getReconciliationCompany());
         dto.setReconciliationCompany(vo.getReconciliationCompany());
         dto.setCommissionPeriod(vo.getCommissionPeriod());
         dto.setCommissionPeriod(vo.getCommissionPeriod());