From 58f730ae72d1df1f014f7df412c8a46e15eafc1b Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 5 Mar 2024 16:39:50 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/busvehicleapply/BusVehicleApplyFeign.java | 5 ++++- .../BusVehicleApplyFeignFallback.java | 5 +++++ .../biz/busvehicleapply/BusVehicleApplyRest.java | 7 +++++++ .../LoanHomevisitPrepService.java | 10 +++++++--- .../scm/api/scmapplyinbound/ScmApplyInboundVo.java | 3 +++ .../scmapplyinbound/ScmApplyInboundService.java | 14 ++++++++------ 6 files changed, 34 insertions(+), 10 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java index cdcdf4473e..ede8355576 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java @@ -112,5 +112,8 @@ public interface BusVehicleApplyFeign { @ResponseBody public ResultBean assignTask(@RequestBody AppBusVehicleApplyDelegateQuery query); - + @ApiOperation("根据排产编号查询") + @PostMapping("/getBillNo") + @ResponseBody + ResultBean getBillNo(@RequestParam("pcApplicationCode") String pcApplicationCode); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java index b4a8016436..027fdf356c 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java @@ -121,4 +121,9 @@ public class BusVehicleApplyFeignFallback implements BusVehicleApplyFeign { public ResultBean assignTask(AppBusVehicleApplyDelegateQuery query) { return null; } + + @Override + public ResultBean getBillNo(String pcApplicationCode) { + return null; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyRest.java index 0d164ade67..6ef95061e8 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyRest.java @@ -133,6 +133,13 @@ public class BusVehicleApplyRest implements BusVehicleApplyFeign { return busVehicleApplyService.assignTask(query); } + @Override + public ResultBean getBillNo(String pcApplicationCode) { + ResultBean rb = ResultBean.fireFail(); + BusVehicleApply busVehicleApply = busVehicleApplyService.selectByCode(pcApplicationCode); + return rb.success().setData(busVehicleApply); + } + /* @Override public ResultBean shareBusVehicleApply(ShareBusVehicleApplyQuery shareQuery) { return busVehicleApplyService.shareBusVehicleApply(shareQuery); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java index d832fd66fe..46d99efcae 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java @@ -553,7 +553,9 @@ public class LoanHomevisitPrepService extends MybatisBaseService 0) { - String typeName = appOrderDetailsVo.getPayType() + printConfirmDto.getContractNo() + ".pdf"; + String dateStr = DateUtil.format(new Date(), "yyyyMMdd"); + long seconds = System.currentTimeMillis(); + String typeName = appOrderDetailsVo.getPayType() + printConfirmDto.getContractNo() + "_" + dateStr + seconds + ".pdf"; try { File allFile = WordConvertUtils.mulFile2One(filesList, docPdfComponent.getUploadTemplateUrl() + typeName); } catch (Exception e) { @@ -1246,11 +1248,11 @@ public class LoanHomevisitPrepService extends MybatisBaseService urls = new ArrayList<>(); if (conSetUpKey.equals("001")) { for (SalesOrderVehicle salesOrderVehicle : salesOrderVehicles) { + //融资金额 + map.put("downPayMoney", solutionsDetailsVo.getLoanAmountTotal()); //保证金款项 map.put("bondAmounts", solutionsDetailsVo.getBondAmounts()); //车辆落户保证金 @@ -1298,6 +1300,8 @@ public class LoanHomevisitPrepService extends MybatisBaseService listPage(PagerQuery pq) { @@ -262,9 +263,7 @@ public class ScmApplyInboundService extends MybatisBaseService vehicleList = dto.getVehicleList(); - if (StringUtils.isBlank(dto.getOrgPriceDate())){ + if (StringUtils.isBlank(dto.getOrgPriceDate())) { return new ResultBean().fail().setMsg("公司入库日期不能为空"); } /*int vinCount = 0;