From afa4b933c8d3f562cb81042b061da0533b642ad1 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 12 Jul 2023 09:02:15 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/uploadFile/FaImages.vue | 178 -------------- .../src/components/uploadFile/FileUpload.vue | 155 ------------ .../src/components/uploadFile/ImageUpload.vue | 132 ---------- .../components/uploadFile/ImageUploadChe.vue | 159 ------------ .../components/uploadFile/ManyImageUpload.vue | 229 ------------------ .../src/components/uploadFile/index.vue | 116 --------- .../src/components/uploadFile/upload.vue | 194 --------------- 7 files changed, 1163 deletions(-) delete mode 100644 anrui-riskcenter-ui/src/components/uploadFile/FaImages.vue delete mode 100644 anrui-riskcenter-ui/src/components/uploadFile/FileUpload.vue delete mode 100644 anrui-riskcenter-ui/src/components/uploadFile/ImageUpload.vue delete mode 100644 anrui-riskcenter-ui/src/components/uploadFile/ImageUploadChe.vue delete mode 100644 anrui-riskcenter-ui/src/components/uploadFile/ManyImageUpload.vue delete mode 100644 anrui-riskcenter-ui/src/components/uploadFile/index.vue delete mode 100644 anrui-riskcenter-ui/src/components/uploadFile/upload.vue diff --git a/anrui-riskcenter-ui/src/components/uploadFile/FaImages.vue b/anrui-riskcenter-ui/src/components/uploadFile/FaImages.vue deleted file mode 100644 index e47d3a9c87..0000000000 --- a/anrui-riskcenter-ui/src/components/uploadFile/FaImages.vue +++ /dev/null @@ -1,178 +0,0 @@ - - - - - diff --git a/anrui-riskcenter-ui/src/components/uploadFile/FileUpload.vue b/anrui-riskcenter-ui/src/components/uploadFile/FileUpload.vue deleted file mode 100644 index 80349528e6..0000000000 --- a/anrui-riskcenter-ui/src/components/uploadFile/FileUpload.vue +++ /dev/null @@ -1,155 +0,0 @@ - - - - - diff --git a/anrui-riskcenter-ui/src/components/uploadFile/ImageUpload.vue b/anrui-riskcenter-ui/src/components/uploadFile/ImageUpload.vue deleted file mode 100644 index 30011b8875..0000000000 --- a/anrui-riskcenter-ui/src/components/uploadFile/ImageUpload.vue +++ /dev/null @@ -1,132 +0,0 @@ - - - - - diff --git a/anrui-riskcenter-ui/src/components/uploadFile/ImageUploadChe.vue b/anrui-riskcenter-ui/src/components/uploadFile/ImageUploadChe.vue deleted file mode 100644 index 7ef250bbe7..0000000000 --- a/anrui-riskcenter-ui/src/components/uploadFile/ImageUploadChe.vue +++ /dev/null @@ -1,159 +0,0 @@ - - - - - diff --git a/anrui-riskcenter-ui/src/components/uploadFile/ManyImageUpload.vue b/anrui-riskcenter-ui/src/components/uploadFile/ManyImageUpload.vue deleted file mode 100644 index 5060ec457a..0000000000 --- a/anrui-riskcenter-ui/src/components/uploadFile/ManyImageUpload.vue +++ /dev/null @@ -1,229 +0,0 @@ - - - - - diff --git a/anrui-riskcenter-ui/src/components/uploadFile/index.vue b/anrui-riskcenter-ui/src/components/uploadFile/index.vue deleted file mode 100644 index 1b2b36b3c4..0000000000 --- a/anrui-riskcenter-ui/src/components/uploadFile/index.vue +++ /dev/null @@ -1,116 +0,0 @@ - - - - - diff --git a/anrui-riskcenter-ui/src/components/uploadFile/upload.vue b/anrui-riskcenter-ui/src/components/uploadFile/upload.vue deleted file mode 100644 index d4418a8200..0000000000 --- a/anrui-riskcenter-ui/src/components/uploadFile/upload.vue +++ /dev/null @@ -1,194 +0,0 @@ - - - - - From 9ab260a5a30c27fa673840f869e46620872be2bc Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 12 Jul 2023 10:13:57 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=BB=93=E8=BD=AC?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinFundsCarriedForwardApplyService.java | 61 ++++++++++++++++++- 1 file changed, 59 insertions(+), 2 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java index 669ad1209e..25e42e4104 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java @@ -45,9 +45,11 @@ import com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVeh import com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVehDto; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed; import com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationService; import com.yxt.anrui.fin.biz.finfundscarriedforwardveh.FinFundsCarriedForwardVehService; import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService; +import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedService; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; @@ -123,6 +125,8 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService listPageVo(PagerQuery pq) { FinFundsCarriedForwardApplyQuery query = pq.getParams(); @@ -506,8 +510,8 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService yxysFinFundsCarriedForwardYXYSKXVos = dto.getYxysFinFundsCarriedForwardYXYSKXVos(); Long rkje = yxysFinFundsCarriedForwardYXYSKXVos.stream().collect(Collectors.summingLong(AppFinFundsCarriedForwardYXYSKXDto::getConfirmMoney)); - if (rkje < jzjehj) { - return rb.setMsg("认款金额不能小于填写的结转金额"); + if (rkje != jzjehj) { + return rb.setMsg("认款金额与结转金额不符"); } if ("已认款".equals(dto.getSource())) { Boolean isOneSale = true; @@ -530,6 +534,13 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos(); + if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())){ + for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) { + FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid()); + BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().add(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney())); + finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney); + finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed); + } + } //极光推送 finFundsCarriedForwardApply = fetchBySid(businessSid); MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); @@ -770,6 +797,16 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos(); + if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())){ + for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) { + FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid()); + BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().add(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney())); + finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney); + finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed); + } + } return rb.success().setData(resultBean.getData()); } } @@ -800,6 +837,16 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); updateYeBySid(query.getBusinessSid()); + FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(query.getBusinessSid()).getData(); + List yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos(); + if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())){ + for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) { + FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid()); + BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().add(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney())); + finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney); + finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed); + } + } return rb.success().setData(resultBean.getData()); } else { if (businessTaskId.equals(query.getTaskId())) { @@ -812,6 +859,16 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); updateYeBySid(query.getBusinessSid()); + FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(query.getBusinessSid()).getData(); + List yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos(); + if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())){ + for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) { + FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid()); + BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().add(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney())); + finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney); + finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed); + } + } return rb.success().setData(resultBean.getData()); } } From 1e489196cdf61c36b55ce1bc8eac70918b672f8b Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 12 Jul 2023 10:42:35 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=BB=93=E8=BD=AC?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index 3e358b2a0e..ce12a657bb 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -278,11 +278,11 @@ public class ScmApplyInboundService extends MybatisBaseService 0) { - return new ResultBean().setMsg(vinNoList.get(i) + "车架号已经存在"); + return new ResultBean().setMsg("入库车辆信息中" + vinNoList.get(i) + "车架号已经存在"); } if (data != null) { if (StringUtils.isNotBlank(data.getVinNo())) { - return new ResultBean().setMsg(vinNoList.get(i) + "车架号已经存在"); + return new ResultBean().setMsg("车辆台账信息中" + vinNoList.get(i) + "车架号已经存在"); } } } From 9e3bcbf8bd74add66cf4cf6ce668e4b299e7939e Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 12 Jul 2023 11:16:33 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=BB=93=E8=BD=AC?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinFundsCarriedForwardApplyDetailsVo.java | 2 +- .../FinFundsCarriedForwardApplyService.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyDetailsVo.java index ad6f42d8e4..ceb931c044 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyDetailsVo.java @@ -96,7 +96,7 @@ public class FinFundsCarriedForwardApplyDetailsVo implements Vo { private String procInsId; private String taskId; @ApiModelProperty("结转金额合计") - private String jzjehj; // 结转金额合计 + private Integer jzjehj; @ApiModelProperty("pdf路径") private String pdfPath; @ApiModelProperty("款项确认书附件") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java index 25e42e4104..d59aa912a1 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java @@ -43,6 +43,7 @@ import com.yxt.anrui.fin.api.finfundscarriedforwardapply.flowable.SubmitFinFunds import com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVeh; import com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVehDetailsVo; import com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVehDto; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.AppFinSelectedReceivablesDetailedDto; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed; From a3f31f31deaf4e1c92600f9228ec5f89e2339dce Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 12 Jul 2023 11:32:57 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=8A=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E4=BA=A7=E5=93=81=E6=94=BF=E7=AD=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bussalesorder/BusSalesOrderService.java | 33 ++++++++++- .../anrui/flowable/biz/flow/FlowableRest.java | 14 +++-- .../loanfinotherPolicy/AppOtherPolicyVo.java | 28 +++++++++ .../api/loanfinpolicy/AppPolicyDetailsVo.java | 17 +++++- .../api/loanfinpolicy/LoanFinPolicyFeign.java | 4 +- .../LoanFinOtherPolicyMapper.java | 3 + .../LoanFinOtherPolicyMapper.xml | 6 ++ .../LoanFinOtherPolicyService.java | 5 ++ .../loanfinpolicy/LoanFinPolicyMapper.java | 3 + .../biz/loanfinpolicy/LoanFinPolicyMapper.xml | 26 ++++++++ .../biz/loanfinpolicy/LoanFinPolicyRest.java | 5 +- .../loanfinpolicy/LoanFinPolicyService.java | 23 ++++++++ .../FinancialOtherPolicyVo.java | 31 ++++++++++ .../FinancialPolicyDetailsVo.java | 59 +++++++++++++++++++ .../financialPolicy/FinancialPolicyFeign.java | 6 ++ .../financialPolicy/FinancialPolicyRest.java | 6 ++ .../FinancialPolicyService.java | 15 ++++- 17 files changed, 268 insertions(+), 16 deletions(-) create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/AppOtherPolicyVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialOtherPolicyVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialPolicyDetailsVo.java 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 feba768e52..caf7535667 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 @@ -5452,7 +5452,36 @@ public class BusSalesOrderService extends MybatisBaseService vinListVos = new ArrayList<>(); - //根据销售订单查询现车 + List busSalesOrderVehicleList = busSalesOrderVehicleService.selectListByOrderSid(saleOrderSid); + busSalesOrderVehicleList.removeAll(Collections.singleton(null)); + if (!busSalesOrderVehicleList.isEmpty()) { + for (int i = 0; i < busSalesOrderVehicleList.size(); i++) { + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleList.get(i); + VinListVo vinListVo = new VinListVo(); + if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) { + vinListVo.setLinkNo(busSalesOrderVehicle.getLinkNo()); + } + if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkSid())) { + vinListVo.setLinkSid(busSalesOrderVehicle.getLinkSid()); + } + if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkSid())) { + //根据车架号查询是否已出库 + ResultBean baseVehicleResultBean = baseVehicleFeign.details(busSalesOrderVehicle.getLinkSid()); + if (baseVehicleResultBean.getSuccess()) { + BaseVehicleSelectVo vo = baseVehicleResultBean.getData(); + if (vo != null) { + if (VehicleState.StockEnum.OUT_STOCK.getCode().equals(vo.getVehicleState())) { + vinListVo.setState(true); + } else { + vinListVo.setState(false); + } + } + } + } + vinListVos.add(vinListVo); + } + } + /* //根据销售订单查询现车 List nowCarList = busSalesOrderVehicleService.selectAppDetailsVoBySaleOrderSid(saleOrderSid); nowCarList.removeAll(Collections.singleton(null)); AppOrderDetailsVo appOrderDetailsVo = resultBean.getData(); @@ -5492,7 +5521,7 @@ public class BusSalesOrderService extends MybatisBaseService sysFlowableConfigVvoResultBean = sysFlowableConfigFeign.selectByUserSid(sysFlowableConfigQuery); - if (sysFlowableConfigVvoResultBean.getData() != null) { + if (sysFlowableConfigVvoResultBean.getData() != null) {//若下一环节有转办人且不过期，则isChange为true if (StringUtils.isNotBlank(sysFlowableConfigVvoResultBean.getData().getChangeUserSid())) { //转办人sid nextUserSid = sysFlowableConfigVvoResultBean.getData().getChangeUserSid(); @@ -466,12 +466,12 @@ public class FlowableRest implements FlowableFeign { taskService.addComment(taskId, instanceId, FlowComment.DELEGATE.getType(), comment); taskService.resolveTask(taskId, formVariables); - } else { + } else {//当前环节办理通过，且将下一环节用户放入流程中 taskService.addComment(taskId, instanceId, FlowComment.NORMAL.getType(), comment); log.error("taskid:{}，userSid:{}", taskId, userSid); log.error("formVariables:{}", JSON.toJSONString(formVariables)); taskService.setAssignee(taskId, userSid); - taskService.complete(taskId, formVariables); + taskService.complete(taskId, formVariables);//当前用户办理通过 //根据流程实例的id取最新的待办环节，给环节设置上用户sid ResultBean> ll = flowtaskService.getLatestTasksNew(instanceId); if (ll.getData().size() > 0) { @@ -486,7 +486,7 @@ public class FlowableRest implements FlowableFeign { processCommentDto.setProcessId(dto.getInstanceId()); processCommentService.saveOrUpdateDto(processCommentDto); } - taskService.setAssignee(id_, nextUserSid); + taskService.setAssignee(id_, nextUserSid);//将下一环节用户放入流程中 vo.setTaskId(id_); //在act_ru_variable表中增加环节上的业务参数的变量 taskService.setVariablesLocal(id_, formVariables); @@ -507,14 +507,16 @@ public class FlowableRest implements FlowableFeign { } List flowElements = processService.calApprovePath(dto.getModelId(), dto.getModelId(), dto.getFormVariables()); - boolean contains = false; + boolean contains = false;//环节人是否自动审批 for (int i = 0; i < flowElements.size(); i++) { FlowElement flowElement = flowElements.get(i); String id = flowElement.getId(); if (taskDefKey.equals(id) && i + 1 < flowElements.size()) { + //获取下下一环节 FlowElement flowElement1 = flowElements.get(i + 1); List sysUserVoLists2 = new ArrayList<>(); if (i + 2 < flowElements.size()) { + //获取下下下一环节用户 FlowElement flowElement2 = flowElements.get(i + 2); if (flowElement2 instanceof UserTask) { UserTask userTask = (UserTask) flowElement2; @@ -569,7 +571,7 @@ public class FlowableRest implements FlowableFeign { contains = true; break; } - //如果下一环节无用户，则默认系统管理员自动审批 + //如果下下一环节无用户，下下下一环节用户与下一环节用户相同且只有一个，则下一环节用户自动审批。 if (sysUserVoLists.size() == 0 && sysUserVoLists2.size() == 1 && sysUserVoLists2.get(0).getSid().equals(nextUserSid)) { contains = true; break; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/AppOtherPolicyVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/AppOtherPolicyVo.java new file mode 100644 index 0000000000..85e02ab96a --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/AppOtherPolicyVo.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.riskcenter.api.loanfinotherPolicy; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/7/12 + **/ +@Data +public class AppOtherPolicyVo { + + @ApiModelProperty("产品类别") + private String productTypeValue; + + @ApiModelProperty("最高融资额比例（%）") + private String maxLoanRatio; + + @ApiModelProperty("最高融资额") + private String maxLoanAmount; + + @ApiModelProperty("期数") + private String period; + + @ApiModelProperty("年利率（%）") + private String yearRatio; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/AppPolicyDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/AppPolicyDetailsVo.java index 51641dce3d..e7d05ef51a 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/AppPolicyDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/AppPolicyDetailsVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.riskcenter.api.loanfinpolicy; +import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.AppOtherPolicyVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -17,6 +18,7 @@ public class AppPolicyDetailsVo implements Vo { private String policyName; @ApiModelProperty("适用部门，黑龙江销售部或分公司") private String useDeptNames; + private String useOrgName; @ApiModelProperty("资方简称") private String bankShortName; @ApiModelProperty("业务类型") @@ -37,14 +39,25 @@ public class AppPolicyDetailsVo implements Vo { private String downPayRatioLeast; @ApiModelProperty("首付比例") private String downPayRatio; -/* @ApiModelProperty("保证金比例") + @ApiModelProperty("保证金比例") + private String bondRatio; @ApiModelProperty("期数") + private String period; @ApiModelProperty("标准年利率") + private String yearRatio; @ApiModelProperty("服务费类型") + private String serviceAmountTypeValue; @ApiModelProperty("服务费") + private String serviceAmount; @ApiModelProperty("保险保证金") + private String depositPremium; @ApiModelProperty("落户保证金") + private String depositSettle; @ApiModelProperty("名义/留购价款") + private String nominalPrice; @ApiModelProperty("有效期至") - @ApiModelProperty("其他融")*/ + private String validDateTo; + private int isOtherProduct; + @ApiModelProperty("其他融") + private AppOtherPolicyVo otherInfo; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java index e1d667a5f9..075078f15e 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java @@ -50,6 +50,6 @@ public interface LoanFinPolicyFeign { ResultBean> getProductList(@RequestBody PagerQuery pagerQuery); @ApiOperation("app金融产品常规详情") - @GetMapping("appDetails") - ResultBean appDetails(@RequestParam("sid") String sid); + @GetMapping("getProductInfo") + ResultBean getProductInfo(@RequestParam("sid") String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java index 8d6acac3db..0130e30359 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java @@ -1,6 +1,7 @@ package com.yxt.anrui.riskcenter.biz.loanfinotherPolicy; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.AppOtherPolicyVo; import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy; import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicyVos; import org.apache.ibatis.annotations.Mapper; @@ -21,4 +22,6 @@ public interface LoanFinOtherPolicyMapper extends BaseMapper LoanFinOtherPolicy selectByMainSid(String sid); LoanFinOtherPolicyVos details(String sid); + + AppOtherPolicyVo selectByMainSids(String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml index 8cf8cd214f..6a5b71bdb6 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml @@ -28,4 +28,10 @@ from loan_fin_otherpolicy where sid = #{sid} + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java index bd1fb0f3f6..3a0dde1201 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java @@ -1,5 +1,6 @@ package com.yxt.anrui.riskcenter.biz.loanfinotherPolicy; +import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.AppOtherPolicyVo; import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy; import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicyVos; import com.yxt.common.base.service.MybatisBaseService; @@ -40,4 +41,8 @@ public class LoanFinOtherPolicyService extends MybatisBaseService { List selectByBankSid(String sid); IPage getProductList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); + + AppPolicyDetailsVo getProductInfo(String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml index 73671d3e7d..6b3e9ff656 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml @@ -58,4 +58,30 @@ order by lfp.id desc + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyRest.java index a9bbaf4959..d5c428e178 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyRest.java @@ -62,8 +62,7 @@ public class LoanFinPolicyRest implements LoanFinPolicyFeign { } @Override - public ResultBean appDetails(String sid) { - ResultBean rb = ResultBean.fireFail(); - return null; + public ResultBean getProductInfo(String sid) { + return loanFinPolicyService.getProductInfo(sid); } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java index 649d7512e5..920ffd322c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java @@ -8,6 +8,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.AppOtherPolicyVo; import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy; import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicyDto; import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicyVo; @@ -406,4 +407,26 @@ public class LoanFinPolicyService extends MybatisBaseService getProductInfo(String sid) { + ResultBean rb = ResultBean.fireFail(); + AppPolicyDetailsVo appPolicyDetailsVo = baseMapper.getProductInfo(sid); + if (StringUtils.isBlank(appPolicyDetailsVo.getUseDeptNames())) { + appPolicyDetailsVo.setUseDeptNames(appPolicyDetailsVo.getUseOrgName()); + } + if (StringUtils.isNotBlank(appPolicyDetailsVo.getGuaranteeTypeKey())) { + if ("01".equals(appPolicyDetailsVo.getGuaranteeTypeKey())) { + appPolicyDetailsVo.setIsGuarantee("1"); + } else { + appPolicyDetailsVo.setIsGuarantee("0"); + } + } + if (appPolicyDetailsVo.getIsOtherProduct() == 1) {//有其他融 + AppOtherPolicyVo appOtherPolicyVo = loanFinOtherPolicyService.selectByMainSids(sid); + if (appOtherPolicyVo != null) { + appPolicyDetailsVo.setOtherInfo(appOtherPolicyVo); + } + } + return rb.success().setData(appPolicyDetailsVo); + } } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialOtherPolicyVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialOtherPolicyVo.java new file mode 100644 index 0000000000..f4e15c5ade --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialOtherPolicyVo.java @@ -0,0 +1,31 @@ +package com.yxt.anrui.terminal.api.autoservice.financialPolicy; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/7/12 + **/ +@Data +public class FinancialOtherPolicyVo implements Vo { + private static final long serialVersionUID = 3695189220403491871L; + + @ApiModelProperty("产品类别") + private String productTypeValue; + + @ApiModelProperty("最高融资额比例（%）") + private String maxLoanRatio; + + @ApiModelProperty("最高融资额") + private String maxLoanAmount; + + @ApiModelProperty("期数") + private String period; + + @ApiModelProperty("年利率（%）") + private String yearRatio; + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialPolicyDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialPolicyDetailsVo.java new file mode 100644 index 0000000000..3915c91547 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialPolicyDetailsVo.java @@ -0,0 +1,59 @@ +package com.yxt.anrui.terminal.api.autoservice.financialPolicy; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/7/12 + **/ +@Data +public class FinancialPolicyDetailsVo implements Vo { + private static final long serialVersionUID = -439513352576615253L; + + @ApiModelProperty("政策名称") + private String policyName; + @ApiModelProperty("适用部门，黑龙江销售部或分公司") + private String useDeptNames; + @ApiModelProperty("资方简称") + private String bankShortName; + @ApiModelProperty("业务类型") + private String busTypeValue; + @ApiModelProperty("车辆大类") + private String vehCategoryValue; + @ApiModelProperty("是否打包") + private String isPack; + @ApiModelProperty("是否担保") + private String isGuarantee; + @ApiModelProperty("备注") + private String remarks; + + @ApiModelProperty("单车意外险") + private String vehAccidentAmount; + @ApiModelProperty("最低首付比例") + private String downPayRatioLeast; + @ApiModelProperty("首付比例") + private String downPayRatio; + @ApiModelProperty("保证金比例") + private String bondRatio; + @ApiModelProperty("期数") + private String period; + @ApiModelProperty("标准年利率") + private String yearRatio; + @ApiModelProperty("服务费类型") + private String serviceAmountTypeValue; + @ApiModelProperty("服务费") + private String serviceAmount; + @ApiModelProperty("保险保证金") + private String depositPremium; + @ApiModelProperty("落户保证金") + private String depositSettle; + @ApiModelProperty("名义/留购价款") + private String nominalPrice; + @ApiModelProperty("有效期至") + private String validDateTo; + @ApiModelProperty("其他融") + private FinancialOtherPolicyVo otherInfo; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialPolicyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialPolicyFeign.java index c477b5e290..e5da6fdd4b 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialPolicyFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialPolicyFeign.java @@ -8,6 +8,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; /** * @description: 金融产品 @@ -25,4 +26,9 @@ public interface FinancialPolicyFeign { @ApiOperation("app金融产品资方常规") @PostMapping("getProductList") ResultBean> getProductList(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("app金融产品资方常规详情") + @PostMapping("getProductInfo") + ResultBean getProductInfo(@RequestParam("sid") String sid); + } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/financialPolicy/FinancialPolicyRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/financialPolicy/FinancialPolicyRest.java index f35605dec8..efe2de75a4 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/financialPolicy/FinancialPolicyRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/financialPolicy/FinancialPolicyRest.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.biz.autoservice.financialPolicy; +import com.yxt.anrui.terminal.api.autoservice.financialPolicy.FinancialPolicyDetailsVo; import com.yxt.anrui.terminal.api.autoservice.financialPolicy.FinancialPolicyFeign; import com.yxt.anrui.terminal.api.autoservice.financialPolicy.FinancialPolicyQuery; import com.yxt.anrui.terminal.api.autoservice.financialPolicy.FinancialPolicyVo; @@ -26,4 +27,9 @@ public class FinancialPolicyRest implements FinancialPolicyFeign { public ResultBean> getProductList(PagerQuery pagerQuery) { return financialPolicyService.getProductList(pagerQuery); } + + @Override + public ResultBean getProductInfo(String sid) { + return financialPolicyService.getProductInfo(sid); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/financialPolicy/FinancialPolicyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/financialPolicy/FinancialPolicyService.java index 43c56b1afe..0b5ce1f26a 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/financialPolicy/FinancialPolicyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/financialPolicy/FinancialPolicyService.java @@ -4,10 +4,11 @@ import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; import com.yxt.anrui.riskcenter.api.loanfinpolicy.AppLoanFinPolicyQuery; import com.yxt.anrui.riskcenter.api.loanfinpolicy.AppLoanFinPolicyVo; +import com.yxt.anrui.riskcenter.api.loanfinpolicy.AppPolicyDetailsVo; import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyFeign; +import com.yxt.anrui.terminal.api.autoservice.financialPolicy.FinancialPolicyDetailsVo; import com.yxt.anrui.terminal.api.autoservice.financialPolicy.FinancialPolicyQuery; import com.yxt.anrui.terminal.api.autoservice.financialPolicy.FinancialPolicyVo; -import com.yxt.anrui.terminal.api.autoservice.intermediary.MiddlemanVo; import com.yxt.anrui.terminal.config.CoverUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -41,4 +42,16 @@ public class FinancialPolicyService { v.setRecords(voList); return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v); } + + public ResultBean getProductInfo(String sid) { + ResultBean rb = ResultBean.fireFail(); + FinancialPolicyDetailsVo financialPolicyDetailsVo = new FinancialPolicyDetailsVo(); + ResultBean resultBean = loanFinPolicyFeign.getProductInfo(sid); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + AppPolicyDetailsVo appPolicyDetailsVo = resultBean.getData(); + BeanUtil.copyProperties(appPolicyDetailsVo, financialPolicyDetailsVo); + return rb.success().setData(financialPolicyDetailsVo); + } } From b457041a801992fcf7898b1c5ae831e27fe552aa Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 12 Jul 2023 11:38:29 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=BB=93=E8=BD=AC?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppFinFundsCarriedForwardYXYSKXDto.java | 2 +- .../AppFinFundsCarriedForwardYXYSKXVo.java | 2 +- .../FinFundsCarriedForwardApplyDetailsVo.java | 2 +- .../FinFundsCarriedForwardVehDto.java | 2 +- .../FinFundsCarriedForwardApplyService.java | 23 +++++++++++++++---- 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/AppFinFundsCarriedForwardYXYSKXDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/AppFinFundsCarriedForwardYXYSKXDto.java index d684045180..472c4f4b9d 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/AppFinFundsCarriedForwardYXYSKXDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/AppFinFundsCarriedForwardYXYSKXDto.java @@ -61,7 +61,7 @@ public class AppFinFundsCarriedForwardYXYSKXDto implements Dto { @ApiModelProperty("应收金额") private String receivable; @ApiModelProperty("认款金额") - private Integer confirmMoney; + private String confirmMoney; private Boolean checked; @ApiModelProperty("车架号") private String vin; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/AppFinFundsCarriedForwardYXYSKXVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/AppFinFundsCarriedForwardYXYSKXVo.java index 987e985e72..93b59b4c8d 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/AppFinFundsCarriedForwardYXYSKXVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/AppFinFundsCarriedForwardYXYSKXVo.java @@ -64,7 +64,7 @@ public class AppFinFundsCarriedForwardYXYSKXVo implements Dto { @ApiModelProperty("应收金额") private String receivable; @ApiModelProperty("认款金额") - private Integer confirmMoney; + private String confirmMoney; private Boolean checked; @ApiModelProperty("车架号") private String vin; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyDetailsVo.java index ceb931c044..35d59037b5 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyDetailsVo.java @@ -96,7 +96,7 @@ public class FinFundsCarriedForwardApplyDetailsVo implements Vo { private String procInsId; private String taskId; @ApiModelProperty("结转金额合计") - private Integer jzjehj; + private String jzjehj; @ApiModelProperty("pdf路径") private String pdfPath; @ApiModelProperty("款项确认书附件") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDto.java index 5444f0695d..fc503ddb18 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDto.java @@ -68,5 +68,5 @@ public class FinFundsCarriedForwardVehDto implements Dto { @ApiModelProperty("剩余金额") private String balance; // 剩余金额 @ApiModelProperty("本次使用金额") - private Integer thisUseMoney; // 本次使用金额 + private String thisUseMoney; // 本次使用金额 } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java index d59aa912a1..fae3127e3b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java @@ -263,7 +263,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService finFundsCarriedForwardVehDetailsVos = dto.getFinFundsCarriedForwardVehDetailsVos(); - Long jzjehj = finFundsCarriedForwardVehDetailsVos.stream().collect(Collectors.summingLong(FinFundsCarriedForwardVehDto::getThisUseMoney)); + BigDecimal jzjehj = new BigDecimal("0"); + for (FinFundsCarriedForwardVehDto finFundsCarriedForwardVehDto : finFundsCarriedForwardVehDetailsVos) { + String thisUseMoney = finFundsCarriedForwardVehDto.getThisUseMoney(); + jzjehj = jzjehj.add(new BigDecimal(thisUseMoney)); + } List yxysFinFundsCarriedForwardYXYSKXVos = dto.getYxysFinFundsCarriedForwardYXYSKXVos(); - Long rkje = yxysFinFundsCarriedForwardYXYSKXVos.stream().collect(Collectors.summingLong(AppFinFundsCarriedForwardYXYSKXDto::getConfirmMoney)); - if (rkje != jzjehj) { + BigDecimal rkje = new BigDecimal("0"); + for (AppFinFundsCarriedForwardYXYSKXDto yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) { + String confirmMoney = yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney(); + rkje = rkje.add(new BigDecimal(confirmMoney)); + } + int i = rkje.compareTo(jzjehj); + if (i != 0) { return rb.setMsg("认款金额与结转金额不符"); } if ("已认款".equals(dto.getSource())) { From 465526686c237d9490b5e391a27d0dbba975ee53 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 12 Jul 2023 13:42:11 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=BB=93=E8=BD=AC?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/finbillapplication/FinBillApplicationDetailsVo.java | 2 ++ .../biz/finbillapplication/FinBillApplicationService.java | 5 +++++ .../java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java | 2 +- .../api/autoservice/invoiced/BillApplicationIInfoVo.java | 2 ++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java index 3cfec08e7a..53e9143ed9 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java @@ -155,6 +155,8 @@ public class FinBillApplicationDetailsVo extends AppBillApplicationIInfoVo imple private String taskId; @ApiModelProperty(value = "当前用户部门全路径") private String orgSidPath; + @ApiModelProperty("是否显示价值客户") + private Boolean showValueCustomer; @ApiModelProperty("开票车辆信息") private List finBillVehicles; // 开票车辆信息 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 098bf4595a..0289d3a49a 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 @@ -636,6 +636,11 @@ public class FinBillApplicationService extends MybatisBaseService Date: Wed, 12 Jul 2023 15:11:06 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=BB=93=E8=BD=AC?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinFileTypeEnum.java | 6 +- .../FinPreloanCreditApply.java | 15 ++- .../FinPreloanCreditApplyDetailsVo.java | 14 +++ .../FinPreloanCreditApplyDto.java | 6 + .../FinPreloanCreditApplyFeign.java | 10 ++ .../FinPreloanCreditApplyFeignFallback.java | 10 ++ .../FinSubmitCapitalRiskDto.java | 50 ++++++++ .../FinSubmitCompanyRiskDto.java | 107 ++++++++++++++++++ .../FinPreloanCreditApplyRest.java | 10 ++ .../FinSelectedReceivablesDetailedMapper.xml | 2 +- 10 files changed, 227 insertions(+), 3 deletions(-) create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinSubmitCapitalRiskDto.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinSubmitCompanyRiskDto.java diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinFileTypeEnum.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinFileTypeEnum.java index 198bc88629..887c6e41a5 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinFileTypeEnum.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinFileTypeEnum.java @@ -13,7 +13,11 @@ public class FinFileTypeEnum { ID_CARD("01", "身份证"), - COMPANY_RISK("02", "公司风控要求的文件"); + COMPANY_RISK("02", "公司风控要求的文件"), + + COMPANY_QUERYRES("03", "公司风控查询结果截图"), + + CAPITAL_QUERYRES("04", "资方风控查询结果截图"); private final String code; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApply.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApply.java index 5a458e8030..105e7d9c74 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApply.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApply.java @@ -98,5 +98,18 @@ public class FinPreloanCreditApply extends BaseEntity { private String taskId; // 任务id @ApiModelProperty("申请编号") private String billNo; // 申请编号 - + @ApiModelProperty("公司风控结果") + private String gsfkjg; + @ApiModelProperty("公司审核日期") + private String gsshDate; + @ApiModelProperty("公司审核备注") + private String gsshRemarks; + @ApiModelProperty("资方风控结果") + private String zffkjg; + @ApiModelProperty("资方审核日期") + private String zfshDate; + @ApiModelProperty("资方审核备注") + private String zfshRemarks; + @ApiModelProperty("申诉结果") + private String ssjg; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyDetailsVo.java index d3a4f24c9b..05436d6a4c 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyDetailsVo.java @@ -104,6 +104,20 @@ public class FinPreloanCreditApplyDetailsVo implements Vo { private String taskId; // 任务id @ApiModelProperty("申请编号") private String billNo; // 申请编号 + @ApiModelProperty("公司风控结果") + private String gsfkjg; + @ApiModelProperty("公司审核日期") + private String gsshDate; + @ApiModelProperty("公司审核备注") + private String gsshRemarks; + @ApiModelProperty("资方风控结果") + private String zffkjg; + @ApiModelProperty("资方审核日期") + private String zfshDate; + @ApiModelProperty("资方审核备注") + private String zfshRemarks; + @ApiModelProperty("申诉结果") + private String ssjg; @ApiModelProperty("身份证正反面附件") private List idCardImages = new ArrayList<>(); @ApiModelProperty("贷前信用审核人员列表") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyDto.java index dbb0987a6c..6f057f9442 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyDto.java @@ -93,6 +93,12 @@ public class FinPreloanCreditApplyDto implements Dto { private String orgSidPath; // 组织全路径 @ApiModelProperty("申请编号") private String billNo; // 申请编号 + @ApiModelProperty("公司风控结果") + private String gsfkjg; + @ApiModelProperty("资方风控结果") + private String zffkjg; + @ApiModelProperty("申诉结果") + private String ssjg; @ApiModelProperty("身份证正反面附件") private List idCardImages = new ArrayList<>(); @ApiModelProperty("贷前信用审核人员列表") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyFeign.java index 5f1c9ad424..6af30bc135 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyFeign.java @@ -65,6 +65,16 @@ public interface FinPreloanCreditApplyFeign { @PostMapping("/save") @ResponseBody public ResultBean save(@RequestBody FinPreloanCreditApplyDto dto); + + @ApiOperation("公司风控提交") + @PostMapping("/submitCompanyRisk") + @ResponseBody + public ResultBean submitCompanyRisk(@RequestBody FinPreloanCreditApplyDto dto); + + @ApiOperation("资方风控提交") + @PostMapping("/submitCapitalRisk") + @ResponseBody + public ResultBean submitCapitalRisk(@RequestBody FinPreloanCreditApplyDto dto); @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyFeignFallback.java index 1c650e83e1..fc3e4a7136 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyFeignFallback.java @@ -59,6 +59,16 @@ public class FinPreloanCreditApplyFeignFallback implements FinPreloanCreditApply return ResultBean.fireFail().setMsg("接口anrui-fin/finpreloancreditapply/save无法访问"); } + @Override + public ResultBean submitCompanyRisk(FinPreloanCreditApplyDto dto) { + return null; + } + + @Override + public ResultBean submitCapitalRisk(FinPreloanCreditApplyDto dto) { + return null; + } + @Override public ResultBean delBySids( String[] sids){ return ResultBean.fireFail().setMsg("接口anrui-fin/finpreloancreditapply/delBySids无法访问"); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinSubmitCapitalRiskDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinSubmitCapitalRiskDto.java new file mode 100644 index 0000000000..5113cc130d --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinSubmitCapitalRiskDto.java @@ -0,0 +1,50 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.api.finpreloancreditapply; + +import com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoDto; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class FinSubmitCapitalRiskDto implements Dto { + + private String sid; + + @ApiModelProperty("公司审核结构") + private String gsshjg; + @ApiModelProperty("公司审核日期") + private String gsshDate; + @ApiModelProperty("公司审核备注") + private String gsshRemarks; + @ApiModelProperty("查询结果截图") + private List gsQueryResult = new ArrayList<>(); +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinSubmitCompanyRiskDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinSubmitCompanyRiskDto.java new file mode 100644 index 0000000000..7fa487474f --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinSubmitCompanyRiskDto.java @@ -0,0 +1,107 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.api.finpreloancreditapply; + + +import com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoDto; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * Project: anrui-fin(贷前信用审核管理)
+ * File: FinPreloanCreditApplyDto.java
+ * Class: com.yxt.anrui.fin.api.finpreloancreditapply.FinPreloanCreditApplyDto
+ * Description: 贷前信用审核申请表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-07-11 11:04:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "贷前信用审核申请表 数据传输对象", description = "贷前信用审核申请表 数据传输对象") +public class FinSubmitCompanyRiskDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("创建人接口") + private String createByName; // 创建人接口 + @ApiModelProperty("申请部门sid") + private String applyDeptSid; // 申请部门sid + @ApiModelProperty("申请部门名称") + private String applyDeptName; // 申请部门名称 + @ApiModelProperty("车型sid") + private String modelSid; // 车型sid + @ApiModelProperty("车型名称") + private String modelName; // 车型名称 + @ApiModelProperty("客户类型key") + private String custTypeKey; // 客户类型key + @ApiModelProperty("客户类型value") + private String custTypeValue; // 客户类型value + @ApiModelProperty("企业sid") + private String qySid; // 企业sid + @ApiModelProperty("企业名称") + private String qyName; // 企业名称 + @ApiModelProperty("身份证号码") + private String idCard; // 身份证号码 + @ApiModelProperty("客户sid") + private String custSid; // 客户sid + @ApiModelProperty("客户名称") + private String custName; // 客户名称 + @ApiModelProperty("手机号码") + private String phone; // 手机号码 + @ApiModelProperty("资方sid") + private String capitalSid; // 资方sid + @ApiModelProperty("资方名称") + private String capitalName; // 资方名称 + @ApiModelProperty("分公司sid") + private String useOrgSid; // 分公司sid + @ApiModelProperty("分公司名称") + private String useOrgName; // 分公司名称 + @ApiModelProperty("组织全路径") + private String orgSidPath; // 组织全路径 + @ApiModelProperty("申请编号") + private String billNo; // 申请编号 + @ApiModelProperty("公司风控结果") + private String gsfkjg; + @ApiModelProperty("资方风控结果") + private String zffkjg; + @ApiModelProperty("申诉结果") + private String ssjg; + @ApiModelProperty("身份证正反面附件") + private List idCardImages = new ArrayList<>(); + @ApiModelProperty("贷前信用审核人员列表") + private List finPreloanCreditPeos; + @ApiModelProperty("公司风控要求的文件") + private List comFkFiles = new ArrayList<>(); +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpreloancreditapply/FinPreloanCreditApplyRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpreloancreditapply/FinPreloanCreditApplyRest.java index d58db6df63..3f557dd600 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpreloancreditapply/FinPreloanCreditApplyRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpreloancreditapply/FinPreloanCreditApplyRest.java @@ -78,6 +78,16 @@ public class FinPreloanCreditApplyRest implements FinPreloanCreditApplyFeign { return finPreloanCreditApplyService.saveOrUpdateDto(dto); } + @Override + public ResultBean submitCompanyRisk(FinPreloanCreditApplyDto dto) { + return null; + } + + @Override + public ResultBean submitCapitalRisk(FinPreloanCreditApplyDto dto) { + return null; + } + @Override @ApiOperation("根据sid批量删除") @PostMapping("/delBySids") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml index e2fb6b9d74..c269756c1c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml @@ -345,7 +345,7 @@ LEFT JOIN fin_collection_confirmation fcc ON ferd.`collSid` = fcc.`sid` LEFT JOIN anrui_base.`base_vehicle` bv - ON ferd.`VIN` = bv.`vinNo` AND fcc.`useOrgSid` = bv.`createOrgSid` + ON ferd.`VIN` LIKE ('%*'+bv.vinNo+'*%') AND fcc.`useOrgSid` = bv.`createOrgSid` ${ew.sqlSegment} From 33c636457773397825e35fca1f408675511772d6 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 12 Jul 2023 15:46:52 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=BB=93=E8=BD=AC?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinSelectedReceivablesDetailedMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml index c269756c1c..a815fe60eb 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml @@ -345,7 +345,7 @@ LEFT JOIN fin_collection_confirmation fcc ON ferd.`collSid` = fcc.`sid` LEFT JOIN anrui_base.`base_vehicle` bv - ON ferd.`VIN` LIKE ('%*'+bv.vinNo+'*%') AND fcc.`useOrgSid` = bv.`createOrgSid` + ON RIGHT(ferd.`VIN`,8) = RIGHT(bv.`vinNo`,8) AND fcc.`useOrgSid` = bv.`createOrgSid` ${ew.sqlSegment} From 300deef0e8fbaeefec9626f3ff577831ef7a214a Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 12 Jul 2023 16:15:51 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=8A=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E4=BA=A7=E5=93=81=E6=94=BF=E7=AD=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/loanfinpolicy/AppPolicyDetailsVo.java | 1 + .../biz/loanfinpolicy/LoanFinPolicyMapper.xml | 4 +- .../loanfinpolicy/LoanFinPolicyService.java | 60 +++++++++++++++++++ .../FinancialOtherPolicyVo.java | 2 + .../FinancialPolicyDetailsVo.java | 20 +++++++ .../financialPolicy/FinancialPolicyFeign.java | 3 +- 6 files changed, 88 insertions(+), 2 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/AppPolicyDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/AppPolicyDetailsVo.java index e7d05ef51a..f2282470cd 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/AppPolicyDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/AppPolicyDetailsVo.java @@ -25,6 +25,7 @@ public class AppPolicyDetailsVo implements Vo { private String busTypeValue; @ApiModelProperty("车辆大类") private String vehCategoryValue; + private String vehTypeValue; @ApiModelProperty("是否打包") private String isPack; @ApiModelProperty("是否担保") diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml index 6b3e9ff656..d6baa75885 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml @@ -80,7 +80,9 @@ lfp.depositSettle, lfp.nominalPrice, lfp.validDateTo, - lfp.isOtherProduct + lfp.isOtherProduct, + lfp.vehTypeValue, + lfp.bondRatio from loan_fin_policy lfp where lfp.sid = #{sid} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java index 920ffd322c..63097ce37e 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java @@ -76,6 +76,36 @@ public class LoanFinPolicyService extends MybatisBaseService> getProductList(@RequestBody PagerQuery pagerQuery); @ApiOperation("app金融产品资方常规详情") - @PostMapping("getProductInfo") + @GetMapping("getProductInfo") ResultBean getProductInfo(@RequestParam("sid") String sid); } From fb4b7eea9b168749fa81ee11dbf41510b5b23a0d Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 12 Jul 2023 16:18:26 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kaipiaoguanliFlow/finginvoiceapplyByFileDaiBanInfo.vue | 3 ++- .../workFlow/kaipiaoguanliFlow/finginvoiceapplyDaiBanInfo.vue | 3 ++- .../workFlow/kaipiaoguanliFlow/finginvoiceapplyYiBanInfo.vue | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyByFileDaiBanInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyByFileDaiBanInfo.vue index 5def751afc..45e51e3d14 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyByFileDaiBanInfo.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyByFileDaiBanInfo.vue @@ -66,7 +66,7 @@
单台开票金额
- {{ formobj.oneBillMoney }} + {{ formobj.oneBillMoney }}价值客户
开票类型默认
@@ -303,6 +303,7 @@ export default { saleDeptSid: '', saleTypeKey: '', saleTypeValue: '', + showValueCustomer: false, sid: '', staffName: '', staffSid: '', diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyDaiBanInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyDaiBanInfo.vue index 01e2ed3290..3a521c9238 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyDaiBanInfo.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyDaiBanInfo.vue @@ -66,7 +66,7 @@
单台开票金额
- {{ formobj.oneBillMoney }} + {{ formobj.oneBillMoney }}价值客户
开票类型默认
@@ -303,6 +303,7 @@ export default { saleDeptSid: '', saleTypeKey: '', saleTypeValue: '', + showValueCustomer: false, sid: '', staffName: '', staffSid: '', diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyYiBanInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyYiBanInfo.vue index ec4afd16fa..2e2dace721 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyYiBanInfo.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyYiBanInfo.vue @@ -64,7 +64,7 @@
单台开票金额
- {{ formobj.oneBillMoney }} + {{ formobj.oneBillMoney }}价值客户
开票类型默认
@@ -274,6 +274,7 @@ export default { saleDeptSid: '', saleTypeKey: '', saleTypeValue: '', + showValueCustomer: false, sid: '', staffName: '', staffSid: '',