修改出纳款项列表字段

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

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

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

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<FinPaymentapplyMa
                         finPaymentrecordDto.setCostTypeValue(finPaymentapplyDetailVo.getCostTitleValue());
                         if ("009".equals(finPaymentapplyDetailVo.getCostTitleKey())) {
                             String paymentAccessNoKey = baseManufacturerBankFeign.selectPaymentAccessNoKey(finPaymentapply.getCarBrandSid(), finPaymentapplyDetailVo.getActualPay()).getData();
-                            finPaymentrecordDto.setPayChannel(paymentAccessNoKey);
+                            finPaymentrecordDto.setDictKey(paymentAccessNoKey);
-                            finPaymentrecordDto.setPayCostType("payChannel");
+                            finPaymentrecordDto.setDictTypeCode("payChannel");
                         } else {
-                            finPaymentrecordDto.setPayChannel(finPaymentapplyDetailVo.getCostTitleKey());
+                            finPaymentrecordDto.setDictKey(finPaymentapplyDetailVo.getCostTitleKey());
-                            finPaymentrecordDto.setPayCostType("payCostType");
+                            finPaymentrecordDto.setDictTypeCode("payCostType");
                         }
                         finPaymentrecordDto.setFinDataType(0);
                         //款项详情

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -682,15 +682,8 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
 //            }
 //            apPayBill.setF_PAEZ_AssistantType("payChannel");
 //        }
-        if (StringUtils.isNotBlank(finPaymentrecord.getPayCostType())) {
+        apPayBill.setF_PAEZ_AssistantKey(finPaymentrecord.getDictKey());
-            apPayBill.setF_PAEZ_AssistantKey(finPaymentrecord.getPayCostType());
+        apPayBill.setF_PAEZ_AssistantType(finPaymentrecord.getDictTypeCode());
-            apPayBill.setF_PAEZ_AssistantType("payCostType");
-        }
-        if (StringUtils.isNotBlank(finPaymentrecord.getPayChannel())) {
-            apPayBill.setF_PAEZ_AssistantKey(finPaymentrecord.getPayChannel());
-            apPayBill.setF_PAEZ_AssistantType("payChannel");
-        }
-
         List<ApPayBill.FPAYBILLENTRY> FPAYBILLENTRYs = new ArrayList<>();
         if (finPaymentrecord.getCost() != null
                 && finPaymentrecord.getCost().compareTo(BigDecimal.ZERO) > 0) {