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/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-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 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 commonContractVoResultBean = commonContractFeign.getContractBySalesOrderSid(sid); if (commonContractVoResultBean.getData() != null) { 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 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; + } 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())) { //销售经理信审截图