diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java index ff059009..304f197d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java @@ -80,11 +80,11 @@ public class PayIncomeContractCommon { */ public final static List LIST_SPENDING_CONTRACT = Arrays.asList("合同编号","合同名称","签订单位","签订联系人","是否开口","负责人", "部门名称","签订合同总金额","税率","未税金额","合同签订日期","合同终止日期","合同约定主要时点", - "应收金额","已收金额","未收金额","账款状态","合同约定付款次数","是否打包","打包年份"); + "应付金额","已付金额","未付金额","账款状态","合同约定付款次数","是否打包","打包年份"); /** * 支出合同分期信息excel 表头 */ - public final static List LIST_SPENDING_CONTRACT_INSTALLMENT = Arrays.asList("阶段","阶段应收","阶段应收时间","阶段实收","阶段实收时间"); + public final static List LIST_SPENDING_CONTRACT_INSTALLMENT = Arrays.asList("阶段","阶段应付","阶段应付时间","阶段实付","阶段实付时间"); /** * 来源(1:收入合同,2:打包管理) 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 a6af2b0d..39051857 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 @@ -134,25 +134,25 @@ public class PaySpendingContract implements Serializable { @ApiModelProperty(value = "合同约定主要时点") @Size(max = 200, message = "合同约定主要时点不能大于200个字符") private String contractTimePoints; - /**应收金额*/ - @Excel(name = "应收金额", width = 15) - @ApiModelProperty(value = "应收金额") - @NotNull(message = "应收金额不能为空") + /**应付金额*/ + @Excel(name = "应付金额", width = 15) + @ApiModelProperty(value = "应付金额") + @NotNull(message = "应付金额不能为空") @JsonFormat(shape = JsonFormat.Shape.STRING) - @DecimalMax(value = "9999999999.99",message = "应收金额格式错误") + @DecimalMax(value = "9999999999.99",message = "应付金额格式错误") private BigDecimal accountsReceivableAmount; - /**已收金额*/ - @Excel(name = "已收金额", width = 15) - @ApiModelProperty(value = "已收金额") - @NotNull(message = "已收金额不能为空") + /**已付金额*/ + @Excel(name = "已付金额", width = 15) + @ApiModelProperty(value = "已付金额") + @NotNull(message = "已付金额不能为空") @JsonFormat(shape = JsonFormat.Shape.STRING) - @DecimalMax(value = "9999999999.99",message = "已收金额格式错误") + @DecimalMax(value = "9999999999.99",message = "已付金额格式错误") private BigDecimal amountReceived; - /**未收金额*/ - @Excel(name = "未收金额", width = 15) - @ApiModelProperty(value = "未收金额") + /**未付金额*/ + @Excel(name = "未付金额", width = 15) + @ApiModelProperty(value = "未付金额") @JsonFormat(shape = JsonFormat.Shape.STRING) - @DecimalMax(value = "9999999999.99",message = "未收金额格式错误") + @DecimalMax(value = "9999999999.99",message = "未付金额格式错误") private BigDecimal outstandingAmount; /**账款状态(1:未支付,2:部分支付,3:已付全款)*/ @Excel(name = "账款状态(1:未支付,2:部分支付,3:已付全款)", width = 15) 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 eb3d8d60..e3ec4ae0 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 @@ -47,30 +47,30 @@ public class PaySpendingContractInstallment implements Serializable { @NotEmpty(message = "阶段不能为空") @Size(max = 50, message = "阶段长度不能大于50个字符") private String phaseName; - /**应收金额*/ - @Excel(name = "阶段应收金额", width = 15) - @ApiModelProperty(value = "应收金额") - @NotNull(message = "阶段应收不能为空") - @DecimalMax(value = "9999999999.99",message = "阶段应收格式错误") + /**应付金额*/ + @Excel(name = "阶段应付金额", width = 15) + @ApiModelProperty(value = "应付金额") + @NotNull(message = "阶段应付不能为空") + @DecimalMax(value = "9999999999.99",message = "阶段应付格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal accountsReceivableAmount; - /**应收时间*/ - @Excel(name = "阶段应收时间", width = 15, format = "yyyy-MM-dd") + /**应付时间*/ + @Excel(name = "阶段应付时间", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "应收时间") + @ApiModelProperty(value = "应付时间") private Date accountsReceivableTime; - /**实收金额*/ - @Excel(name = "阶段实收金额", width = 15) - @ApiModelProperty(value = "阶段实收金额") - @DecimalMax(value = "9999999999.99",message = "阶段实收格式错误") + /**实付金额*/ + @Excel(name = "阶段实付金额", width = 15) + @ApiModelProperty(value = "阶段实付金额") + @DecimalMax(value = "9999999999.99",message = "阶段实付格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal paidAmount; - /**实收时间*/ - @Excel(name = "实收时间", width = 15, format = "yyyy-MM-dd") + /**实付时间*/ + @Excel(name = "实付时间", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "实收时间") + @ApiModelProperty(value = "实付时间") private Date paidTime; /**创建人*/ @ApiModelProperty(value = "创建人") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java index f616ed7e..af8fa356 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java @@ -97,6 +97,12 @@ public class PayPackCompanyController extends JeroController