From bcded7bca609a0709f7e9a978902e25f93798f55 Mon Sep 17 00:00:00 2001 From: baozhipeng <961815525@qq.com> Date: Fri, 10 Sep 2021 16:33:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/contract/entity/PayIncomeContract.java | 15 ++++++--------- .../entity/PayIncomeContractInstallment.java | 9 +++------ .../jero/contract/entity/PaySpendingContract.java | 7 ++----- .../entity/PaySpendingContractInstallment.java | 9 +++------ .../java/com/jero/mail/entity/PayMailBill.java | 15 +++++++++++++-- .../member/entity/TbMemberProjectSubitem.java | 5 +++-- .../member/vo/PayMemberProjectSubitemExcel.java | 2 +- .../com/jero/payment/entity/PayPaymentRecord.java | 3 ++- .../com/jero/project/entity/PayCommonProject.java | 4 ++-- .../com/jero/project/entity/PayWorkingGroup.java | 9 +++------ .../project/entity/PayWorkingGroupSubItem.java | 11 ++++------- .../java/com/jero/project/vo/SetChargeInput.java | 8 +++----- 12 files changed, 45 insertions(+), 52 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java index 98cce9e3..166c9bf7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java @@ -16,10 +16,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import javax.validation.constraints.Max; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import javax.validation.constraints.*; /** * @Description: pay_income_contract @@ -108,7 +105,7 @@ public class PayIncomeContract implements Serializable { @Excel(name = "签订合同金额", width = 15) @ApiModelProperty(value = "签订合同金额") @NotNull(message = "签订合同金额不能为空!") - @Max(value = 999999999,message = "签订合同金额格式错误") + @DecimalMax(value = "9999999999.99",message = "签订合同金额格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal contractAmount; /**税率*/ @@ -122,7 +119,7 @@ public class PayIncomeContract implements Serializable { @Excel(name = "未税金额", width = 15) @ApiModelProperty(value = "未税金额") @NotNull(message = "未税金额不能为空!") - @Max(value = 999999999,message = "未税金额格式错误") + @DecimalMax(value = "9999999999.99",message = "未税金额格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal noTaxAmount; /**合同签订日期*/ @@ -146,20 +143,20 @@ public class PayIncomeContract implements Serializable { @Excel(name = "应收金额", width = 15) @ApiModelProperty(value = "应收金额") @NotNull(message = "应收金额不能为空!") - @Max(value = 999999999,message = "应收金额格式错误") + @DecimalMax(value = "9999999999.99",message = "应收金额格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal accountsReceivableAmount; /**已收金额*/ @Excel(name = "已收金额", width = 15) @ApiModelProperty(value = "已收金额") @NotNull(message = "已收金额不能为空!") - @Max(value = 999999999,message = "已收金额格式错误") + @DecimalMax(value = "9999999999.99",message = "已收金额格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal amountReceived; /**未收金额*/ @Excel(name = "未收金额", width = 15) @ApiModelProperty(value = "未收金额") - @Max(value = 999999999,message = "未收金额格式错误") + @DecimalMax(value = "9999999999.99",message = "未收金额格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal outstandingAmount; /**账款状态（1：未支付，2：部分支付，3：已付全款）*/ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractInstallment.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractInstallment.java index 0fe5ee07..1950e715 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractInstallment.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractInstallment.java @@ -15,10 +15,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import javax.validation.constraints.Max; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import javax.validation.constraints.*; /** * @Description: pay_income_contract_installment @@ -53,7 +50,7 @@ public class PayIncomeContractInstallment implements Serializable { @Excel(name = "应收金额", width = 15) @ApiModelProperty(value = "应收金额") @NotNull(message = "应收金额不能为空") - @Max(value = 999999999,message = "应收金额格式错误") + @DecimalMax(value = "9999999999.99",message = "应收金额格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal accountsReceivableAmount; /**应收时间*/ @@ -65,7 +62,7 @@ public class PayIncomeContractInstallment implements Serializable { /**实收金额*/ @Excel(name = "实收金额", width = 15) @ApiModelProperty(value = "实收金额") - @Max(value = 999999999,message = "实收金额格式错误") + @DecimalMax(value = "9999999999.99",message = "实收金额格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal paidAmount; /**实收时间*/ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java index 23bf5b1d..81282f0d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java @@ -16,10 +16,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import javax.validation.constraints.Max; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import javax.validation.constraints.*; /** * @Description: pay_spending_contract @@ -100,7 +97,7 @@ public class PaySpendingContract implements Serializable { @Excel(name = "签订合同总金额", width = 15) @ApiModelProperty(value = "签订合同总金额") @NotNull(message = "签订合同金额不能为空!") - @Max(value = 999999999,message = "签订合同金额格式错误") + @DecimalMax(value = "9999999999.99",message = "签订合同金额格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal contractAmount; /**税率*/ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java index 1ce18d5e..b035cb40 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java @@ -15,10 +15,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import javax.validation.constraints.Max; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import javax.validation.constraints.*; /** * @Description: pay_spending_contract_installment @@ -53,7 +50,7 @@ public class PaySpendingContractInstallment implements Serializable { @Excel(name = "应收金额", width = 15) @ApiModelProperty(value = "应收金额") @NotNull(message = "应收金额不能为空") - @Max(value = 999999999,message = "应收金额格式错误") + @DecimalMax(value = "9999999999.99",message = "应收金额格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal accountsReceivableAmount; /**应收时间*/ @@ -66,7 +63,7 @@ public class PaySpendingContractInstallment implements Serializable { @Excel(name = "实收金额", width = 15) @ApiModelProperty(value = "实收金额") @NotNull(message = "实收金额不能为空") - @Max(value = 999999999,message = "应收金额格式错误") + @DecimalMax(value = "9999999999.99",message = "应收金额格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal paidAmount; /**实收时间*/ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java index 5582c348..c4ae8d4d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java @@ -1,6 +1,8 @@ package com.jero.mail.entity; import java.io.Serializable; +import java.math.BigDecimal; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -14,6 +16,9 @@ import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import javax.validation.constraints.DecimalMax; +import javax.validation.constraints.NotNull; + /** * @Description: pay_mail_bill * @Author: jeecg-boot @@ -51,11 +56,14 @@ public class PayMailBill implements Serializable { /**票号*/ @Excel(name = "票号", width = 15) @ApiModelProperty(value = "票号") + @NotNull(message = "票号不能为空") private java.lang.String billNo; /**开票金额*/ @Excel(name = "开票金额", width = 15) @ApiModelProperty(value = "开票金额") - private java.lang.Integer invoiceAmount; + @NotNull(message = "开票金额不能为空") + @DecimalMax(value = "9999999999.99", message = "开票金额格式错误") + private BigDecimal invoiceAmount; /**邮寄状态(0:未邮寄，1::已邮寄)*/ @Dict(dicCode = "mail_type") @Excel(name = "邮寄状态(0:未邮寄，1::已邮寄)", width = 15) @@ -82,6 +90,7 @@ public class PayMailBill implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "开票时间") + @NotNull(message = "开票时间不能为空") private java.util.Date billDate; /**邮寄时间*/ @Excel(name = "邮寄时间", width = 15, format = "yyyy-MM-dd") @@ -94,11 +103,13 @@ public class PayMailBill implements Serializable { @ApiModelProperty(value = "备注") private java.lang.String remark; /**项目名称*/ - @Excel(name = "来款项目", width = 15) + @Excel(name = "项目名称", width = 15) @ApiModelProperty(value = "项目名称") + @NotNull(message = "项目名称不能为空") private java.lang.String projectName; /**来款单位*/ @Excel(name = "来款单位", width = 15) @ApiModelProperty(value = "来款单位") + @NotNull(message = "来款单位不能为空") private java.lang.String chargeCompanyName; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java index 93ea9623..4cfb5c92 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java @@ -17,6 +17,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import javax.validation.constraints.DecimalMax; import javax.validation.constraints.Max; import javax.validation.constraints.NotNull; @@ -118,7 +119,7 @@ public class TbMemberProjectSubitem implements Serializable { @Excel(name = "应收金额", width = 15) @ApiModelProperty(value = "应收金额") @NotNull(message = "应收金额不能为空") - @Max(value = 999999999, message = "应收金额格式错误") + @DecimalMax(value = "9999999999.99", message = "应收金额格式错误") private BigDecimal amountReceivable; /** @@ -126,7 +127,7 @@ public class TbMemberProjectSubitem implements Serializable { */ @Excel(name = "实收金额", width = 15) @ApiModelProperty(value = "实收金额") - @Max(value = 999999999, message = "实收金额格式错误") + @DecimalMax(value = "9999999999.99", message = "实收金额格式错误") private BigDecimal paidAmount; /**打包*/ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/PayMemberProjectSubitemExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/PayMemberProjectSubitemExcel.java index 837fe6e5..1ccf41a8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/PayMemberProjectSubitemExcel.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/PayMemberProjectSubitemExcel.java @@ -63,7 +63,7 @@ public class PayMemberProjectSubitemExcel { @Excel(name = "应收金额", width = 15,orderNum = "4") @ApiModelProperty(value = "应收金额") @NotNull(message = "应收金额不能为空") - @Max(value = 999999999, message = "应收金额格式错误") + @DecimalMax(value = "9999999999.99", message = "应收金额格式错误") private String amountReceivable; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java index 5ec4f6f2..5ca229af 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java @@ -15,6 +15,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import javax.validation.constraints.DecimalMax; import javax.validation.constraints.Max; import javax.validation.constraints.NotNull; @@ -45,7 +46,7 @@ public class PayPaymentRecord implements Serializable { /**到账金额*/ @ApiModelProperty(value = "到账金额") @NotNull(message = "到账金额（元）不能为空！") - @Max(value = 999999999,message = "到账金额（元）格式错误") + @DecimalMax(value = "9999999999.99",message = "到账金额（元）格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal amountReceived; /**来款日期*/ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java index 344b97d1..1193e91f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java @@ -100,13 +100,13 @@ public class PayCommonProject implements Serializable { @Excel(name = "应收金额（元）", width = 15) @ApiModelProperty(value = "应收金额（元）") @NotNull(message = "应收金额（元）不能为空！") - @Max(value = 999999999,message = "应收金额（元）格式错误") + @DecimalMax(value = "9999999999.99",message = "应收金额（元）格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal receivableAmount; /**实收金额（元）*/ @Excel(name = "实收金额（元）", width = 15) @ApiModelProperty(value = "实收金额（元）") - @Max(value = 999999999,message = "实收金额（元）格式错误") + @DecimalMax(value = "9999999999.99",message = "实收金额（元）格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal paidAmount; /**邮寄联系人id*/ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java index 738f1a72..64b52414 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java @@ -16,10 +16,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import javax.validation.constraints.Max; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; +import javax.validation.constraints.*; /** * @Description: pay_working_group @@ -83,7 +80,7 @@ public class PayWorkingGroup implements Serializable { /**本年应收款A（元）*/ @Excel(name = "本年应收款A（元）", width = 15) @ApiModelProperty(value = "本年应收款A（元）") - @Max(value = 999999999,message = "本年应收款A（元）格式错误") + @DecimalMax(value = "9999999999.99",message = "本年应收款A（元）格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal yearChargeA; /**收费通知号A*/ @@ -99,7 +96,7 @@ public class PayWorkingGroup implements Serializable { /**本年应收款B（元）*/ @Excel(name = "本年应收款B（元）", width = 15) @ApiModelProperty(value = "本年应收款B（元）") - @Max(value = 999999999,message = "本年应收款B（元）格式错误") + @DecimalMax(value = "9999999999.99",message = "本年应收款B（元）格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal yearChargeB; /**收费通知号B*/ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java index 4fcea675..b60e8da0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java @@ -16,10 +16,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import javax.validation.constraints.Max; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import javax.validation.constraints.*; /** * @Description: pay_working_group_subitem @@ -95,12 +92,12 @@ public class PayWorkingGroupSubItem implements Serializable { /**应收金额（元）*/ @Excel(name = "应收金额（元）", width = 15) @ApiModelProperty(value = "应收金额（元）") - @Max(value = 999999999,message = "应收金额（元）格式错误") + @DecimalMax(value = "9999999999.99",message = "应收金额（元）格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal receivableAmount; /**实收金额（元）*/ @ApiModelProperty(value = "实收金额（元）") - @Max(value = 999999999,message = "实收金额（元）格式错误") + @DecimalMax(value = "9999999999.99",message = "实收金额（元）格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal paidAmount; /**来款用途（字典表）*/ @@ -158,7 +155,7 @@ public class PayWorkingGroupSubItem implements Serializable { private java.lang.Integer mail; /**催款次数*/ @ApiModelProperty(value = "催款次数") - @Max(value = 999999999,message = "催款次数格式错误") + @DecimalMax(value = "9999999999.99",message = "催款次数格式错误") private java.lang.Integer pressMoneyTimes; /**备注*/ @Excel(name = "备注", width = 15) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/SetChargeInput.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/SetChargeInput.java index 1b4a5f33..76fac518 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/SetChargeInput.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/SetChargeInput.java @@ -2,10 +2,8 @@ package com.jero.project.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.Max; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; + +import javax.validation.constraints.*; import java.io.Serializable; import java.util.List; @@ -19,7 +17,7 @@ public class SetChargeInput implements Serializable { private String ids; /**应收金额（元）*/ @ApiModelProperty(value = "应收金额（元）") - @Max(value = 999999999,message = "应收金额（元）格式错误") + @DecimalMax(value = "9999999999.99",message = "应收金额（元）格式错误") @NotNull(message = "应收金额（元）不能为空！") private Integer receivableAmount; /**收费通知号*/