From 6862f983e824b6dc828f1ba5d24436830f4346f7 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 19 Apr 2023 17:52:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseModelModpriceService.java | 6 +- .../biz/basetrailer/BaseTrailerService.java | 12 +- .../flowable/FinBillCompleteDto.java | 3 - .../FinBillApplicationService.java | 6 +- .../scmapplyinbound/flow/GetNodeQuery.java | 4 + .../ScmApplyInboundService.java | 8 +- .../invoiced/BillApplicationIInfoDto.java | 4 + .../invoiced/BillApplicationIInfoVo.java | 5 + .../autoservice/invoiced/InvoicedService.java | 124 +++++++++++++++++- 9 files changed, 150 insertions(+), 22 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java index 0a6fddb358..a8c6077e71 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java @@ -361,11 +361,11 @@ public class BaseModelModpriceService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); - appMap.put("businessSid", businessSid); + appMap.put("sid", businessSid); variables.put("app", appMap); //用户的部门全路径sid bv.setOrgSidPath(orgSidPath); @@ -1691,7 +1691,7 @@ public class FinBillApplicationService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); - appMap.put("businessSid", businessSid); + appMap.put("sid", businessSid); variables.put("app", appMap); //用户的部门全路径sid bv.setOrgSidPath(orgSidPath); diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/flow/GetNodeQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/flow/GetNodeQuery.java index 1fafbf843e..f97f05b5bc 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/flow/GetNodeQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/flow/GetNodeQuery.java @@ -22,4 +22,8 @@ public class GetNodeQuery implements Query { @ApiModelProperty(value = "分支字段及业务字段") private Map formVariables; + + @ApiModelProperty(value = "业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index 10653b3801..b58aa348a0 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -501,7 +501,7 @@ public class ScmApplyInboundService extends MybatisBaseService khkpsqsApplicationAppendxs = finBillApplicationDetailsVo.getKhkpsqsApplicationAppendxs(); List kpxxqrsApplicationAppendxs = finBillApplicationDetailsVo.getKpxxqrsApplicationAppendxs(); List cldjhtApplicationAppendxs = finBillApplicationDetailsVo.getCldjhtApplicationAppendxs(); + List zjApplicationAppendxs = finBillApplicationDetailsVo.getZjApplicationAppendxs(); List customerInvoiceApplyImages = new ArrayList<>();//客户开票申请书 List invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书 List registerContractImages = new ArrayList<>();//车辆登记合同 + List idCardImages = new ArrayList<>(); + if (zjApplicationAppendxs.size() > 0){ + for (FinBillFileVo zjApplicationAppendx : zjApplicationAppendxs) { + idCardImages.add(zjApplicationAppendx.getFileUrl()); + } + } if (khkpsqsApplicationAppendxs.size() > 0){ for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) { customerInvoiceApplyImages.add(khkpsqsApplicationAppendx.getFileUrl()); @@ -177,6 +186,10 @@ public class InvoicedService { registerContractImages.add(cldjhtApplicationAppendx.getFileUrl()); } } + vo.setCustomerInvoiceApplyImages(customerInvoiceApplyImages); + vo.setInvoiceApplyConfirmImages(invoiceApplyConfirmImages); + vo.setRegisterContractImages(registerContractImages); + vo.setIdCardImages(idCardImages); BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData(); if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())){ vo.setIsCanEdit(false); @@ -212,8 +225,9 @@ public class InvoicedService { finBillApplicationDto.setNodeState(dto.getNodeState()); finBillApplicationDto.setBillNo(dto.getBillNo()); String publishInfo = dto.getPublishInfo(); - finBillApplicationDto.setDeptName(publishInfo.substring(0,publishInfo.lastIndexOf("-"))); - finBillApplicationDto.setCreateByName(publishInfo.substring(publishInfo.lastIndexOf("-"))); + String[] split = publishInfo.split("-"); + finBillApplicationDto.setDeptName(split[0]); + finBillApplicationDto.setCreateByName(split[1]); //开票车辆信息 List vinList = dto.getVinList(); List finBillVehicleDtos = new ArrayList<>(); @@ -232,9 +246,9 @@ public class InvoicedService { //开票挂车信息 List finBillTrailers = dto.getFinBillTrailers(); List finBillTrailerDtos = new ArrayList<>(); - com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto finBillTrailerDto = new com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto(); if (finBillTrailers != null && finBillTrailers.size() > 0){ for (FinBillTrailerDto finBillTrailer : finBillTrailers) { + com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto finBillTrailerDto = new com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto(); BeanUtil.copyProperties(finBillTrailer, finBillTrailerDto); finBillTrailerDtos.add(finBillTrailerDto); } @@ -244,9 +258,11 @@ public class InvoicedService { List customerInvoiceApplyImages = dto.getCustomerInvoiceApplyImages();//客户开票申请书 List invoiceApplyConfirmImages = dto.getInvoiceApplyConfirmImages();//开票信息确认书 List registerContractImages = dto.getRegisterContractImages();//车辆登记合同 + List idCardImages = dto.getIdCardImages();//证件 List khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息 List kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息 List cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息 + List idCardImagesPC = new ArrayList<>();//证件 if (customerInvoiceApplyImages != null){ for (String customerInvoiceApplyImage : customerInvoiceApplyImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); @@ -268,9 +284,17 @@ public class InvoicedService { cldjhtApplicationAppendxs.add(finBillFileDto); } } + if (idCardImages != null){ + for (String idCardImage : idCardImages) { + FinBillFileDto finBillFileDto = new FinBillFileDto(); + finBillFileDto.setFileUrl(idCardImage); + idCardImagesPC.add(finBillFileDto); + } + } finBillApplicationDto.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs); finBillApplicationDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs); finBillApplicationDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs); + finBillApplicationDto.setZjApplicationAppendxs(idCardImagesPC); ResultBean resultBean = finBillApplicationFeign.save(finBillApplicationDto); return resultBean; } @@ -352,6 +376,98 @@ public class InvoicedService { ResultBean rb = ResultBean.fireFail(); SubmitFinBillApplicationDto submitBillApplicationDto = new SubmitFinBillApplicationDto(); BeanUtil.copyProperties(dto, submitBillApplicationDto); + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); + submitBillApplicationDto.setUseOrgSid(useOrgSid); + submitBillApplicationDto.setCreateBySid(dto.getUserSid()); + submitBillApplicationDto.setTotalBillMoney(dto.getInvoiceMoney()); + submitBillApplicationDto.setOrgSidPath(dto.getOrgPath()); + submitBillApplicationDto.setSaleTypeValue(dto.getSaleType()); + submitBillApplicationDto.setSaleDeptName(dto.getSellerName()); + submitBillApplicationDto.setStaffName(dto.getSellerName()); + submitBillApplicationDto.setOpenTickUnitName(dto.getOpenTickName()); + submitBillApplicationDto.setCustomerName(dto.getName()); + submitBillApplicationDto.setOneBillMoney(dto.getInvoiceMoney()); + submitBillApplicationDto.setOpenTickTypeKey(dto.getOpenTickTypeKey()); + submitBillApplicationDto.setOpenTickTypeValue(dto.getOpenTickTypeValue()); + submitBillApplicationDto.setOpenTickName(dto.getOpenTickName()); + submitBillApplicationDto.setBillStateKey(dto.getInvoiceStateKey()); + submitBillApplicationDto.setBillStateValue(dto.getInvoiceState()); + submitBillApplicationDto.setContractNo(dto.getContractId()); + submitBillApplicationDto.setApplyDate(dto.getDate()); + submitBillApplicationDto.setCreateBySid(dto.getUserSid()); + submitBillApplicationDto.setNodeState(dto.getNodeState()); + submitBillApplicationDto.setBillNo(dto.getBillNo()); + String publishInfo = dto.getPublishInfo(); + String[] split = publishInfo.split("-"); + submitBillApplicationDto.setDeptName(split[0]); + submitBillApplicationDto.setCreateByName(split[1]); + //开票车辆信息 + List vinList = dto.getVinList(); + List finBillVehicleDtos = new ArrayList<>(); + for (VinListDto vinListDto : vinList) { + FinBillVehicleDto finBillVehicleDto = new FinBillVehicleDto(); + finBillVehicleDto.setVinNo(vinListDto.getVin()); + finBillVehicleDto.setCertificateStateKey(vinListDto.getCertificateStateKey()); + finBillVehicleDto.setCertificateStateValue(vinListDto.getCertificateState()); + finBillVehicleDto.setBillTypeKey(vinListDto.getInvoiceTypeKey()); + finBillVehicleDto.setBillTypeValue(vinListDto.getInvoiceType()); + finBillVehicleDto.setOpenTickName(vinListDto.getInvoiceName()); + finBillVehicleDto.setOpenTickRemarks(vinListDto.getInvoiceInfo()); + finBillVehicleDtos.add(finBillVehicleDto); + } + submitBillApplicationDto.setFinBillVehicles(finBillVehicleDtos); + //开票挂车信息 + List finBillTrailers = dto.getFinBillTrailers(); + List finBillTrailerDtos = new ArrayList<>(); + if (finBillTrailers != null && finBillTrailers.size() > 0){ + for (FinBillTrailerDto finBillTrailer : finBillTrailers) { + com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto finBillTrailerDto = new com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto(); + BeanUtil.copyProperties(finBillTrailer, finBillTrailerDto); + finBillTrailerDtos.add(finBillTrailerDto); + } + } + submitBillApplicationDto.setFinBillTrailers(finBillTrailerDtos); + //附件信息 + List customerInvoiceApplyImages = dto.getCustomerInvoiceApplyImages();//客户开票申请书 + List invoiceApplyConfirmImages = dto.getInvoiceApplyConfirmImages();//开票信息确认书 + List registerContractImages = dto.getRegisterContractImages();//车辆登记合同 + List idCardImages = dto.getIdCardImages();//证件 + List khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息 + List kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息 + List cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息 + List idCardImagesPC = new ArrayList<>();//证件 + if (customerInvoiceApplyImages != null){ + for (String customerInvoiceApplyImage : customerInvoiceApplyImages) { + FinBillFileDto finBillFileDto = new FinBillFileDto(); + finBillFileDto.setFileUrl(customerInvoiceApplyImage); + khkpsqsApplicationAppendxs.add(finBillFileDto); + } + } + if (invoiceApplyConfirmImages != null){ + for (String invoiceApplyConfirmImage : invoiceApplyConfirmImages) { + FinBillFileDto finBillFileDto = new FinBillFileDto(); + finBillFileDto.setFileUrl(invoiceApplyConfirmImage); + kpxxqrsApplicationAppendxs.add(finBillFileDto); + } + } + if (registerContractImages != null){ + for (String registerContractImage : registerContractImages) { + FinBillFileDto finBillFileDto = new FinBillFileDto(); + finBillFileDto.setFileUrl(registerContractImage); + cldjhtApplicationAppendxs.add(finBillFileDto); + } + } + if (idCardImages != null){ + for (String idCardImage : idCardImages) { + FinBillFileDto finBillFileDto = new FinBillFileDto(); + finBillFileDto.setFileUrl(idCardImage); + idCardImagesPC.add(finBillFileDto); + } + } + submitBillApplicationDto.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs); + submitBillApplicationDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs); + submitBillApplicationDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs); + submitBillApplicationDto.setZjApplicationAppendxs(idCardImagesPC); ResultBean resultBean = finBillApplicationFeign.submitFinBillApplication(submitBillApplicationDto); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg());