From 1128284ea2d248dc416a67b7f97cffe763d0d84c Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 25 Sep 2023 18:06:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehicleout/BaseVehicleOutService.java | 6 +- .../BusBillApplication.java | 2 +- .../BusBillApplicationDetailsVo.java | 37 +-- .../BusBillApplicationDto.java | 4 +- .../BusBillApplicationFeign.java | 1 + .../busdelivered/AppDeliveredDetailsVo.java | 6 +- .../BusDeliveredApplyDetailVo.java | 6 +- .../BusBillApplicationMapper.java | 2 +- .../BusBillApplicationService.java | 121 ++++---- .../BusDeliveredApplyService.java | 2 +- .../BusDeliveredApplyDetailsService.java | 4 +- .../FinBillApplicationService.java | 280 +++++++++--------- .../anrui/flowable/api/utils/ProcDefEnum.java | 2 +- .../LoanCreditAppealApplyService.java | 7 +- 14 files changed, 254 insertions(+), 226 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index 682e944d24..7d39f342dc 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -2203,9 +2203,9 @@ public class BaseVehicleOutService extends MybatisBaseService busBillVehicles; // 开票车辆信息 + private List finBillVehicles; // 开票车辆信息 @ApiModelProperty("开票挂车信息") - private List busBillTrailers; // 开票挂车信息 + private List finBillTrailers; // 开票挂车信息 @ApiModelProperty("附件") - private List fjApplicationAppendxs; + private List fjApplicationAppendxs = new ArrayList<>(); @ApiModelProperty("证件") - private List zjApplicationAppendxs; // 证件 + private List zjApplicationAppendxs = new ArrayList<>(); // 证件 @ApiModelProperty("车辆买卖合同附件信息") - private List carBuyContractImages; + private List carBuyContractImages = new ArrayList<>(); @ApiModelProperty("客户开票申请书") - private List khkpsqsApplicationAppendxs; // 客户开票申请书 + private List khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书 @ApiModelProperty("开票信息确认书") - private List kpxxqrsApplicationAppendxs; // 开票信息确认书 + private List kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书 @ApiModelProperty("车辆登记合同") - private List cldjhtApplicationAppendxs; // 车辆登记合同 + private List cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同 @ApiModelProperty("欠款领票附件") private List arrearsCollectionAppendxs; @ApiModelProperty("出库申请sid") - private String cksqSid; + private String ckSid; } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationDto.java index 6ffc00f63c..2815f149ce 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationDto.java @@ -130,9 +130,9 @@ public class BusBillApplicationDto implements Dto { private String ckSid; @ApiModelProperty("开票车辆信息") - private List busBillVehicles; + private List finBillVehicles; @ApiModelProperty("开票挂车信息") - private List busBillTrailers; + private List finBillTrailers; @ApiModelProperty("车辆买卖合同附件信息") private List carBuyContractImages = new ArrayList<>(); @ApiModelProperty("客户开票申请书附件信息") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationFeign.java index 04ba79b088..875e8d2efd 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationFeign.java @@ -51,4 +51,5 @@ public interface BusBillApplicationFeign { @GetMapping("/fetchDetailByCkSid/{ckSid}") @ResponseBody public ResultBean fetchDetailByCkSid(@PathVariable("ckSid") String ckSid); + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java index c2bcbf263e..17bf0402dd 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java @@ -102,7 +102,9 @@ public class AppDeliveredDetailsVo implements Vo { private String taskDefKey; private boolean showLoanUser; - @ApiModelProperty("是否开票（0开票，1不开票）") - private String isInvoicing; + @ApiModelProperty("是否开票（1开票，0不开票）") + private String hasInvoiceKey; + @ApiModelProperty("是否开票（1开票，0不开票）") + private String hasInvoice; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyDetailVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyDetailVo.java index 0027febe26..5c855d7e45 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyDetailVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyDetailVo.java @@ -108,8 +108,10 @@ public class BusDeliveredApplyDetailVo implements Vo { private String distributorNameTwo; @ApiModelProperty("返利金额2") private String distributorPriceTwo; - @ApiModelProperty("是否开票（0开票，1不开票）") - private String isInvoicing; + @ApiModelProperty("是否开票（1开票，0不开票）") + private String hasInvoiceKey; + @ApiModelProperty("是否开票（1开票，0不开票）") + private String hasInvoice; @ApiModelProperty("开票信息") private BusBillApplicationDetailsVo busBillApplicationDetailsVo; } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationMapper.java index 334c611235..2d83b8e21a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationMapper.java @@ -70,6 +70,6 @@ public interface BusBillApplicationMapper extends BaseMapper @Update("update bus_bill_application set nodeState = '终止' where sid = #{businessSid}") void updateZZ(String businessSid); - @Select("select * from bus_bill_application where cksqSid = #{ckSid}") + @Select("select * from bus_bill_application where ckSid = #{ckSid}") BusBillApplicationVo selectByCkSid(String ckSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java index d16ea2885a..4651ef6b39 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java @@ -26,6 +26,7 @@ package com.yxt.anrui.buscenter.biz.busbillapplication; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo; import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign; import com.yxt.anrui.base.api.basetrailer.TrailerVo; @@ -45,7 +46,10 @@ import com.yxt.anrui.buscenter.api.busbillvehicle.BusBillVehicle; import com.yxt.anrui.buscenter.api.busbillvehicle.BusBillVehicleDto; import com.yxt.anrui.buscenter.api.busbillapplication.*; import com.yxt.anrui.buscenter.api.busbillvehicle.BusBillVehicleVo; +import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApply; +import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetails; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice; import com.yxt.anrui.buscenter.biz.busbillfile.BusBillFileService; import com.yxt.anrui.buscenter.biz.busbilltrailer.BusBillTrailerService; @@ -53,7 +57,11 @@ import com.yxt.anrui.buscenter.biz.busbillvehicle.BusBillVehicleService; import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplication; import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplicationDetailsVo; import com.yxt.anrui.buscenter.api.busbilltrailer.BusBillTrailerVo; +import com.yxt.anrui.buscenter.biz.busdeliveredapply.BusDeliveredApplyService; +import com.yxt.anrui.buscenter.biz.busdeliveredapplydetails.BusDeliveredApplyDetailsService; import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService; +import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo; +import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.core.result.ResultBean; @@ -86,21 +94,26 @@ public class BusBillApplicationService extends MybatisBaseService saveOrUpdateDto(BusBillApplicationDto dto) { ResultBean rb = ResultBean.fireFail(); String dtoSid = dto.getSid(); - List busBillTrailers = dto.getBusBillTrailers(); - List busBillVehicles = dto.getBusBillVehicles(); + List busBillTrailers = dto.getFinBillTrailers(); + List busBillVehicles = dto.getFinBillVehicles(); List carBuyContractImages = dto.getCarBuyContractImages(); - List khkpsqsApplicationAppendxs = dto.getKhkpsqsApplicationAppendxs(); - List kpxxqrsApplicationAppendxs = dto.getKpxxqrsApplicationAppendxs(); List cldjhtApplicationAppendxs = dto.getCldjhtApplicationAppendxs(); List zjApplicationAppendxs = dto.getZjApplicationAppendxs(); if (StringUtils.isBlank(dtoSid)) {//新增 BusBillApplication busBillApplication = new BusBillApplication(); BeanUtil.copyProperties(dto, busBillApplication, "sid"); busBillApplication.setNum(busBillVehicles.size()); + busBillApplication.setArrearsMoney("0"); save(busBillApplication); //主车开票信息 for (BusBillVehicleDto busBillVehicleDto : busBillVehicles) { @@ -130,26 +143,6 @@ public class BusBillApplicationService extends MybatisBaseService -1) { - filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); - } - busBillFileDto.setFileUrl(filePath); - busBillFileDto.setBillAppSid(busBillApplication.getSid()); - busBillFileDto.setAttachType(BusAttachTypeEnum.KHKPSQS.getAttachType()); - busBillFileService.saveOrUpdateDto(busBillFileDto); - } - for (BusBillFileDto busBillFileDto : kpxxqrsApplicationAppendxs) { - String filePath = busBillFileDto.getFileUrl(); - if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); - } - busBillFileDto.setFileUrl(filePath); - busBillFileDto.setBillAppSid(busBillApplication.getSid()); - busBillFileDto.setAttachType(BusAttachTypeEnum.KPXXQRS.getAttachType()); - busBillFileService.saveOrUpdateDto(busBillFileDto); - } for (BusBillFileDto busBillFileDto : cldjhtApplicationAppendxs) { String filePath = busBillFileDto.getFileUrl(); if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { @@ -192,30 +185,6 @@ public class BusBillApplicationService extends MybatisBaseService -1) { - filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); - } - busBillFileDto.setFileUrl(filePath); - busBillFileDto.setBillAppSid(busBillApplication.getSid()); - busBillFileDto.setAttachType(BusAttachTypeEnum.KHKPSQS.getAttachType()); - busBillFileService.saveOrUpdateDto(busBillFileDto); - } - } - if (kpxxqrsApplicationAppendxs != null) { - for (BusBillFileDto busBillFileDto : kpxxqrsApplicationAppendxs) { - String filePath = busBillFileDto.getFileUrl(); - if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); - } - busBillFileDto.setFileUrl(filePath); - busBillFileDto.setBillAppSid(busBillApplication.getSid()); - busBillFileDto.setAttachType(BusAttachTypeEnum.KPXXQRS.getAttachType()); - busBillFileService.saveOrUpdateDto(busBillFileDto); - } - } if (cldjhtApplicationAppendxs != null) { for (BusBillFileDto busBillFileDto : cldjhtApplicationAppendxs) { String filePath = busBillFileDto.getFileUrl(); @@ -277,10 +246,56 @@ public class BusBillApplicationService extends MybatisBaseService orderDetailsVoResultBean = busSalesOrderService.getSaleOrderDetailsByContractNo(busDeliveredApply.getContractNo()); + AppOrderDetailsVo appOrderDetailsVo = orderDetailsVoResultBean.getData(); + if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) { + ResultBean invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid()); + if (invoicingDetailsVoResultBean.getData() != null) { + vo.setOpenTickUnitName(invoicingDetailsVoResultBean.getData().getName()); + } + } + vo.setBusSalesOrderSid(appOrderDetailsVo.getBusSalesOrderSid()); + vo.setCustomerSid(appOrderDetailsVo.getCustomerSid()); + vo.setCustomerName(appOrderDetailsVo.getName()); + vo.setContractNo(busDeliveredApply.getContractNo()); + vo.setApplyDate(DateUtil.today()); + vo.setCreateBySid(busDeliveredApply.getCreateBySid()); + vo.setDeptSid(busDeliveredApply.getApplyDeptSid()); + vo.setDeptName(busDeliveredApply.getApplyDept()); + vo.setCreateBySid(busDeliveredApply.getApplySid()); + vo.setCreateByName(busDeliveredApply.getApplyName()); + //车辆信息 + List busBillVehicleVos = new ArrayList<>(); + List busDeliveredApplyDetails = busDeliveredApplyDetailsService.selectByApplySid(ckSid); + for (BusDeliveredApplyDetails busDeliveredApplyDetail : busDeliveredApplyDetails) { + BusBillVehicleVo busBillVehicleVo = new BusBillVehicleVo(); + busBillVehicleVo.setVinNo(busDeliveredApplyDetail.getVinNo()); + busBillVehicleVo.setVehSid(busDeliveredApplyDetail.getVinSid()); + //合格证状态 + BaseVehicleCertificateVo baseVehicleCertificate = baseVehicleCertificateFeign.selStateByVehicleSid(busDeliveredApplyDetail.getVinSid()).getData(); + if (baseVehicleCertificate != null) { + busBillVehicleVo.setCertificateStateKey(baseVehicleCertificate.getCertificateState()); + busBillVehicleVo.setCertificateStateValue(baseVehicleCertificate.getCertificateStateValue()); + } + busBillVehicleVos.add(busBillVehicleVo); + } + vo.setFinBillVehicles(busBillVehicleVos); + return vo; } String sid = busBillApplicationVo.getSid(); BusBillApplication entity = fetchBySid(sid); @@ -303,7 +318,7 @@ public class BusBillApplicationService extends MybatisBaseService busBillTrailerVos = busBillTrailerService.fetchByMainSid(sid); if (busBillTrailerVos.size() > 0) { for (BusBillTrailerVo busBillTrailerVo : busBillTrailerVos) { @@ -322,7 +337,7 @@ public class BusBillApplicationService extends MybatisBaseService clmmhtApplicationAppendxs = busBillFileService.fetchclmmhtBySid(sid); for (BusBillFileVo clmmhtApplicationAppendx : clmmhtApplicationAppendxs) { diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index aed65d396d..eb96dd077a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -456,7 +456,7 @@ public class BusDeliveredApplyService extends MybatisBaseService fetchByVehSid(String vinSid) { ResultBean rb = ResultBean.fireFail(); - String cksqSid = baseMapper.fetchByVehSid(vinSid); - return rb.success().setData(cksqSid); + String ckSid = baseMapper.fetchByVehSid(vinSid); + return rb.success().setData(ckSid); } public int fetchByIsDeleteVinSid(String vinSid) { 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 0581312b8a..5aa52c9895 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 @@ -760,7 +760,7 @@ public class FinBillApplicationService extends MybatisBaseService finBillVehicleVos = finBillVehicleService.fetchVehBySid(businessSid); List finBillTrailerVos = finBillTrailerService.fetchByMainSid(businessSid); - /*if (!data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney())){//是高低开 + if (!data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney())) {//是高低开 BusValcustFilingDto busValcustFilingDto = new BusValcustFilingDto(); busValcustFilingDto.setCreateBySid(finBillApplication.getCreateBySid()); busValcustFilingDto.setCreateByName(finBillApplication.getCreateByName()); @@ -779,15 +779,15 @@ public class FinBillApplicationService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); if (!resultBean.getSuccess()) { @@ -506,7 +507,8 @@ public class LoanCreditAppealApplyService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.LOANCREDITAPPEALAPPLY.getProDefId()); + LoanCreditAppealApply loanCreditAppealApply = fetchBySid(query.getBusinessSid()); + bv.setModelId(loanCreditAppealApply.getProcDefId()); ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), LoanCreditApplyNodeVo.class)).collect(Collectors.toList()); @@ -517,7 +519,8 @@ public class LoanCreditAppealApplyService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.LOANCREDITAPPEALAPPLY.getProDefId()); + LoanCreditAppealApply loanCreditAppealApply = fetchBySid(query.getBusinessSid()); + bv.setModelId(loanCreditAppealApply.getProcDefId()); ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), LoanCreditApplyNodeVo.class)).collect(Collectors.toList());