diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java index bb9897922c..64c373c7c2 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java @@ -109,9 +109,9 @@ public class FinPaymentrecord extends BaseEntity { @ApiModelProperty("推送财务数据类型(0付款单,1凭证)") private Integer finDataType; @ApiModelProperty("应付类别分类(dictTypeCode)") - private String payCostType; + private String dictTypeCode; @ApiModelProperty("款项类别key(dictKey对应财务应付类别编码)") - private String payChannel; + private String dictKey; @ApiModelProperty("批量处理编码") private String batchNumber; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDetailsVo.java index 4262d6e49c..87df0316a8 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDetailsVo.java @@ -88,9 +88,9 @@ public class FinPaymentrecordDetailsVo implements Vo { @ApiModelProperty("推送财务数据类型(0付款单,1凭证)") private Integer finDataType; @ApiModelProperty("应付类别分类(dictTypeCode)") - private String payCostType; + private String dictTypeCode; @ApiModelProperty("款项类别key(dictKey对应财务应付类别编码)") - private String payChannel; + private String dictKey; @ApiModelProperty("批量处理编码") private String batchNumber; } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java index 5dc009c5d2..d3d28fc762 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java @@ -94,9 +94,9 @@ public class FinPaymentrecordDto implements Dto { @ApiModelProperty("推送财务数据类型(0付款单,1凭证)") private Integer finDataType; @ApiModelProperty("应付类别分类(dictTypeCode)") - private String payCostType; + private String dictTypeCode; @ApiModelProperty("款项类别key(dictKey对应财务应付类别编码)") - private String payChannel; + private String dictKey; @ApiModelProperty("批量处理编码") private String batchNumber; } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java index a5c3d2416a..442aecfbed 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java @@ -664,11 +664,11 @@ public class FinPaymentapplyService extends MybatisBaseService FPAYBILLENTRYs = new ArrayList<>(); if (finPaymentrecord.getCost() != null && finPaymentrecord.getCost().compareTo(BigDecimal.ZERO) > 0) {