From 2803a56c818db4eee57395c291833a8c062f7f71 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 18 May 2023 10:12:12 +0800 Subject: [PATCH 01/14] =?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 --- .../base/api/commoncontract/CommonContractVo.java | 5 +++++ .../biz/basevehicleout/BaseVehicleOutService.java | 1 + .../basevehicleoutapply/BaseVehicleOutApplyMapper.xml | 10 ++++++++-- .../biz/commoncontract/CommonContractService.java | 4 ++++ .../finbillapplication/FinBillApplicationService.java | 5 +++++ .../autoservice/advanceInvoice/flowable/qkkpDto.java | 11 ++++++----- .../AppBusAdvanceGinvoiceapplyService.java | 8 +++++++- 7 files changed, 36 insertions(+), 8 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractVo.java index 6f0be7d677..51722bd6f7 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractVo.java @@ -80,4 +80,9 @@ public class CommonContractVo implements Vo { private String procDefId; @ApiModelProperty("流程实例id") private String procInstId; + + @ApiModelProperty(value = "销售类型key") + private String saleTypeKey; + @ApiModelProperty(value = "销售类型value") + private String saleTypeValue; } 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 d9b96cda89..d37ef1c0e5 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 @@ -1420,6 +1420,7 @@ public class BaseVehicleOutService extends MybatisBaseService ${ew.sqlSegment} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 043e8b7b8c..016207e13e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -27,6 +27,7 @@ import com.yxt.anrui.buscenter.api.busdeposit.BusDepositFeign; import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo; import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousFeign; import com.yxt.anrui.buscenter.api.busdepositvehicle.BusDepositVehicleFeign; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*; @@ -2650,6 +2651,9 @@ public class CommonContractService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return rb.success().setData(p); 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 90e974ffde..aa48ca524c 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 @@ -452,6 +452,7 @@ public class FinBillApplicationService extends MybatisBaseService commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData(); List hgzImageUrls = new ArrayList<>(); for (CommonAppendixVo commonAppendixVo : commonAppendixVos) { @@ -613,6 +614,7 @@ public class FinBillApplicationService extends MybatisBaseService fjApplicationAppendxs; + private List fjApplicationAppendxs = new ArrayList<>(); @ApiModelProperty("证件") - private List idCardImages; + private List idCardImages = new ArrayList<>(); @ApiModelProperty("客户开票申请书") - private List customerInvoiceApplyImages; + private List customerInvoiceApplyImages = new ArrayList<>(); @ApiModelProperty("车辆登记合同") - private List registerContractImages; + private List registerContractImages = new ArrayList<>(); @ApiModelProperty("确认书") - private List invoiceApplyConfirmImages; + private List invoiceApplyConfirmImages = 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 f0be39b7ef..a97e65ba85 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 @@ -1162,6 +1162,7 @@ public class AppBusAdvanceGinvoiceapplyService { } FinBillCompleteDto finBillCompleteDto = new FinBillCompleteDto(); BeanUtil.copyProperties(dto, finBillCompleteDto); + finBillCompleteDto.setOrgSidPath(dto.getOrgPath()); ResultBean resultBean = finBillApplicationFeign.completeQKLP(finBillCompleteDto); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); @@ -1189,7 +1190,12 @@ public class AppBusAdvanceGinvoiceapplyService { orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); } FinBillCompleteDto finBillCompleteDto = new FinBillCompleteDto(); - BeanUtil.copyProperties(dto, finBillCompleteDto); + finBillCompleteDto.setComment(dto.getComment()); + finBillCompleteDto.setBusinessSid(dto.getBusinessSid()); + finBillCompleteDto.setInstanceId(dto.getInstanceId()); + finBillCompleteDto.setTaskId(dto.getTaskId()); + finBillCompleteDto.setUserSid(dto.getUserSid()); + finBillCompleteDto.setTaskDefKey(dto.getTaskDefKey()); //附件信息 List fjApplicationAppendxs = dto.getFjApplicationAppendxs();//附件 List fj = new ArrayList<>();//附件 From e1123486865775aa0e0699fd76ed8b892820f37a Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 18 May 2023 10:56:39 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=AC=A0=E6=AC=BE?= =?UTF-8?q?=E6=8F=90=E8=BD=A6=E7=8E=AF=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusArrearsCarryVehicleApplyService.java | 94 ++----------------- ...AppBusArrearsCarryVehicleApplyService.java | 1 + 2 files changed, 8 insertions(+), 87 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java index 11ead8d349..edc1f98beb 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java @@ -1372,6 +1372,10 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService saveArrearsApply(AppArrearsCarryDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = dto.getSid(); + List adCarListVoList = dto.getVinList(); + if(adCarListVoList.isEmpty()){ + return rb.setMsg("请选择车辆"); + } CreatePdfVo createPdf = null; if (StringUtils.isBlank(sid)) { //新增保存 @@ -1424,11 +1428,6 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService adCarListVoList = dto.getVinList(); - if (adCarListVoList.isEmpty()) { - return rb.setMsg("请选择车辆"); - } createPdf = createPdf(dto); //车辆更新 for (int i = 0; i < adCarListVoList.size(); i++) { @@ -1510,11 +1509,6 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService adCarListVoList = dto.getVinList(); - if (adCarListVoList.isEmpty()) { - return rb.setMsg("请选择车辆"); - } createPdf = createPdf(dto); //车辆更新 //删除关联表 @@ -1542,47 +1536,6 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(sysUserVo.getStaffSid()); - if (!staffOrgResultBean.getSuccess()) { - return rb.setMsg(staffOrgResultBean.getMsg()); - } - //用户的组织全路径 - String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); - dto.setOrgSidPath(orgSidPath); - } - //根据申请sid查询数据 - BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(dto.getContractSid()); - BeanUtil.copyProperties(dto, busArrearsCarryVehicleApply); - //根据欠款提车Sid删除车辆信息 并重新添加 - busArrearsCarryVehicleDetailsService.deleteByArrearsVehicleSid(dto.getContractSid()); - // 添加欠款提车 车辆表数据 - if (dto.getCarList().size() > 0) { - List carList = dto.getCarList(); - for (AdCarListDto adCarListDto : carList) { - BusArrearsCarryVehicleDetails busArrearsCarryVehicle = new BusArrearsCarryVehicleDetails(); - busArrearsCarryVehicle.setArrearsVehicleSid(busArrearsCarryVehicleApply.getSid()); // 申请表sid - busArrearsCarryVehicle.setVinNo(adCarListDto.getVin()); // 车架号 - //获取车辆sid - BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(adCarListDto.getVin(), useOrgSid).getData(); - if (baseVehicle != null) { - busArrearsCarryVehicle.setVehicleSid(baseVehicle.getSid()); - } - //成交价 - busArrearsCarryVehicle.setDealMoney(new BigDecimal(adCarListDto.getPrice())); - busArrearsCarryVehicle.setRemarks(adCarListDto.getRemarks());// 备注 - busArrearsCarryVehicleDetailsService.save(busArrearsCarryVehicle); - } - } - //修改欠款提车申请 - updateById(busArrearsCarryVehicleApply); - return rb.success().setData(busArrearsCarryVehicleApply.getSid());*/ } public String getApplyCode(String orgSidPath) { @@ -1636,19 +1589,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService busArrearsCarryVehicleDetailsVos = busArrearsCarryVehicleDetailsService.selByArrearsSid(busArrearsCarryVehicleApply.getSid()); - for (BusArrearsCarryVehicleDetailsVo busArrearsCarryVehicleDetailsVo : busArrearsCarryVehicleDetailsVos) { - baseVehicleTempstateDto.setVehSid(busArrearsCarryVehicleDetailsVo.getVinSid()); - baseVehicleTempstateDto.setVinNo(busArrearsCarryVehicleDetailsVo.getVinNo()); - baseVehicleTempstateFeign.save(baseVehicleTempstateDto); - } - baseMapper.updateType(businessSid);*/ + busArrearsCarryVehicleApply = fetchBySid(businessSid); //创建BusinessVariables实体对象 BusinessVariables bv = new BusinessVariables(); //流程中的参数赋值、若有网关,则赋值网关中判断的字段。 @@ -1786,9 +1727,8 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService金融部经理审批 bv.setNextNodeUserSids(busArrearsCarryVehicleApply.getFinanceUserSid()); } if (bv.getTaskId().equals(busArrearsCarryVehicleApply.getTaskId())) { @@ -1836,26 +1776,6 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService vehicleDetailsVos = busArrearsCarryVehicleDetailsService.selByArrearsSid(busArrearsCarryVehicleApply.getSid()); if (vehicleDetailsVos.size() > 0) { for (BusArrearsCarryVehicleDetailsVo vehicleDetailsVo : vehicleDetailsVos) { - /* - AddRetrievalApplyDto addRetrievalApplyDto = new AddRetrievalApplyDto(); - addRetrievalApplyDto.setVinNo(vehicleDetailsVo.getVinNo()); - BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(vehicleDetailsVo.getVinSid()).getData(); - if (baseVehicleSelectVo != null) { - addRetrievalApplyDto.setModelSid(baseVehicleSelectVo.getModelSid()); - addRetrievalApplyDto.setModelName(baseVehicleSelectVo.getModelName()); - } - addRetrievalApplyDto.setPrice(String.valueOf(vehicleDetailsVo.getDealMoney())); - addRetrievalApplyDto.setContractNo(busArrearsCarryVehicleApply.getContractNo()); - addRetrievalApplyDto.setName(busArrearsCarryVehicleApply.getCustomerName()); - BusSalesOrderDetailsVo busSalesOrderDetailsVo = busSalesOrderService.getByContractNo(busArrearsCarryVehicleApply.getContractNo()); - addRetrievalApplyDto.setPaymentMethod(busSalesOrderDetailsVo.getPayType());// 付款方式 - addRetrievalApplyDto.setPaymentMethodKey(busSalesOrderDetailsVo.getPayTypeKey());// 付款方式 - addRetrievalApplyDto.setSubscription(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getRemarks()); // 款项状态 - addRetrievalApplyDto.setSubscriptionKey(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()); // 款项状态 - addRetrievalApplyDto.setUseOrgName(busArrearsCarryVehicleApply.getUseOrgName()); - addRetrievalApplyDto.setUseOrgSid(busArrearsCarryVehicleApply.getUseOrgSid()); - busDeliveredService.addRetrievalApply(addRetrievalApplyDto); - */ BusDeliveredDto busDeliveredDto = new BusDeliveredDto(); busDeliveredDto.setSubscriptionKey(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()); busDeliveredDto.setSubscription(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getRemarks()); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java index 58f28b3352..50fda768a1 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java @@ -337,6 +337,7 @@ public class AppBusArrearsCarryVehicleApplyService { List zjlLetter = advanceArrearsInfoVo.getZjlLetter(); arrearVo.setFilesPath(zjlLetter); list.add(arrearVo); + arrearsVo.setList(list); } if ("Activity_0ynxtyz".equals(query.getTaskDefKey())) { //销售经理信审截图 From f4e12d67783437168ebfa159bf8fb2ddb6bc2c8a Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 18 May 2023 12:12:16 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E4=B8=8B=E8=BD=BD=E6=8C=89=E9=92=AE=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...nUncollectedReceivablesDetailedMapper.java | 5 +- ...inUncollectedReceivablesDetailedMapper.xml | 95 ++++++++++--------- ...UncollectedReceivablesDetailedService.java | 46 +++++++-- .../FinVehicleInvoiceService.java | 2 - 4 files changed, 90 insertions(+), 58 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java index 2b1c5f621e..f554f3b2bc 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java @@ -65,7 +65,8 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper selectListVo(); FinUncollectedReceivablesDetailedVo fetchByVinAndRecName(@Param("vin") String vin, @Param("receivablesName") String receivablesName); - FinUncollectedReceivablesDetailedVo fetchByVinAndRecNameOrgSid(@Param("vin") String vin, @Param("receivablesName") String receivablesName,@Param("useOrgSid")String useOrgSid); + + FinUncollectedReceivablesDetailedVo fetchByVinAndRecNameOrgSid(@Param("vin") String vin, @Param("receivablesName") String receivablesName, @Param("useOrgSid") String useOrgSid); @Update("update fin_uncollected_receivables_detailed set currentReceivableMoney = #{curRecMoney} where sid = #{sid}") void updateCurRecMoneyBySid(@Param("curRecMoney") String curRecMoney, @Param("sid") String sid); @@ -99,4 +100,6 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper selectByContractNoOne(String contractNo); List selectByCreateBySidOne(String userSid); + + List selectSidBybusVinSidAndConNo(@Param("busVinSid") String busVinSid, @Param("contractNo") String contractNo); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml index af838f15be..713572b60b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml @@ -5,7 +5,6 @@ - - SELECT sid AS paymentSid, - paymentTypeValue AS payType, - receivablesName, - currentReceivableMoney AS receivable + SELECT sid AS paymentSid, + paymentTypeValue AS payType, + receivablesName, + currentReceivableMoney AS receivable FROM fin_uncollected_receivables_detailed furd ${ew.sqlSegment} @@ -112,50 +111,54 @@ fu.contractNo, fc.billNo, fc.confirmDate - FROM - fin_uncollected_receivables_detailed as fu - LEFT JOIN fin_selected_receivables_detailed as fs - ON fu.sid = fs.receivablesSid - LEFT JOIN fin_collection_confirmation as fc - ON fs.collSid = fc.sid + FROM fin_uncollected_receivables_detailed as fu + LEFT JOIN fin_selected_receivables_detailed as fs + ON fu.sid = fs.receivablesSid + LEFT JOIN fin_collection_confirmation as fc + ON fs.collSid = fc.sid where fu.sid = #{detailedSid} AND fs.auditState = 3 ORDER BY fc.confirmDate DESC limit 1 + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java index c9bbd6b794..33ec7ee451 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java @@ -353,7 +353,8 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService } public PagerVo detailedListPageVo(PagerQuery pq) { - Map dict = new HashMap<>(); + // Map dict = new HashMap<>(); + //==============================分页开始==================================== FinUncollectedReceivablesDetailedQuery params = pq.getParams(); String orgPath = params.getOrgPath(); String orgSidPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); @@ -361,6 +362,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService QueryWrapper qw = myCreateQueryWrapper(params); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); + //=============================分页结束====================================== List records = pagging.getRecords(); for (FinUncollectedReceivablesDetailedVo record : records) { record.setDownload(false); @@ -393,20 +395,46 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService SolutionsDetailsVo svo = loanSolutionsFeign.selectDetails(salesOrderSid).getData(); if (noSubscriptionMoney.compareTo(BigDecimal.ZERO) <= 0) { if (null != svo) { - if (StringUtils.isNotBlank(svo.getBondAmounts()) && !("0.00").equals(svo.getBondAmounts()) - || StringUtils.isNotBlank(svo.getDepositPremium()) && !("0.00").equals(svo.getDepositPremium()) - || StringUtils.isNotBlank(svo.getDepositSettle()) && !("0.00").equals(svo.getDepositSettle())) { - record.setDownload(true); + if ((StringUtils.isNotBlank(svo.getBondAmounts()) && !("0.00").equals(svo.getBondAmounts())) + || (StringUtils.isNotBlank(svo.getDepositPremium()) && !("0.00").equals(svo.getDepositPremium())) + || (StringUtils.isNotBlank(svo.getDepositSettle()) && !("0.00").equals(svo.getDepositSettle()))) { + List sidList = baseMapper.selectSidBybusVinSidAndConNo(record.getBusVinSid(), record.getContractNo()); + List noSubscriptionMoneyList = new ArrayList<>(); + List noSubscriptionMoneyCheckList = new ArrayList<>(); + if (null != sidList) { + for (String s : sidList) { + FinUncollectedReceivablesDetailed detailed = fetchBySid(s); + List detaileds = finSelectedReceivablesDetailedService.fetchByReceivablesSid(s).getData(); + BigDecimal sumCheck = new BigDecimal(0).setScale(2, RoundingMode.HALF_EVEN); + for (FinSelectedReceivablesDetailed selectedReceivablesDetailed : detaileds) { + BigDecimal subscriptionMoney = selectedReceivablesDetailed.getSubscriptionMoney(); + sumCheck = sumCheck.add(subscriptionMoney); + } + BigDecimal reveivableMoneyCheck = new BigDecimal(detailed.getReveivableMoney()); + BigDecimal noSubscriptionMoneyCheck = reveivableMoneyCheck.subtract(sumCheck); + noSubscriptionMoneyList.add(noSubscriptionMoneyCheck); + } + if (null != noSubscriptionMoneyList) { + for (BigDecimal money : noSubscriptionMoneyList) { + if (money.compareTo(BigDecimal.ZERO) > 0) { + noSubscriptionMoneyCheckList.add(1); + } + } + } + if (null == noSubscriptionMoneyCheckList || noSubscriptionMoneyCheckList.size() == 0 || noSubscriptionMoneyCheckList.isEmpty()) { + record.setDownload(true); + } + } } } } } } - dict.put(record.getContractNo() + record.getVinNo(), dict.getOrDefault(record.getContractNo() + record.getVinNo(), true) ? record.getDownload() : false); - } - for (FinUncollectedReceivablesDetailedVo record : records) { - record.setDownload(dict.get(record.getContractNo() + record.getVinNo())); + // dict.put(record.getContractNo() + record.getVinNo(), dict.getOrDefault(record.getContractNo() + record.getVinNo(), true) ? record.getDownload() : false); } +// for (FinUncollectedReceivablesDetailedVo record : records) { +// record.setDownload(dict.get(record.getContractNo() + record.getVinNo())); +// } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java index aff9d0b689..48c0bb2121 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java @@ -293,7 +293,6 @@ public class FinVehicleInvoiceService extends MybatisBaseService Date: Thu, 18 May 2023 13:43:38 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/bussalesorder/BusSalesOrderService.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 76f922df04..177ad36d57 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -604,8 +604,14 @@ public class BusSalesOrderService extends MybatisBaseService stringList = new ArrayList<>(); if (!list.isEmpty()) { - for (BusDepositFictitiousDetailsVo v : list) { - String b = "编号为" + v.getDepositBillNo() + "简易订单订金转入" + v.getPrice() + "元,"; + for (int j = 0; j < list.size(); j++) { + BusDepositFictitiousDetailsVo v = list.get(j); + String b = ""; + if (j == list.size() - 1) { + b = "编号为" + v.getDepositBillNo() + "简易订单订金转入" + v.getPrice() + "元。"; + } else { + b = "编号为" + v.getDepositBillNo() + "简易订单订金转入" + v.getPrice() + "元,"; + } a = a + b; if (StringUtils.isNotBlank(v.getPayPath())) { List payPathList = Arrays.asList(v.getPayPath().split(",")); @@ -614,7 +620,7 @@ public class BusSalesOrderService extends MybatisBaseService Date: Thu, 18 May 2023 14:01:09 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=B7=B2=E5=8A=9E=E7=90=86=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=88=86=E4=BA=AB=E5=92=8C=E8=AF=84=E8=AE=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/bussalesorder/app/order/AppOrderDetailsVo.java | 3 +++ .../buscenter/biz/bussalesorder/BusSalesOrderService.java | 4 ++++ .../api/autoservice/saleOrders/order/OrderDetailsVo.java | 3 +++ 3 files changed, 10 insertions(+) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java index a400339188..3b9b3937ba 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java @@ -140,5 +140,8 @@ public class AppOrderDetailsVo implements Vo { private String busSalesOrderSid; + @ApiModelProperty("是否显示分享和评论") + private boolean showShareAndComment; + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 177ad36d57..f6a2910bc8 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -3130,8 +3130,12 @@ public class BusSalesOrderService extends MybatisBaseService commonContractVoResultBean = commonContractFeign.getContractBySalesOrderSid(sid); if (commonContractVoResultBean.getData() != null) { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java index 7d5fd186cc..0cdc146dcc 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java @@ -107,5 +107,8 @@ public class OrderDetailsVo implements Vo { private List financeForms = new ArrayList<>(); + @ApiModelProperty("是否显示分享和评论") + private boolean showShareAndComment; + } From 61e62745cf0ecffc9275a433bec9af46fae08f26 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 18 May 2023 14:50:30 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E5=87=BA=E5=BA=93app=E6=8F=90=E4=BA=A4ap?= =?UTF-8?q?pMap=E4=B8=8E=E7=A7=BB=E5=8A=A8=E7=AB=AF=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/busdeliveredapply/BusDeliveredApplyService.java | 1 + .../anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnMapper.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 dd5e176f1a..c88d0e7e35 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 @@ -1570,6 +1570,7 @@ public class BusDeliveredApplyService extends MybatisBaseService From b92c37424025e236f8b0c1c7dbbd118447696f28 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 18 May 2023 15:04:57 +0800 Subject: [PATCH 07/14] =?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 --- .../anrui/base/biz/basevehicle/BaseVehicleService.java | 9 +++++++++ .../BusSalesOrderVehicleService.java | 6 ++++++ .../finbillapplication/FinBillApplicationService.java | 8 +------- .../biz/scmvehiclereturn/ScmVehicleReturnService.java | 5 +---- .../api/autoservice/advanceInvoice/AppCarListVo.java | 8 +++++++- .../AppBusAdvanceGinvoiceapplyService.java | 3 +++ 6 files changed, 27 insertions(+), 12 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 250557e485..26d4411728 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -50,6 +50,7 @@ import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempDto; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign; import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo; import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; @@ -136,6 +137,8 @@ public class BaseVehicleService extends MybatisBaseService 0) { qw.notIn("bsov.linkSid", params.getVinSids()); } + //查询是否存在应收未收款项 + ResultBean> listResultBean = finUncollectedReceivablesDetailedFeign.selectByContractNoOne(params.getContractNo()); + if(!listResultBean.getData().isEmpty()){ + listResultBean.getData().removeAll(Collections.singleton(null)); + qw.notIn("bsov.sid",listResultBean.getData()); + } return baseMapper.vehicleQKKPPageList(page, qw); } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java index 1de2e7f802..8de89ecf8e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java @@ -276,6 +276,12 @@ public class BusSalesOrderVehicleService extends MybatisBaseService> listResultBean = finUncollectedReceivablesDetailedFeign.selectByContractNoOne(query.getContractNo()); + if(!listResultBean.getData().isEmpty()){ + listResultBean.getData().removeAll(Collections.singleton(null)); + qw.notIn("bsov.sid",listResultBean.getData()); + } List busVehicleQKKPVos = baseMapper.appVehicleQKKPList(qw); List busVehicleQKKPTrailerVos = new ArrayList<>(); List busVehicleQKKPVosNew = new ArrayList<>(); 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 aa48ca524c..8fc6784a8a 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 @@ -427,13 +427,7 @@ public class FinBillApplicationService extends MybatisBaseService finBillVehicleVos = finBillVehicleService.fetchVehBySid(sid); String contractNo = entity.getContractNo(); List finBillApplicationVos = baseMapper.selectByContractNo(contractNo); - if (finBillApplicationVos != null && finBillApplicationVos.size() > 0) { - FinBillApplicationDetailsVo finBillApplicationVo = finBillApplicationVos.get(0); - if (StringUtils.isNotBlank(finBillApplicationVo.getOneBillMoney())) { - entity.setOneBillMoney(new BigDecimal(finBillApplicationVo.getOneBillMoney())); - entity.setTotalBillMoney(new BigDecimal(finBillApplicationVo.getOneBillMoney()).multiply(new BigDecimal(finBillVehicleVos.size()))); - } - } + entity.setTotalBillMoney(entity.getOneBillMoney().multiply(new BigDecimal(finBillVehicleVos.size()))); FinBillApplicationDetailsVo vo = new FinBillApplicationDetailsVo(); BeanUtil.copyProperties(entity, vo); BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData(); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java index 7705ead735..b0edde6ff2 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java @@ -101,10 +101,7 @@ public class ScmVehicleReturnService extends MybatisBaseService sysUserInfoVoResultBean = sysUserFeign.selectUserInfoByUserSid(scmVehicleReturnDto.getCreateBySid()); - //取组织架构的全路径sid - SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(sysUserInfoVoResultBean.getData().getStaffSid()).getData(); - orgPath = sysStaffOrg.getOrgSidPath(); + return rb.setMsg("orgSidPath不能为空"); } String sid = scmVehicleReturnDto.getSid(); if (StringUtils.isBlank(sid)) { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppCarListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppCarListVo.java index 957048fc1f..4be4096e07 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppCarListVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppCarListVo.java @@ -4,6 +4,9 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + @Data public class AppCarListVo implements Vo { private static final long serialVersionUID = -7003788760351399800L; @@ -12,6 +15,8 @@ public class AppCarListVo implements Vo { private String vin; @ApiModelProperty("车辆sid") private String vinSid; + @ApiModelProperty("单台开票金额") + private String invoiceMoney; @ApiModelProperty("开票类型key") private String invoiceTypeKey; @ApiModelProperty("开票类型value") @@ -26,5 +31,6 @@ public class AppCarListVo implements Vo { private String certificateStateKey; @ApiModelProperty("合格证状态value") private String certificateState; - + @ApiModelProperty("主车合格证照片") + private List zcHgzImages = new ArrayList<>(); } 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 a97e65ba85..9e5810e04c 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 @@ -341,6 +341,7 @@ public class AppBusAdvanceGinvoiceapplyService { vo.setModelSid(finBillApplicationDetailsVo.getModelSid()); vo.setModelName(finBillApplicationDetailsVo.getModelName()); vo.setPublishInfo(finBillApplicationDetailsVo.getDeptName() + "-" + finBillApplicationDetailsVo.getCreateByName()); + vo.setProcInsId(""); String reasonValue = vo.getReasonValue(); String remarks = vo.getRemarks(); String reasonRemarks = ""; @@ -366,6 +367,8 @@ public class AppBusAdvanceGinvoiceapplyService { vinListVo.setOpenTickSid(finBillVehicle.getOpenTickSid()); vinListVo.setInvoiceName(finBillVehicle.getOpenTickName()); vinListVo.setInvoiceInfo(finBillVehicle.getOpenTickRemarks()); + vinListVo.setInvoiceMoney(finBillApplicationDetailsVo.getOneBillMoney()); + vinListVo.setZcHgzImages(finBillVehicle.getCertificatePhoto()); vinListVos.add(vinListVo); } } From 870980402549c8b607ea06c766b5a438f771fb51 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 18 May 2023 15:08:50 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusDeliveredApplyService.java | 70 ++++++++++--------- 1 file changed, 36 insertions(+), 34 deletions(-) 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 c88d0e7e35..4261deee33 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 @@ -85,6 +85,7 @@ import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; +import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; @@ -531,14 +532,6 @@ public class BusDeliveredApplyService extends MybatisBaseService stringList = busDeliveredApplyDetailsService.selectVinByApplySid(sid); - for (int i = 0; i < stringList.size(); i++) { - String vinNo = stringList.get(i); - busDeliveredService.updateState(vinNo, 0); - } - //更改申请的状态为待审核2 - baseMapper.updateStateBySid(2, sid);*/ String businessSid = resultBean.getData(); //创建BusinessVariables实体对象 BusinessVariables bv = new BusinessVariables(); @@ -581,14 +574,7 @@ public class BusDeliveredApplyService extends MybatisBaseService stringList = busDeliveredApplyDetailsService.selectVinByApplySid(sid); - for (int i = 0; i < stringList.size(); i++) { - String vinNo = stringList.get(i); - busDeliveredService.updateState(vinNo, 0); - } - //更改申请的状态为待审核2 - baseMapper.updateStateBySid(2, sid); + return complete(bv); } return rb; @@ -677,8 +663,17 @@ public class BusDeliveredApplyService extends MybatisBaseService stringList = busDeliveredApplyDetailsService.selectVinByApplySid(bv.getBusinessSid()); + for (int i = 0; i < stringList.size(); i++) { + String vinNo = stringList.get(i); + busDeliveredService.updateState(vinNo, 0); + } + //更改申请的状态为待审核2 + baseMapper.updateStateBySid(2, bv.getBusinessSid()); + } } return rb.success().setData(resultBean.getData()); } else { @@ -972,10 +967,17 @@ public class BusDeliveredApplyService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); //更新业务中的流程相关的参数 updateFlowFiled(map); - //将该申请的车架号的待出库中的状态修改为出库中 - List vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(query.getBusinessSid()); - //更新该合同的该车架号的状态为1 - busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1); + busDeliveredApply = fetchBySid(query.getBusinessSid()); + ResultBean> listResultBean = flowTaskFeign.getLatestTasks(busDeliveredApply.getProcInstId()); + String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); + String nextName = listResultBean.getData().get(0).getName_(); + List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); + if ("发起申请".equals(nextName)) { + List vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(query.getBusinessSid()); + //更新该合同的该车架号的状态为1 + busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1); + } + return rb.success(); } } @@ -990,7 +992,6 @@ public class BusDeliveredApplyService extends MybatisBaseService vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(query.getBusinessSid()); - //更新该合同的该车架号的状态为0 - busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1); + busDeliveredApply = fetchBySid(query.getBusinessSid()); + ResultBean> listResultBean = flowTaskFeign.getLatestTasks(busDeliveredApply.getProcInstId()); + String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); + String nextName = listResultBean.getData().get(0).getName_(); + List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); + if ("发起申请".equals(nextName)) { + List vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(query.getBusinessSid()); + //更新该合同的该车架号的状态为1 + busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1); + } + return rb.success().setData(resultBean.getData()); } } @@ -1045,9 +1053,8 @@ public class BusDeliveredApplyService extends MybatisBaseService vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(query.getBusinessSid()); - //更新该合同的该车架号的状态为0 + //更新该合同的该车架号的状态为1 busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1); return rb.success().setData(resultBean.getData()); } @@ -1262,15 +1269,11 @@ public class BusDeliveredApplyService extends MybatisBaseService Date: Thu, 18 May 2023 15:29:54 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/bussalesorder/app/order/AppOrderDetailsVo.java | 2 ++ .../anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml | 3 ++- .../api/autoservice/saleOrders/order/OrderDetailsVo.java | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java index 3b9b3937ba..1d8da905ed 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java @@ -143,5 +143,7 @@ public class AppOrderDetailsVo implements Vo { @ApiModelProperty("是否显示分享和评论") private boolean showShareAndComment; + private String procDefId; + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index 0801269f61..f2b57fe3f8 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -222,7 +222,8 @@ bo.purchaseSystemName, bo.imagesFile, bo.contractNo contractId, - bo.financePlan + bo.financePlan, + procDefId from bus_sales_order bo where sid = #{sid} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java index 0cdc146dcc..391cf318d2 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java @@ -110,5 +110,8 @@ public class OrderDetailsVo implements Vo { @ApiModelProperty("是否显示分享和评论") private boolean showShareAndComment; + private String procDefId; + private String taskDefKey; + } From e8da6075db586f100f95c77ae0abb8965c079a2c Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 18 May 2023 15:37:24 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index f2b57fe3f8..b04f28630a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -223,7 +223,8 @@ bo.imagesFile, bo.contractNo contractId, bo.financePlan, - procDefId + procDefId, + nodeId as taskDefKey from bus_sales_order bo where sid = #{sid} From 80476304158dd39e49964395d5175cd9318ebccd Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 18 May 2023 16:02:28 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusDeliveredApplyService.java | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) 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 4261deee33..7673a3b879 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 @@ -817,9 +817,23 @@ public class BusDeliveredApplyService extends MybatisBaseService crmCustomerTempVoResultBean = crmCustomerTempFeign.fetchSid(busDeliveredApply.getCustomerSid()); + if (crmCustomerTempVoResultBean.getData() != null) { + baseVehicleZSOutApplyDto.setCustomerNo(crmCustomerTempVoResultBean.getData().getCustomerNo()); + } } else { baseVehicleZSOutApplyDto.setSaleTypeKey("002"); baseVehicleZSOutApplyDto.setSaleTypeValue("贷款车"); + baseVehicleZSOutApplyDto.setCustomerName(busDeliveredApply.getLoanName()); + baseVehicleZSOutApplyDto.setCustomerSid(busDeliveredApply.getLoanSid()); + //客户编码 + ResultBean crmCustomerTempVoResultBean = crmCustomerTempFeign.fetchSid(busDeliveredApply.getLoanSid()); + if (crmCustomerTempVoResultBean.getData() != null) { + baseVehicleZSOutApplyDto.setCustomerNo(crmCustomerTempVoResultBean.getData().getCustomerNo()); + } } baseVehicleZSOutApplyDto.setSaleDate(DateUtil.today()); baseVehicleZSOutApplyDto.setOrgSid(busDeliveredApply.getStaffDeptSid()); @@ -829,9 +843,9 @@ public class BusDeliveredApplyService extends MybatisBaseService crmCustomerTempVoResultBean = crmCustomerTempFeign.fetchSid(busDeliveredApply.getCustomerSid()); - if (crmCustomerTempVoResultBean.getData() != null) { - baseVehicleZSOutApplyDto.setCustomerNo(crmCustomerTempVoResultBean.getData().getCustomerNo()); - } + //实际购车人key baseVehicleZSOutApplyDto.setBuyerTypeKey(busDeliveredApply.getTypeKey()); baseVehicleZSOutApplyDto.setBuyerTypeValue(busDeliveredApply.getType()); From 32c190588a3080f36413eeb7bdf0b9e45138e339 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 18 May 2023 16:34:08 +0800 Subject: [PATCH 12/14] =?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 --- .../base/biz/basevehicleout/BaseVehicleOutService.java | 8 ++++---- .../bussalesordervehicle/BusSalesOrderVehicleFeign.java | 2 +- .../api/bussalesordervehicle/BusVehicleQKKPTrailerVo.java | 6 ++++-- .../bussalesordervehicle/BusSalesOrderVehicleService.java | 3 +++ .../biz/finbillapplication/FinBillApplicationService.java | 1 - .../api/autoservice/invoiced/FinBillTrailerVo.java | 2 +- 6 files changed, 13 insertions(+), 9 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 d37ef1c0e5..2c9c925729 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 @@ -1117,6 +1117,8 @@ public class BaseVehicleOutService extends MybatisBaseService>> getCanUseCarsPage(@RequestBody PagerQuery pagerQuery); - @ApiOperation("根据临时编码查询车辆信息") + @ApiOperation("根据车辆sid和合同编码查询客户临时编码") @GetMapping("/fetchByLSBM/{fNumber}") @ResponseBody ResultBean fetchByLSBM(@PathVariable("fNumber") String fNumber); diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusVehicleQKKPTrailerVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusVehicleQKKPTrailerVo.java index 1a9e9dcf7b..92397d9c21 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusVehicleQKKPTrailerVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusVehicleQKKPTrailerVo.java @@ -13,8 +13,10 @@ import lombok.Data; public class BusVehicleQKKPTrailerVo implements Vo { @ApiModelProperty("挂车车架号") - private String gcVinNo; // 挂车车架号 + private String gcVinNo; @ApiModelProperty("车架号") - private String vinNo; // 车架号 + private String vinNo; + @ApiModelProperty("挂车开票金额") + private String oneBillMoney; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java index 8de89ecf8e..b682be055e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java @@ -29,6 +29,7 @@ import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo; +import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo; import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign; import com.yxt.anrui.base.api.basetrailer.TrailerVo; import com.yxt.anrui.base.api.basetrailer.TraliveredVo; @@ -307,6 +308,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData(); List hgzImageUrls = new ArrayList<>(); for (CommonAppendixVo commonAppendixVo : commonAppendixVos) { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java index a0ed92ce70..c7bc1d8926 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java @@ -67,7 +67,7 @@ public class FinBillTrailerVo implements Vo { @ApiModelProperty("开票信息") private String invoiceInfo; @ApiModelProperty("单台开票金额") - private String oneBillMoney; // 单台开票金额 + private String oneBillMoney; @ApiModelProperty("合格证图片") private List files; } From 1cfdae2dc29b9593128184ef45d454bf58816f39 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 18 May 2023 16:47:32 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=86=E4=BA=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java index 1613fe3e5c..46914b001e 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java @@ -686,7 +686,8 @@ public class FlowableRest implements FlowableFeign { mfq.setUserSids(userSids.toString()); UpdateFlowFieldVo uff = new UpdateFlowFieldVo(); - uff.setTaskDefKey(taskDefKey); +// uff.setTaskDefKey(taskDefKey); + uff.setTaskDefKey(historicTaskInstance.getTaskDefinitionKey()); uff.setTaskId(taskId); uff.setProcInsId(proInstId); uff.setProcDefId(modelId); From 9a272019d36fb298b84079baee2e063d78ae3081 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 18 May 2023 16:50:21 +0800 Subject: [PATCH 14/14] =?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 --- .../fin/biz/finbillapplication/FinBillApplicationService.java | 3 +++ 1 file changed, 3 insertions(+) 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 1c1ba3eb79..6268cd2902 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 @@ -1553,6 +1553,9 @@ public class FinBillApplicationService extends MybatisBaseService finBillTrailers = dto.getFinBillTrailers(); List finBillVehicles = dto.getFinBillVehicles(); List fjApplicationAppendxs = dto.getFjApplicationAppendxs(); + if ("是".equals(dto.getIsLQOrigInvoice())){ + return rb.setMsg("请选择未领取发票原件的申请"); + } if (StringUtils.isBlank(dtoSid)) {//新增 String qkkpBillNo = dto.getBillNo(); FinBillApplicationDetailsVo finBillApplicationDetailsVo = baseMapper.fetchByQkkpBillNo(qkkpBillNo);