diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSearch.java index 965678c5..d5e38f9c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSearch.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSearch.java @@ -18,14 +18,13 @@ public class PayWorkingGroupSearch { @ApiModelProperty(value = "工作组") private String workGroup; - @DecimalMax(value = "9999999999.99",message = "应收总金额(元)格式错误") - @JsonFormat(shape = JsonFormat.Shape.STRING) + @ApiModelProperty(value = "应收总金额") - private BigDecimal allMoney; - @DecimalMax(value = "9999999999.99",message = "应收总金额(元)格式错误") - @JsonFormat(shape = JsonFormat.Shape.STRING) + private String allMoney; + @ApiModelProperty(value = "应收总金额范围") - private BigDecimal allMoneyTwo; + private String allMoneyTwo; + @ApiModelProperty(value = "来款年份") private String year; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSerach.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSerach.java index e50e8540..c6ea9cc4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSerach.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSerach.java @@ -16,14 +16,12 @@ public class PayWorkingGroupSerach { @ApiModelProperty(value = "工作组") private String workGroup; - @DecimalMax(value = "9999999999.99",message = "应收总金额(元)格式错误") - @JsonFormat(shape = JsonFormat.Shape.STRING) + @ApiModelProperty(value = "应收总金额") - private BigDecimal allMoney; - @DecimalMax(value = "9999999999.99",message = "应收总金额(元)格式错误") - @JsonFormat(shape = JsonFormat.Shape.STRING) + private String allMoney; + @ApiModelProperty(value = "应收总金额范围") - private BigDecimal allMoneyTwo; + private String allMoneyTwo; @ApiModelProperty(value = "来款年份") private int year; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubletSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubletSearch.java index 77cf44cc..070ad5f2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubletSearch.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubletSearch.java @@ -21,15 +21,13 @@ public class PayWorkingGroupSubletSearch { @ApiModelProperty(value = "来款单位") private String chargeCompanyTemporaryName; - @DecimalMax(value = "9999999999.99",message = "应收总金额(元)格式错误") - @JsonFormat(shape = JsonFormat.Shape.STRING) - @ApiModelProperty(value = "应收总金额") - private BigDecimal allMoney; - @DecimalMax(value = "9999999999.99",message = "应收总金额(元)格式错误") - @JsonFormat(shape = JsonFormat.Shape.STRING) + @ApiModelProperty(value = "应收总金额") + private String allMoney; + + @ApiModelProperty(value = "应收总金额范围") - private BigDecimal allMoneyTwo; + private String allMoneyTwo; @ApiModelProperty(value = "来款年份") private String year; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatisticsSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatisticsSearch.java index 66111e0c..e59d3b30 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatisticsSearch.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatisticsSearch.java @@ -20,15 +20,13 @@ public class AllProjectStatisticsSearch { @ApiModelProperty(value = "来款单位") private String chargeCompanyTemporaryName; - @DecimalMax(value = "9999999999.99",message = "应收总金额(元)格式错误") - @JsonFormat(shape = JsonFormat.Shape.STRING) - @ApiModelProperty(value = "应收总金额") - private BigDecimal allMoney; - @DecimalMax(value = "9999999999.99",message = "应收总金额(元)格式错误") - @JsonFormat(shape = JsonFormat.Shape.STRING) + @ApiModelProperty(value = "应收总金额") + private String allMoney; + + @ApiModelProperty(value = "应收总金额范围") - private BigDecimal allMoneyTwo; + private String allMoneyTwo; @ApiModelProperty(value = "来款年份") private String year; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetailSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetailSearch.java index b7f753e7..b95c6937 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetailSearch.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetailSearch.java @@ -30,13 +30,11 @@ public class CompanyComeMoneyDetailSearch { @ApiModelProperty(value = "付款状态") private String inAccountStatue; - @DecimalMax(value = "9999999999.99",message = "应收总金额(元)格式错误") - @JsonFormat(shape = JsonFormat.Shape.STRING) - @ApiModelProperty(value = "应收总金额") - private BigDecimal allMoney; - @DecimalMax(value = "9999999999.99",message = "应收总金额(元)格式错误") - @JsonFormat(shape = JsonFormat.Shape.STRING) + @ApiModelProperty(value = "应收总金额") + private String allMoney; + + @ApiModelProperty(value = "应收总金额范围") - private BigDecimal allMoneyTwo; + private String allMoneyTwo; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneySearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneySearch.java index 87347658..64eb95cd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneySearch.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneySearch.java @@ -21,14 +21,12 @@ public class CompanyComeMoneySearch { @ApiModelProperty(value = "来款年份") private String year; - @DecimalMax(value = "9999999999.99",message = "应收总金额(元)格式错误") - @JsonFormat(shape = JsonFormat.Shape.STRING) - @ApiModelProperty(value = "应收总金额") - private BigDecimal allMoney; - @DecimalMax(value = "9999999999.99",message = "应收总金额(元)格式错误") - @JsonFormat(shape = JsonFormat.Shape.STRING) + @ApiModelProperty(value = "应收总金额") + private String allMoney; + + @ApiModelProperty(value = "应收总金额范围") - private BigDecimal allMoneyTwo; + private String allMoneyTwo; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetailSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetailSearch.java index 9ecca263..9f1196fe 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetailSearch.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetailSearch.java @@ -31,14 +31,11 @@ public class PrincipalPeopleDetailSearch { @ApiModelProperty(value = "付款状态") private String inAccountStatue; - @DecimalMax(value = "9999999999.99",message = "应收总金额(元)格式错误") - @JsonFormat(shape = JsonFormat.Shape.STRING) @ApiModelProperty(value = "应收总金额") - private BigDecimal allMoney; + private String allMoney; + - @DecimalMax(value = "9999999999.99",message = "应收总金额(元)格式错误") - @JsonFormat(shape = JsonFormat.Shape.STRING) @ApiModelProperty(value = "应收总金额范围") - private BigDecimal allMoneyTwo; + private String allMoneyTwo; }