From d4e7d3e1d9ce9f9a5a8474f6c879f0cce577eb69 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 1 Jun 2023 15:44:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AC=A0=E6=AC=BE=E5=BC=80=E7=A5=A8=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E3=80=81=E4=BF=AE=E6=94=B9=E3=80=81=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E3=80=81=E5=9B=9E=E6=98=BE=E3=80=81=E9=94=80=E5=94=AE=E5=86=85?= =?UTF-8?q?=E5=8B=A4=E5=AE=A1=E6=89=B9=E7=A7=BB=E5=8A=A8=E7=AB=AFPC?= =?UTF-8?q?=E7=AB=AF=E6=B7=BB=E5=8A=A0=E6=AC=A0=E6=AC=BE=E9=A2=86=E7=A5=A8?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E7=9A=84=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinBillApplicationDetailsVo.java | 2 + .../FinBillApplicationDto.java | 2 + .../flowable/FinBillCompleteDto.java | 2 + .../api/finbillfile/FinAttachTypeEnum.java | 3 +- .../FinBillApplicationService.java | 75 ++++++++++++------- .../biz/finbillfile/FinBillFileMapper.java | 3 + .../biz/finbillfile/FinBillFileService.java | 4 + .../advanceInvoice/AdvanceInvoiceDto.java | 2 + .../advanceInvoice/AdvanceInvoiceInfoVo.java | 2 + .../advanceInvoice/flowable/qkkpDto.java | 2 + .../AppBusAdvanceGinvoiceapplyService.java | 28 +++++++ 11 files changed, 95 insertions(+), 30 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java index 40a1dfa0f0..3cfec08e7a 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java @@ -170,4 +170,6 @@ public class FinBillApplicationDetailsVo extends AppBillApplicationIInfoVo imple private List kpxxqrsApplicationAppendxs; // 开票信息确认书 @ApiModelProperty("车辆登记合同") private List cldjhtApplicationAppendxs; // 车辆登记合同 + @ApiModelProperty("欠款领票附件") + private List arrearsCollectionAppendxs; } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java index c65cd011f7..5638c52109 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java @@ -163,4 +163,6 @@ public class FinBillApplicationDto implements Dto { private List zjApplicationAppendxs = new ArrayList<>(); @ApiModelProperty("附件") private List fjApplicationAppendxs = new ArrayList<>(); + @ApiModelProperty("欠款领票附件") + private List arrearsCollectionAppendxs = new ArrayList<>(); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/flowable/FinBillCompleteDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/flowable/FinBillCompleteDto.java index 212ab78f63..dc7f4209e1 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/flowable/FinBillCompleteDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/flowable/FinBillCompleteDto.java @@ -49,4 +49,6 @@ public class FinBillCompleteDto implements Dto { private List zjApplicationAppendxs = new ArrayList<>(); @ApiModelProperty("附件") private List fjApplicationAppendxs = new ArrayList<>(); + @ApiModelProperty("欠款领票附件") + private List arrearsCollectionAppendxs = new ArrayList<>(); } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinAttachTypeEnum.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinAttachTypeEnum.java index 3640c4d1e1..849ef52b2e 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinAttachTypeEnum.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinAttachTypeEnum.java @@ -11,7 +11,8 @@ public enum FinAttachTypeEnum { KPXXQRS("002", "款项确认书"), CLDJHT("003", "车辆登记合同"), ZJ("004", "证件"), - FJ("005", "附件"); + FJ("005", "附件"), + QKLPFJ("006", "欠款领票附件"); /** * 附件类型 diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index 35d43960e6..9acaf01550 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -496,35 +496,6 @@ public class FinBillApplicationService extends MybatisBaseService trailerVoList = data.getList(); - for (TrailerVo trailerVo : trailerVoList) { - FinBillTrailerVo finBillTrailerVo = new FinBillTrailerVo(); - finBillTrailerVo.setBillAppSid(sid); - finBillTrailerVo.setVinNo(finBillVehicleVo.getVinNo()); - finBillTrailerVo.setGcVinNo(trailerVo.getTrailerVinNo()); - finBillTrailerVo.setBillTypeKey(finBillVehicleVo.getBillTypeKey()); - finBillTrailerVo.setBillTypeValue(finBillVehicleVo.getBillTypeValue()); - finBillTrailerVo.setOpenTickSid(finBillVehicleVo.getOpenTickSid()); - finBillTrailerVo.setOpenTickName(finBillVehicleVo.getOpenTickName()); - //根据挂车车架号查询挂车信息以及合格证照片路径 - BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(trailerVo.getTrailerVinNo()).getData(); - List commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData(); - List hgzImageUrls = new ArrayList<>(); - for (CommonAppendixVo commonAppendixVo : commonAppendixVos) { - if (commonAppendixVo.getAttachType().equals("挂车合格证照片")) { - hgzImageUrls.add(commonAppendixVo.getFileUrl()); - } - } - finBillTrailerVo.setHgzImageUrl(hgzImageUrls); - finBillTrailerVos.add(finBillTrailerVo); - } - } - vo.setFinBillTrailers(finBillTrailerVos); - }*/ List khkpsqsApplicationAppendxs = finBillFileService.fetchkhkpsqsBySid(sid); for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) { String fileUrl = khkpsqsApplicationAppendx.getFileUrl(); @@ -560,11 +531,19 @@ public class FinBillApplicationService extends MybatisBaseService arrearsCollectionAppendxs = finBillFileService.fetchqklpfjBySid(sid); + for (FinBillFileVo arrearsCollectionAppendx : arrearsCollectionAppendxs) { + String fileUrl = arrearsCollectionAppendx.getFileUrl(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + fileUrl = urlPrefix + fileUrl; + arrearsCollectionAppendx.setFileUrl(fileUrl); + } vo.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs); vo.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs); vo.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs); vo.setZjApplicationAppendxs(zjApplicationAppendxs); vo.setFjApplicationAppendxs(fjApplicationAppendxs); + vo.setArrearsCollectionAppendxs(arrearsCollectionAppendxs); return vo; } @@ -1463,6 +1442,7 @@ public class FinBillApplicationService extends MybatisBaseService kpxxqrsApplicationAppendxs = dto.getKpxxqrsApplicationAppendxs(); List cldjhtApplicationAppendxs = dto.getCldjhtApplicationAppendxs(); List zjApplicationAppendxs = dto.getZjApplicationAppendxs(); + List arrearsCollectionAppendxs = dto.getArrearsCollectionAppendxs(); if (StringUtils.isBlank(dtoSid)) {//新增 FinBillApplication finBillApplication = new FinBillApplication(); BeanUtil.copyProperties(dto, finBillApplication, "sid"); @@ -1575,6 +1555,18 @@ public class FinBillApplicationService extends MybatisBaseService 0) { + for (FinBillFileDto finBillFileDto : arrearsCollectionAppendxs) { + String filePath = finBillFileDto.getFileUrl(); + if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + finBillFileDto.setFileUrl(filePath); + finBillFileDto.setBillAppSid(finBillApplication.getSid()); + finBillFileDto.setAttachType(FinAttachTypeEnum.QKLPFJ.getAttachType()); + finBillFileService.saveOrUpdateDto(finBillFileDto); + } + } return rb.success().setMsg("保存成功").setData(finBillApplication.getSid()); } FinBillApplication finBillApplication = fetchBySid(dtoSid); @@ -1634,6 +1626,18 @@ public class FinBillApplicationService extends MybatisBaseService 0) { + for (FinBillFileDto finBillFileDto : arrearsCollectionAppendxs) { + String filePath = finBillFileDto.getFileUrl(); + if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + finBillFileDto.setFileUrl(filePath); + finBillFileDto.setBillAppSid(finBillApplication.getSid()); + finBillFileDto.setAttachType(FinAttachTypeEnum.QKLPFJ.getAttachType()); + finBillFileService.saveOrUpdateDto(finBillFileDto); + } + } finBillVehicleService.delByBillAppSid(dtoSid); for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) { FinBillVehicle finBillVehicle = new FinBillVehicle(); @@ -2044,6 +2048,7 @@ public class FinBillApplicationService extends MybatisBaseService kpxxqrsApplicationAppendxs = query.getKpxxqrsApplicationAppendxs(); List cldjhtApplicationAppendxs = query.getCldjhtApplicationAppendxs(); List zjApplicationAppendxs = query.getZjApplicationAppendxs(); + List arrearsCollectionAppendxs = query.getArrearsCollectionAppendxs(); if (zjApplicationAppendxs.size() == 0) { return rb.setMsg("证件不能为空"); } @@ -2132,6 +2137,18 @@ public class FinBillApplicationService extends MybatisBaseService 0) { + for (FinBillFileDto finBillFileDto : arrearsCollectionAppendxs) { + String filePath = finBillFileDto.getFileUrl(); + if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + finBillFileDto.setFileUrl(filePath); + finBillFileDto.setBillAppSid(businessSid); + finBillFileDto.setAttachType(FinAttachTypeEnum.QKLPFJ.getAttachType()); + finBillFileService.saveOrUpdateDto(finBillFileDto); + } + } //极光推送 finBillApplication = fetchBySid(businessSid); MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.java index a8672c199c..e241227366 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.java @@ -89,5 +89,8 @@ public interface FinBillFileMapper extends BaseMapper { @Select("select * from fin_bill_file where billAppSid = #{sid} and attachType = '005'") List fetchfjBySid(String sid); + @Select("select * from fin_bill_file where billAppSid = #{sid} and attachType = '006'") + List fetchqklpfjBySid(String sid); + List fetchFileByBillSid(@Param("sid") String sid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java index bd4143f675..9ba5589ee6 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java @@ -169,4 +169,8 @@ public class FinBillFileService extends MybatisBaseService fetchFileByBillSid(String sid) { return baseMapper.fetchFileByBillSid(sid); } + + public List fetchqklpfjBySid(String sid) { + return baseMapper.fetchqklpfjBySid(sid); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java index ed083af96b..ffbc7b5840 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java @@ -63,6 +63,8 @@ public class AdvanceInvoiceDto implements Dto { private List registerContractImages; @ApiModelProperty("确认书") private List invoiceApplyConfirmImages; + @ApiModelProperty("欠款领票附件") + private List arrearsCollectionAppendxs; @ApiModelProperty("用户sid") private String userSid; @ApiModelProperty("组织全路径") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java index 00632404b1..9058784e4b 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java @@ -68,6 +68,8 @@ public class AdvanceInvoiceInfoVo implements Vo { private List registerContractImages; @ApiModelProperty("确认书") private List invoiceApplyConfirmImages; + @ApiModelProperty("欠款领票附件") + private List arrearsCollectionAppendxs; @ApiModelProperty("用户sid") private String userSid; @ApiModelProperty("组织全路径") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/flowable/qkkpDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/flowable/qkkpDto.java index f6305d3588..9587b129f7 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/flowable/qkkpDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/flowable/qkkpDto.java @@ -47,6 +47,8 @@ public class qkkpDto implements Dto { private List registerContractImages = new ArrayList<>(); @ApiModelProperty("确认书") private List invoiceApplyConfirmImages = new ArrayList<>(); + @ApiModelProperty("欠款领票附件") + private List arrearsCollectionAppendxs = new ArrayList<>(); private String orgPath; diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java index dbb9a039b4..19ab87a43c 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java @@ -480,10 +480,12 @@ public class AppBusAdvanceGinvoiceapplyService { List invoiceApplyConfirmImages = dto.getInvoiceApplyConfirmImages();//开票信息确认书 List registerContractImages = dto.getRegisterContractImages();//车辆登记合同 List idCardImages = dto.getIdCardImages();//证件 + List arrearsCollectionAppendxs = dto.getArrearsCollectionAppendxs();//欠款领票附件 List khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息 List kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息 List cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息 List idCardImagesPC = new ArrayList<>();//证件 + List qklpfjImages = new ArrayList<>(); // 欠款领票附件 if (customerInvoiceApplyImages != null) { for (String customerInvoiceApplyImage : customerInvoiceApplyImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); @@ -512,10 +514,18 @@ public class AppBusAdvanceGinvoiceapplyService { idCardImagesPC.add(finBillFileDto); } } + if (arrearsCollectionAppendxs != null) { + for (String arrearsCollectionAppendx : arrearsCollectionAppendxs) { + FinBillFileDto finBillFileDto = new FinBillFileDto(); + finBillFileDto.setFileUrl(arrearsCollectionAppendx); + qklpfjImages.add(finBillFileDto); + } + } finBillApplicationDto.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs); finBillApplicationDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs); finBillApplicationDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs); finBillApplicationDto.setZjApplicationAppendxs(idCardImagesPC); + finBillApplicationDto.setArrearsCollectionAppendxs(qklpfjImages); ResultBean resultBean = finBillApplicationFeign.saveQK(finBillApplicationDto); return resultBean; } @@ -889,10 +899,12 @@ public class AppBusAdvanceGinvoiceapplyService { List kpxxqrsApplicationAppendxs = finBillApplicationDetailsVo.getKpxxqrsApplicationAppendxs(); List cldjhtApplicationAppendxs = finBillApplicationDetailsVo.getCldjhtApplicationAppendxs(); List zjApplicationAppendxs = finBillApplicationDetailsVo.getZjApplicationAppendxs(); + List arrearsCollectionAppendxs = finBillApplicationDetailsVo.getArrearsCollectionAppendxs(); List customerInvoiceApplyImages = new ArrayList<>();//客户开票申请书 List invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书 List registerContractImages = new ArrayList<>();//车辆登记合同 List idCardImages = new ArrayList<>(); + List qklpfjImages = new ArrayList<>();//欠款领票附件 if (zjApplicationAppendxs != null) { for (FinBillFileVo zjApplicationAppendx : zjApplicationAppendxs) { idCardImages.add(zjApplicationAppendx.getFileUrl()); @@ -913,10 +925,16 @@ public class AppBusAdvanceGinvoiceapplyService { registerContractImages.add(cldjhtApplicationAppendx.getFileUrl()); } } + if (arrearsCollectionAppendxs != null) { + for (FinBillFileVo cldjhtApplicationAppendx : arrearsCollectionAppendxs) { + qklpfjImages.add(cldjhtApplicationAppendx.getFileUrl()); + } + } vo.setCustomerInvoiceApplyImages(customerInvoiceApplyImages); vo.setInvoiceApplyConfirmImages(invoiceApplyConfirmImages); vo.setRegisterContractImages(registerContractImages); vo.setIdCardImages(idCardImages); + vo.setArrearsCollectionAppendxs(qklpfjImages); BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData(); if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) { vo.setIsCanEdit(false); @@ -953,10 +971,12 @@ public class AppBusAdvanceGinvoiceapplyService { List invoiceApplyConfirmImages = dto.getInvoiceApplyConfirmImages();//开票信息确认书 List registerContractImages = dto.getRegisterContractImages();//车辆登记合同 List idCardImages = dto.getIdCardImages();//证件 + List arrearsCollectionAppendxs = dto.getArrearsCollectionAppendxs();//欠款领票附件 List khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息 List kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息 List cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息 List idCardImagesPC = new ArrayList<>();//证件 + List qklpfjImages = new ArrayList<>();//欠款领票附件 if (customerInvoiceApplyImages != null) { for (String customerInvoiceApplyImage : customerInvoiceApplyImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); @@ -985,10 +1005,18 @@ public class AppBusAdvanceGinvoiceapplyService { idCardImagesPC.add(finBillFileDto); } } + if (arrearsCollectionAppendxs != null) { + for (String arrearsCollectionAppendx : arrearsCollectionAppendxs) { + FinBillFileDto finBillFileDto = new FinBillFileDto(); + finBillFileDto.setFileUrl(arrearsCollectionAppendx); + qklpfjImages.add(finBillFileDto); + } + } finBillCompleteDto.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs); finBillCompleteDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs); finBillCompleteDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs); finBillCompleteDto.setZjApplicationAppendxs(idCardImagesPC); + finBillCompleteDto.setArrearsCollectionAppendxs(qklpfjImages); finBillCompleteDto.setOrgSidPath(orgSidPath); ResultBean resultBean = finBillApplicationFeign.completeBy(finBillCompleteDto); if (!resultBean.getSuccess()) {