应收应付导出数据调整

src/main/java/com/ydtech/modules/inv/model/vo/ReceivableAndSettlementVo.java

@@ -21,14 +21,14 @@ public class ReceivableAndSettlementVo {
     @ExcelProperty(value = "渠道分类")
     private String channelClassification; // 渠道分类
 
-    @ApiModelProperty(value = "签约日期")
-    @ExcelProperty(value = "签约日期")
-    private String signDate; // 签约日期
-
     @ApiModelProperty(value = "渠道")
     @ExcelProperty(value = "渠道")
     private String channel; // 渠道
 
+    @ApiModelProperty(value = "签约日期")
+    @ExcelProperty(value = "签约日期")
+    private String signDate; // 签约日期
+
     @ApiModelProperty(value = "车牌号")
     @ExcelProperty(value = "车牌号")
     private String licenseNo; // 执照号
@@ -45,17 +45,18 @@ public class ReceivableAndSettlementVo {
     @ExcelProperty(value = "保险公司")
     private String insuranceCompany; // 保险公司
 
-    @ApiModelProperty(value = "部门id")
-    @ExcelProperty(value = "部门id")
-    private String insuranceDeptId; // 保险部门ID
+    @ApiModelProperty(value = "险种")
+    @ExcelProperty(value = "险种")
+    private String insuranceType; // 保险类型
 
     @ApiModelProperty(value = "保司结构")
     @ExcelProperty(value = "保司结构")
     private String insuranceDept; // 保司结构
 
-    @ApiModelProperty(value = "险种")
-    @ExcelProperty(value = "险种")
-    private String insuranceType; // 保险类型
+    @ApiModelProperty(value = "部门id")
+    @ExcelProperty(value = "部门id")
+    private String insuranceDeptId; // 保险部门ID
+
 
     @ApiModelProperty(value = "业务归属")
     @ExcelProperty(value = "业务归属")
@@ -65,45 +66,75 @@ public class ReceivableAndSettlementVo {
     @ExcelProperty(value = "交强保单号")
     private String jqPolicyId;
 
+    @ApiModelProperty(value = "商业保单号")
+    @ExcelProperty(value = "商业保单号")
+    private String syPolicyId;
+
+    @ApiModelProperty(value = "非车保单号")
+    @ExcelProperty(value = "非车保单号")
+    private String nonCarPolicyId;
+
     @ApiModelProperty(value = "交强险保费")
     @ExcelProperty(value = "交强险保费")
     private String jqPremiumTax; // 交强险税额
 
-    @ApiModelProperty(value = "交强险保费不含税")
-    @ExcelProperty(value = "交强险保费不含税")
-    private String jqPremium; // 交强险保费
-
-    @ApiModelProperty(value = "商业保单号")
-    @ExcelProperty(value = "商业保单号")
-    private String syPolicyId;
+    @ApiModelProperty(value = "车船税")
+    @ExcelProperty(value = "车船税")
+    private String taxAmount; // 税额
 
     @ApiModelProperty(value = "商业险保费")
     @ExcelProperty(value = "商业险保费")
     private String syPremiumTax; // 商业险税额
 
-    @ApiModelProperty(value = "商业险保费不含税")
-    @ExcelProperty(value = "商业险保费不含税")
-    private String syPremium; // 商业险保费
-
-    @ApiModelProperty(value = "非车保单号")
-    @ExcelProperty(value = "非车保单号")
-    private String nonCarPolicyId;
-
     @ApiModelProperty(value = "非车险保费")
     @ExcelProperty(value = "非车险保费")
     private String nonCarPremiumTax; // 非车险税额
 
-    @ApiModelProperty(value = "非车险保费不含税")
-    @ExcelProperty(value = "非车险保费不含税")
-    private String nonCarPremium; // 非车险保费
+    @ApiModelProperty(value = "最大交强险应付比例")
+    @ExcelProperty(value = "最大交强险应付比例")
+    private String maxJqReceivableRatio; // 最大交强险应收比例
+
+    @ApiModelProperty(value = "最大商业险应付比例")
+    @ExcelProperty(value = "最大商业险应付比例")
+    private String maxSyReceivableRatio; // 最大商业险应收比例
+
+    @ApiModelProperty(value = "最大非车险应付比例")
+    @ExcelProperty(value = "最大非车险应付比例")
+    private String maxNonCarReceivableRatio; // 最大非车险应收比例
+
+    @ApiModelProperty(value = "补贴比例")
+    @ExcelProperty(value = "补贴比例")
+    private String subsidyRatio; // 补贴比例
+
+    @ApiModelProperty(value = "补贴金额")
+    @ExcelProperty(value = "补贴金额")
+    private String subsidyAmount; // 补贴金额
+
+    @ApiModelProperty(value = "最大应付金额")
+    @ExcelProperty(value = "最大应付金额")
+    private String maxReceivable; // 最大应付金额
+
+    @ApiModelProperty(value = "结算金额")
+    @ExcelProperty(value = "结算金额")
+    private String settlementAmount;
 
     @ApiModelProperty(value = "代理结算时间")
     @ExcelProperty(value = "代理结算时间")
     private String agencySettlementTime; // 代理结算时间
 
-    @ApiModelProperty(value = "车船税")
-    @ExcelProperty(value = "车船税")
-    private String taxAmount; // 税额
+    @ApiModelProperty(value = "交强险保费不含税")
+    @ExcelProperty(value = "交强险保费不含税")
+    private String jqPremium; // 交强险保费
+
+    @ApiModelProperty(value = "商业险保费不含税")
+    @ExcelProperty(value = "商业险保费不含税")
+    private String syPremium; // 商业险保费
+
+
+    @ApiModelProperty(value = "非车险保费不含税")
+    @ExcelProperty(value = "非车险保费不含税")
+    private String nonCarPremium; // 非车险保费
+
 
     @ApiModelProperty(value = "交强险应收比例")
     @ExcelProperty(value = "交强险应收比例")
@@ -153,38 +184,10 @@ public class ReceivableAndSettlementVo {
     @ExcelProperty(value = "应收")
     private String receivable; // 应收
 
-    @ApiModelProperty(value = "补贴比例")
-    @ExcelProperty(value = "补贴比例")
-    private String subsidyRatio; // 补贴比例
-
-    @ApiModelProperty(value = "补贴金额")
-    @ExcelProperty(value = "补贴金额")
-    private String subsidyAmount; // 补贴金额
-
-    @ApiModelProperty(value = "最大交强险应付比例")
-    @ExcelProperty(value = "最大交强险应付比例")
-    private String maxJqReceivableRatio; // 最大交强险应收比例
-
-    @ApiModelProperty(value = "最大商业险应付比例")
-    @ExcelProperty(value = "最大商业险应付比例")
-    private String maxSyReceivableRatio; // 最大商业险应收比例
-
-    @ApiModelProperty(value = "最大非车险应付比例")
-    @ExcelProperty(value = "最大非车险应付比例")
-    private String maxNonCarReceivableRatio; // 最大非车险应收比例
-
-    @ApiModelProperty(value = "最大应付金额")
-    @ExcelProperty(value = "最大应付金额")
-    private String maxReceivable; // 最大应付金额
-
     @ApiModelProperty(value = "总应收金额")
     @ExcelProperty(value = "总应收金额")
     private String totalReceivableAmount;
 
-    @ApiModelProperty(value = "结算金额")
-    @ExcelProperty(value = "结算金额")
-    private String settlementAmount;
-
     @ApiModelProperty(value = "结算状态")
     @ExcelProperty(value = "结算状态")
     private String clearingState; // 结算状态