From cbf3894323dfb6ac608335f488ab9bbaca57be85 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 4 Sep 2023 18:23:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanHomeVisitInvestigateNewDetailsVo.java | 6 ++++++ .../LoanHomevisitInvestigateService.java | 12 ++++++++++++ .../loanhomevisitinvestigate/AppFinanceForm.java | 3 +++ .../AppLoanHomeVisitInvestigateDetailsVo.java | 6 ++++++ .../LoanHomeVisitInvestigateService.java | 5 +++++ 5 files changed, 32 insertions(+) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateNewDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateNewDetailsVo.java index 4f00643cca..c09896fd29 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateNewDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateNewDetailsVo.java @@ -17,4 +17,10 @@ public class LoanHomeVisitInvestigateNewDetailsVo implements Vo { private List transInfo; @ApiModelProperty("资产情况") private List zCInfo; + @ApiModelProperty("订单信息") + private List orderInfo; + @ApiModelProperty("通过/不通过") + private String agree; + @ApiModelProperty("意见") + private String comment; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java index 2bc33ec4fa..060022e700 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java @@ -1140,6 +1140,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService details(String sid) { ResultBean rb = ResultBean.fireFail(); LoanHomeVisitInvestigateNewDetailsVo loanHomeVisitInvestigateNewDetailsVo = new LoanHomeVisitInvestigateNewDetailsVo(); + LoanHomevisitInvestigate loanHomevisitInvestigate = fetchBySid(sid); List userInfo = new ArrayList<>(); FinanceForm financeForm1 = new FinanceForm(); financeForm1.setValue("借款人"); @@ -1401,10 +1402,21 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService orderInfo = new ArrayList<>(); + FinanceForm financeForm52 = new FinanceForm(); + financeForm52.setValue("车辆信息确认"); + financeForm52.setSpanSize(2); + financeForm52.setType(1); + financeForm52.setBold(true); + orderInfo.add(financeForm52); loanHomeVisitInvestigateNewDetailsVo.setUserInfo(userInfo); loanHomeVisitInvestigateNewDetailsVo.setYYInfo(yYInfo); loanHomeVisitInvestigateNewDetailsVo.setTransInfo(transInfo); loanHomeVisitInvestigateNewDetailsVo.setZCInfo(zCInfo); + loanHomeVisitInvestigateNewDetailsVo.setOrderInfo(orderInfo); + loanHomeVisitInvestigateNewDetailsVo.setAgree(loanHomevisitInvestigate.getInvestigateValue()); + loanHomeVisitInvestigateNewDetailsVo.setComment(loanHomevisitInvestigate.getRemarks()); return rb.success().setData(loanHomeVisitInvestigateNewDetailsVo); } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppFinanceForm.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppFinanceForm.java index 764e4b47b2..e8f49512c5 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppFinanceForm.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppFinanceForm.java @@ -19,4 +19,7 @@ public class AppFinanceForm { //图片 private List files; private List sonForms; + + private Boolean jumpPage = false; + private AppLoanHomeVisitVo pluginPage; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateDetailsVo.java index c263f7f025..7ed8cfc18e 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateDetailsVo.java @@ -17,4 +17,10 @@ public class AppLoanHomeVisitInvestigateDetailsVo implements Vo { private List transInfo; @ApiModelProperty("资产情况") private List zCInfo; + @ApiModelProperty("订单信息") + private List orderInfo; + @ApiModelProperty("通过/不通过") + private String agree; + @ApiModelProperty("意见") + private String comment; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java index 1164768d2e..1f179e431b 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java @@ -146,6 +146,11 @@ public class LoanHomeVisitInvestigateService { LoanHomeVisitInvestigateNewDetailsVo loanHomeVisitInvestigateNewDetailsVo = loanHomevisitInvestigateFeign.details(sid).getData(); AppLoanHomeVisitInvestigateDetailsVo appLoanHomeVisitInvestigateDetailsVo = new AppLoanHomeVisitInvestigateDetailsVo(); BeanUtil.copyProperties(loanHomeVisitInvestigateNewDetailsVo,appLoanHomeVisitInvestigateDetailsVo); + List orderInfo = appLoanHomeVisitInvestigateDetailsVo.getOrderInfo(); + for (AppFinanceForm appFinanceForm : orderInfo) { + appFinanceForm.setJumpPage(true); + + } return rb.success().setData(appLoanHomeVisitInvestigateDetailsVo); } From 995355130a01992a2a0f6639aa38b2baa63bc6b5 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 5 Sep 2023 10:44:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseTrailerOutApplyService.java | 22 +++++------ .../basevehicleout/BaseVehicleOutService.java | 39 ++++++++++++++++--- .../FinBillApplicationFeign.java | 5 +++ .../FinBillApplicationFeignFallback.java | 5 +++ .../FinBillApplicationRest.java | 7 ++++ 5 files changed, 61 insertions(+), 17 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetraileroutapply/BaseTrailerOutApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetraileroutapply/BaseTrailerOutApplyService.java index 8c4548059f..465be20383 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetraileroutapply/BaseTrailerOutApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetraileroutapply/BaseTrailerOutApplyService.java @@ -275,13 +275,13 @@ public class BaseTrailerOutApplyService extends MybatisBaseService appAppendixList = commonAppendixService.getAppAppendixList(baseTrailer.getSid(), "挂车合格证照片"); 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 800de656e7..499624c6d6 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 @@ -1657,7 +1657,7 @@ public class BaseVehicleOutService extends MybatisBaseService gcOrSzDtos, BaseVehicleOutApply baseVehicleOutApply, String temporaryNumGcOrSz) { SalOutStock salOutStock = new SalOutStock(); //单据编号 - salOutStock.setFBillNo(baseVehicleOutApply.getBillNo() + "-" + temporaryNumGcOrSz); + if (StringUtils.isNotBlank(temporaryNumGcOrSz)){ + salOutStock.setFBillNo(baseVehicleOutApply.getBillNo() + "-" + temporaryNumGcOrSz); + }else { + salOutStock.setFBillNo(baseVehicleOutApply.getBillNo()); + } //日期 salOutStock.setFDate(DateUtil.today()); //分公司id @@ -1786,7 +1790,7 @@ public class BaseVehicleOutService extends MybatisBaseService 0) { + SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtos, baseVehicleOutApply, ""); + ResultBean resultBean = finKingDeeFeign.draftSalOutStock(salOutStockGcOrSz); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success(); + } + } + int x = 1; + String temporaryNumZc = String.format("%02d", x); //推送所有主车销售出库单 SalOutStock salOutStock = createZSSalOutStockQKC(baseVehicleOutApply, zcDtos); finKingDeeFeign.draftSalOutStock(salOutStock); - int x = 1; - String temporaryNumZc = String.format("%02d", x); //推送所有上装或挂车销售出库单 if (gcOrSzDtos.size() > 0) { SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtos, baseVehicleOutApply, temporaryNumZc); @@ -2173,6 +2188,17 @@ public class BaseVehicleOutService extends MybatisBaseService gcOrSzDtosDK = new ArrayList<>(); + //挂车单独出库重推 + if (zcDtosDK.size() == 0) { + if (gcOrSzDtos.size() > 0) { + SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtos, baseVehicleOutApply, ""); + ResultBean resultBean = finKingDeeFeign.draftSalOutStock(salOutStockGcOrSz); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success(); + } + } int j = 0; for (BaseVehicleOut vehicleOut : zcDtosDK) { BaseVehicle baseVehicle = baseVehicleService.fetchBySid(vehicleOut.getVinSid()); @@ -2197,6 +2223,7 @@ public class BaseVehicleOutService extends MybatisBaseService fetchDetailsBySid(@PathVariable("sid") String sid); + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchBySid/{sid}") + @ResponseBody + public ResultBean fetchBySid(@PathVariable("sid") String sid); + @ApiOperation("生成欠款申请PDF") @PostMapping("/createPdf") @ResponseBody diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java index 8dccb64229..0765725a00 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java @@ -96,6 +96,11 @@ public class FinBillApplicationFeignFallback implements FinBillApplicationFeign return rb.setMsg("接口anrui-fin/finbillapplication/fetchDetailsBySid无法访问"); } + @Override + public ResultBean fetchBySid(String sid) { + return null; + } + @Override public ResultBean createPdf(String sid, String userName) { return null; diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java index 11060bd058..1bb4bc8497 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java @@ -121,6 +121,13 @@ public class FinBillApplicationRest implements FinBillApplicationFeign { return rb.success().setData(vo); } + @Override + public ResultBean fetchBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + FinBillApplication finBillApplication = finBillApplicationService.fetchBySid(sid); + return rb.success().setData(finBillApplication); + } + @Override public ResultBean createPdf(String sid, String userName) { return finBillApplicationService.createPdf(sid,userName);