From c65a9fe3ad66def6145d47e47228e7c5c50e0df2 Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Tue, 18 Oct 2022 17:43:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=A1=AE=E8=AE=A4=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collectionConfirm/ConfirmationDto.java | 26 +++++++++------- .../collectionConfirm/ConfirmationInitVo.java | 7 +++-- .../collectionConfirm/ConfirmationPageVo.java | 30 ++++++++++++------- 3 files changed, 39 insertions(+), 24 deletions(-) diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDto.java index f94197c797..8c6f63a12d 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDto.java @@ -1,11 +1,13 @@ package com.yxt.anrui.terminal.api.finance.collectionConfirm; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.AppFinSelectedReceivablesDetailedDto; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; @Data @@ -22,43 +24,47 @@ public class ConfirmationDto implements Dto { private String collectionBankKey; @ApiModelProperty("汇款确认") - private List payConfirmFiles; + private List payConfirmFiles = new ArrayList<>(); @ApiModelProperty("付款金额") - private BigDecimal paymentMoney; + @JsonProperty("paymentMoney") + private BigDecimal collectionMoney; @ApiModelProperty("收款日期") private String collectionDate; @ApiModelProperty("付款方名称") - private String paymentName; + @JsonProperty("paymentName") + private String payerName; @ApiModelProperty("收款账号") - private String collectionNum; + @JsonProperty("collectionNum") + private String collectionBankNum; @ApiModelProperty("收款账号key") - private String collectionNumKey; + @JsonProperty("collectionNumKey") + private String collectionBankNumKey; @ApiModelProperty("收款记录sid") + @JsonProperty("collectionBillSid") private String collectionBillSid; - @ApiModelProperty("下载模板") - private String downLoadUrl; - @ApiModelProperty("备注") private String remarks; @ApiModelProperty("收款方式") - private String collectionType; + @JsonProperty("collectionType") + private String collectionTypeValue; @ApiModelProperty("收款方式key") + @JsonProperty("collectionTypeKey") private String collectionTypeKey; @ApiModelProperty("打款凭证") private List payFiles; @ApiModelProperty("款项明细") - private List paymentDetail; + private List contractList; @ApiModelProperty("余额") private String balance; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationInitVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationInitVo.java index ad3398641b..186e557021 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationInitVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationInitVo.java @@ -5,6 +5,7 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; @Data @@ -21,7 +22,7 @@ public class ConfirmationInitVo implements Vo { private String collectionBankKey; @ApiModelProperty("汇款确认") - private List payConfirmFiles; + private List payConfirmFiles = new ArrayList<>(); @ApiModelProperty("付款金额") private String paymentMoney; @@ -54,10 +55,10 @@ public class ConfirmationInitVo implements Vo { private String collectionTypeKey; @ApiModelProperty("打款凭证") - private List payFiles; + private List payFiles = new ArrayList<>() ; @ApiModelProperty("款项明细") - private List paymentDetail; + private List contractList = new ArrayList<>(); @ApiModelProperty("余额") private String balance; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationPageVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationPageVo.java index 5bb1bccfbc..4b5978a332 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationPageVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationPageVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.finance.collectionConfirm; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -10,31 +11,38 @@ public class ConfirmationPageVo implements Vo { private static final long serialVersionUID = -4426699322787264581L; @ApiModelProperty("确认单sid") - private String collectionBillSid; + @JsonProperty("collectionBillSid") + private String sid; @ApiModelProperty("收款账号") - private String collectionNum; - @ApiModelProperty("状态") - private String collectionBillState; + @JsonProperty("collectionNum") + private String collectionBankNum; + + @ApiModelProperty("审核状态") + @JsonProperty("collectionBillState") + private String auditState; + @ApiModelProperty("收款银行") private String collectionBank; @ApiModelProperty("收款类型") - private String collectionType; + @JsonProperty("collectionType") + private String collectionTypeValue; @ApiModelProperty("收款时间") private String collectionDate; - @ApiModelProperty("付款人") - private String paymentName; @ApiModelProperty("收款金额") private String collectionMoney; + @ApiModelProperty("付款人") + @JsonProperty("paymentName") + private String payerName; @ApiModelProperty("备注") private String remarks; - @ApiModelProperty("余额") - private Integer balance; + @ApiModelProperty("认款状态") + @JsonProperty("state") + private String paymentState; @ApiModelProperty("是否显示办理") private boolean showHandle; @ApiModelProperty("是否显示下载") private boolean showDownload; @ApiModelProperty("是否显示删除") private boolean showDelete; - @ApiModelProperty("认款状态") - private String state; + }