款项确认问题修改

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<String> payConfirmFiles;
+    private List<String> 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<String> payFiles;
 
     @ApiModelProperty("款项明细")
-    private List<AppFinSelectedReceivablesDetailedDto> paymentDetail;
+    private List<AppFinSelectedReceivablesDetailedDto> contractList;
 
     @ApiModelProperty("余额")
     private String balance;

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<String> payConfirmFiles;
+    private List<String> payConfirmFiles = new ArrayList<>();
 
     @ApiModelProperty("付款金额")
     private String paymentMoney;
@@ -54,10 +55,10 @@ public class ConfirmationInitVo implements Vo {
     private String collectionTypeKey;
 
     @ApiModelProperty("打款凭证")
-    private List<String> payFiles;
+    private List<String> payFiles = new ArrayList<>() ;
 
     @ApiModelProperty("款项明细")
-    private List<AppFinSelectedReceivablesDetailedDto> paymentDetail;
+    private List<AppFinSelectedReceivablesDetailedDto> contractList = new ArrayList<>();
 
     @ApiModelProperty("余额")
     private String balance;

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;
+
 }