diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyList.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyList.java index 0595d3ed..2598e8b0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyList.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyList.java @@ -26,6 +26,10 @@ public class CompanyComeMoneyList { @ApiModelProperty(value = "确认收入金额") private String confirmAmount; + @Excel(name = "确收率", width = 15) + @ApiModelProperty(value = "确收率") + private String finishRate; + @Excel(name = "开票金额", width = 15) @ApiModelProperty(value = "开票金额") private String billMoney; @@ -34,7 +38,5 @@ public class CompanyComeMoneyList { @ApiModelProperty(value = "到账总金额") private String comeAllMoney; - @Excel(name = "确收率", width = 15) - @ApiModelProperty(value = "确收率") - private String finishRate; + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/DepartStatistics.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/DepartStatistics.java index d543bff1..fbdcee57 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/DepartStatistics.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/DepartStatistics.java @@ -22,6 +22,10 @@ public class DepartStatistics { @ApiModelProperty(value = "确认收入金额") private String confirmAmount; + @Excel(name = "确收率", width = 15) + @ApiModelProperty(value = "确收率") + private String finishRate; + @Excel(name = "开票金额", width = 15) @ApiModelProperty(value = "开票金额") private String billMoney; @@ -30,9 +34,7 @@ public class DepartStatistics { @ApiModelProperty(value = "到账总金额") private String comeAllMoney; - @Excel(name = "确收率", width = 15) - @ApiModelProperty(value = "确收率") - private String finishRate; + }