From 40285174a35dde09bcc65ad7af226ed0219ee1db Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 23 Aug 2023 09:43:35 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E3=80=81=E5=8E=82=E5=AE=B6=E9=87=87=E8=B4=AD=E3=80=81=E5=AD=98?= =?UTF-8?q?=E6=94=BE=E5=9C=B0=E7=82=B9=E5=8F=98=E6=9B=B4=E3=80=81=E6=9C=AA?= =?UTF-8?q?=E5=94=AE=E4=B9=B0=E6=96=AD=E3=80=81=E6=AC=A0=E6=AC=BE=E6=8F=90?= =?UTF-8?q?=E8=BD=A6=E7=94=B3=E8=AF=B7=E3=80=81=E5=87=BA=E5=BA=93=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E9=A9=B3=E5=9B=9E=E7=9A=84=E6=B6=88=E6=81=AF=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E6=B7=BB=E5=8A=A0=E7=BA=BF=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseVehicleActualSalesService.java | 96 +++++++++++-------- .../BusVehicleApplyService.java | 62 +++++++----- .../BusArrearsCarryVehicleApplyService.java | 87 ++++++++++------- .../BusDeliveredApplyService.java | 52 ++++++---- .../anrui/flowable/api/flow2/FlowFeign.java | 4 - .../anrui/flowable/biz/flow2/FlowRest.java | 5 - .../anrui/flowable/biz/flow2/FlowService.java | 24 ----- .../ScmVehicleGressionService.java | 58 ++++++----- 8 files changed, 209 insertions(+), 179 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java index 976c12092b..e2e891a0dc 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java @@ -52,6 +52,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGression; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -156,9 +157,9 @@ public class BaseVehicleActualSalesService extends MybatisBaseService0){ + if (scmVehicleActualSalesDto.getDetailsList().size() > 0) { salesMoney = scmVehicleActualSalesDto.getDetailsList().stream().map(BaseVehicleActualDetailsDto::getActualMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); } if ("1".equals(scmVehicleActualSalesDto.getIsPay())) { @@ -186,15 +187,15 @@ public class BaseVehicleActualSalesService extends MybatisBaseService0){ + if (payMoney.compareTo(salesMoney) > 0) { return rb.setMsg("付款合计不允许大于买断金额合计"); } //新增 //======================================= String orgSidPath = ""; - if(StringUtils.isNotBlank(scmVehicleActualSalesDto.getOrgPath())){ + if (StringUtils.isNotBlank(scmVehicleActualSalesDto.getOrgPath())) { orgSidPath = scmVehicleActualSalesDto.getOrgPath(); - }else{ + } else { orgSidPath = scmVehicleActualSalesDto.getOrgSidPath(); } if (StringUtils.isBlank(orgSidPath)) { @@ -249,7 +250,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService0){ + if (scmVehicleActualSalesDto.getDetailsList().size() > 0) { salesMoney = scmVehicleActualSalesDto.getDetailsList().stream().map(BaseVehicleActualDetailsDto::getActualMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); } if ("1".equals(scmVehicleActualSalesDto.getIsPay())) { @@ -257,7 +258,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService0){ + if (payMoney.compareTo(salesMoney) > 0) { return rb.setMsg("付款合计不允许大于买断金额合计"); } @@ -383,7 +384,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService0){ + if (dto.getDetailsList().size() > 0) { salesMoney = dto.getDetailsList().stream().map(BaseVehicleActualDetailsDto::getActualMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); } if ("1".equals(dto.getIsPay())) { @@ -391,16 +392,16 @@ public class BaseVehicleActualSalesService extends MybatisBaseService0){ + if (payMoney.compareTo(salesMoney) > 0) { return rb.setMsg("付款合计不允许大于买断金额合计"); } String useOrgSid = ""; String orgSidPath = ""; - if(StringUtils.isNotBlank(dto.getOrgPath())){ + if (StringUtils.isNotBlank(dto.getOrgPath())) { useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); orgSidPath = dto.getOrgPath(); - }else{ + } else { useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData(); //根据用户sid获取staffSid ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); @@ -646,7 +647,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(procId); - String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); - String nextName = listResultBean.getData().get(0).getName_(); - List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); -// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseVehicleActualSales.getCreateBySid())) { - if ("未售买断申请".equals(nextName)) { - messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); - //更新未售买断状态为未买断 - //更新车辆状态为未买断 - String settlementStatus = VehicleState.BuyoutEnum.UN_BUYOUT.getCode(); - String settlementStatusValue = VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks(); - updateByVinNo(baseVehicleActualSales.getSid(), settlementStatus, settlementStatusValue); - } else { - messageFlowableQuery.setMsgContent(baseVehicleActualSales.getApplicationName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); - } + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(2, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + BaseVehicleActualSales finalBaseVehicleActualSales = baseVehicleActualSales; + Future future1 = pool.submit(() -> { + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + String procId = finalBaseVehicleActualSales.getProcInstId(); + messageFlowVo.setProcInsId(procId); + messageFlowVo.setProcDefId(finalBaseVehicleActualSales.getProcDefId()); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(query.getBusinessSid()); + messageFlowableQuery.setModuleName("未售买断申请"); + ResultBean> listResultBean = flowTaskFeign.getLatestTasks(procId); + String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); + String nextName = listResultBean.getData().get(0).getName_(); + List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); + if ("未售买断申请".equals(nextName)) { + messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); + //更新未售买断状态为未买断 + //更新车辆状态为未买断 + String settlementStatus = VehicleState.BuyoutEnum.UN_BUYOUT.getCode(); + String settlementStatusValue = VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks(); + updateByVinNo(finalBaseVehicleActualSales.getSid(), settlementStatus, settlementStatusValue); + } else { + messageFlowableQuery.setMsgContent(finalBaseVehicleActualSales.getApplicationName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + } - messageFlowableQuery.setMsgTitle("未售买断"); - ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + messageFlowableQuery.setMsgTitle("未售买断"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + }); + } catch (Exception e) { + e.printStackTrace(); + } return rb.success(); } } @@ -839,7 +851,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService resultBean = flowableFeign.breakProcess(flowTaskVo); @@ -853,7 +865,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService map = BeanUtil.beanToMap(ufVo); //更新业务中的流程相关的参数 updateFlowFiled(map); - //极光推送 busVehicleApply = fetchBySid(businessSid); - MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); - MessageFlowVo messageFlowVo = new MessageFlowVo(); - BeanUtil.copyProperties(ufVo, messageFlowVo); - String procId = busVehicleApply.getProcInstId(); - messageFlowVo.setProcInsId(procId); - messageFlowVo.setProcDefId(busVehicleApply.getProcDefId()); - messageFlowableQuery.setUfVo(messageFlowVo); - messageFlowableQuery.setAppMap(appMap); - messageFlowableQuery.setBusinessSid(businessSid); - messageFlowableQuery.setModuleName("厂家采购申请"); - ResultBean> listResultBean = flowTaskFeign.getLatestTasks(procId); - String nextName = listResultBean.getData().get(0).getName_(); - String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); - List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); -// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busVehicleApply.getCreateBySid())) { - if ("发起申请".equals(nextName)) { - messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); - } else { - messageFlowableQuery.setMsgContent(busVehicleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(2, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + BusVehicleApply finalBusVehicleApply = busVehicleApply; + Future future1 = pool.submit(() -> { + //极光推送 + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + String procId = finalBusVehicleApply.getProcInstId(); + messageFlowVo.setProcInsId(procId); + messageFlowVo.setProcDefId(finalBusVehicleApply.getProcDefId()); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(businessSid); + messageFlowableQuery.setModuleName("厂家采购申请"); + ResultBean> listResultBean = flowTaskFeign.getLatestTasks(procId); + String nextName = listResultBean.getData().get(0).getName_(); + String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); + List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); + if ("发起申请".equals(nextName)) { + messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); + } else { + messageFlowableQuery.setMsgContent(finalBusVehicleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + } + messageFlowableQuery.setMsgTitle("厂家采购"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + }); + } catch (Exception e) { + e.printStackTrace(); } - - messageFlowableQuery.setMsgTitle("厂家采购"); - ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); return rb.success(); } } @@ -1050,7 +1060,7 @@ public class BusVehicleApplyService extends MybatisBaseService contractNoList = baseMapper.selectSid(dto.getContractId()); for (AdCarListVo adCarListDto : carList) { String vinSid = adCarListDto.getCarSid(); - if(contractNoList.contains(vinSid)){ + if (contractNoList.contains(vinSid)) { vinNoLists.add(adCarListDto.getVin()); } } - if(!vinNoLists.isEmpty()){ + if (!vinNoLists.isEmpty()) { return rb.setMsg(String.join(",", vinNoLists) + "已存在发起流程的申请"); } //查询该申请中的车架号是否被锁定 @@ -1761,7 +1764,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService appMap = new HashMap<>(); //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。 appMap.put("sid", businessSid); - appMap.put("contractNO",busArrearsCarryVehicleApply.getContractNo()); + appMap.put("contractNO", busArrearsCarryVehicleApply.getContractNo()); variables.put("app", appMap); if (StringUtils.isNotBlank(dto.getIsFinance())) { variables.put("jinrong", "1".equals(dto.getIsFinance())); @@ -1777,7 +1780,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService voResultBean =flowFeign.startProcess(bv); + ResultBean voResultBean = flowFeign.startProcess(bv); if (!voResultBean.getSuccess()) { return rb.setMsg(voResultBean.getMsg()); } @@ -1918,7 +1921,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); appMap.put("sid", bv.getBusinessSid()); - appMap.put("contractNO",busArrearsCarryVehicleApply.getContractNo()); + appMap.put("contractNO", busArrearsCarryVehicleApply.getContractNo()); variables.put("app", appMap); if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getIsFinance())) { variables.put("jinrong", "1".equals(busArrearsCarryVehicleApply.getIsFinance())); @@ -2075,7 +2078,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); appMap.put("sid", bv.getBusinessSid()); - appMap.put("contractNO",busArrearsCarryVehicleApply.getContractNo()); + appMap.put("contractNO", busArrearsCarryVehicleApply.getContractNo()); variables.put("app", appMap); //================================= FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); @@ -2258,7 +2261,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", query.getBusinessSid()); - appMap.put("contractNO",busArrearsCarryVehicleApply.getContractNo()); + appMap.put("contractNO", busArrearsCarryVehicleApply.getContractNo()); variables.put("app", appMap); //================================= FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); @@ -2277,26 +2280,38 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(procId); - String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); - String nextName = listResultBean.getData().get(0).getName_(); - if ("发起申请".equals(nextName)) { - messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); - baseVehicleTempstateFeign.delByBusSid(busArrearsCarryVehicleApply.getSid()); - } else { - messageFlowableQuery.setMsgContent(busArrearsCarryVehicleApply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(2, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + BusArrearsCarryVehicleApply finalBusArrearsCarryVehicleApply = busArrearsCarryVehicleApply; + Future future1 = pool.submit(() -> { + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + String procId = finalBusArrearsCarryVehicleApply.getProcInstId(); + ufVo.setProcInsId(procId); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(query.getBusinessSid()); + messageFlowableQuery.setModuleName("欠款提车申请"); + ResultBean> listResultBean = flowTaskFeign.getLatestTasks(procId); + String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); + String nextName = listResultBean.getData().get(0).getName_(); + if ("发起申请".equals(nextName)) { + messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); + baseVehicleTempstateFeign.delByBusSid(finalBusArrearsCarryVehicleApply.getSid()); + } else { + messageFlowableQuery.setMsgContent(finalBusArrearsCarryVehicleApply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + } + messageFlowableQuery.setMsgTitle("欠款提车申请"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + }); + } catch (Exception e) { + e.printStackTrace(); } - messageFlowableQuery.setMsgTitle("欠款提车申请"); - ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); return rb.success(); } } @@ -2322,7 +2337,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", query.getBusinessSid()); - appMap.put("contractNO",busArrearsCarryVehicleApply.getContractNo()); + appMap.put("contractNO", busArrearsCarryVehicleApply.getContractNo()); variables.put("app", appMap); //================================= FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); @@ -2660,7 +2675,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService printApplyPdf(String sid,String name) { + public ResultBean printApplyPdf(String sid, String name) { ResultBean rb = ResultBean.fireFail(); Map map = new HashMap<>(); /* ResultBean resultBean = details(sid); @@ -2791,7 +2806,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService flowRecordVo = flowableFeignPro.flowRecordAndComment(busArrearsCarryVehicleApply.getProcInstId(), "1").getData(); List busArrearsCarryVehicleFlowableVos = new ArrayList<>(); flowRecordVo.removeAll(Collections.singleton(null)); - if(!flowRecordVo.isEmpty()){ + if (!flowRecordVo.isEmpty()) { for (PCHistTaskListAndCommentList flowTask : flowRecordVo) { if (flowTask.getFlowableRecordVo() != null) { Map flowableRecordVo = flowTask.getFlowableRecordVo(); @@ -2802,9 +2817,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(busDeliveredApply.getProcInstId()); String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); String nextName = listResultBean.getData().get(0).getName_(); - List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); if ("发起申请".equals(nextName)) { List vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(query.getBusinessSid()); //更新该合同的该车架号的状态为1 @@ -1596,25 +1596,39 @@ public class BusDeliveredApplyService extends MybatisBaseService) variables.get("app")); - messageFlowableQuery.setBusinessSid(query.getBusinessSid()); - messageFlowableQuery.setModuleName("出库申请"); - ResultBean> listResultBean2 = flowTaskFeign.getLatestTasks(busDeliveredApply.getProcInstId()); - String nextNodeUserSids2 = listResultBean2.getData().get(0).getASSIGNEE_(); - String nextName2 = listResultBean2.getData().get(0).getName_(); - if ("发起申请".equals(nextName2)) { - messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); - } else { - messageFlowableQuery.setMsgContent(busDeliveredApply.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(2, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + BusDeliveredApply finalBusDeliveredApply = busDeliveredApply; + Map finalVariables = variables; + Future future1 = pool.submit(() -> { + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + messageFlowVo.setProcInsId(finalBusDeliveredApply.getProcInstId()); + messageFlowVo.setProcDefId(finalBusDeliveredApply.getProcDefId()); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap((Map) finalVariables.get("app")); + messageFlowableQuery.setBusinessSid(query.getBusinessSid()); + messageFlowableQuery.setModuleName("出库申请"); + ResultBean> listResultBean2 = flowTaskFeign.getLatestTasks(finalBusDeliveredApply.getProcInstId()); + String nextNodeUserSids2 = listResultBean2.getData().get(0).getASSIGNEE_(); + String nextName2 = listResultBean2.getData().get(0).getName_(); + if ("发起申请".equals(nextName2)) { + messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); + } else { + messageFlowableQuery.setMsgContent(finalBusDeliveredApply.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + } + messageFlowableQuery.setMsgTitle("出库申请"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + }); + } catch (Exception e) { + e.printStackTrace(); } - messageFlowableQuery.setMsgTitle("出库申请"); - ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + return rb.success(); } diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowFeign.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowFeign.java index 6198639d99..8a1054dbca 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowFeign.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowFeign.java @@ -32,8 +32,4 @@ public interface FlowFeign { @ResponseBody ResultBean handleProsess(@RequestBody BusinessVariables bv); - @ApiOperation(value = "驳回流程") - @PostMapping(value = "/taskReject") - @ResponseBody - ResultBean taskReject(@RequestBody com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl); } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowRest.java index 5faa7d7719..1c6e85e180 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowRest.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowRest.java @@ -100,10 +100,5 @@ public class FlowRest implements FlowFeign { return updateFlowFieldVoResultBean; } - @Override - public ResultBean taskReject(FlowTaskVo fl) { - return flowService.taskReject(fl); - } - } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java index 7b6417f123..d941fe4122 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java @@ -747,28 +747,4 @@ public class FlowService extends MybatisBaseService { } return rb.success().setMsg("抄送" + userName.toString() + "成功！"); } - - - public ResultBean taskReject(FlowTaskVo fl) { - ResultBean rb = ResultBean.fireFail(); - UpdateFlowFieldVo vo = new UpdateFlowFieldVo(); - //获取表单中的参数 - Map formVariables = fl.getValues(); - formVariables = formVariables == null ? new HashMap<>() : formVariables; - formVariables.put("businessSid", fl.getBusinessSid()); - //当前任务task - Task task = taskService.createTaskQuery().taskId(fl.getTaskId()).singleResult(); - if (task.isSuspended()) { - return rb.setMsg("任务处于挂起状态"); - } - // 获取流程定义信息 - ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(task.getProcessDefinitionId()).singleResult(); - // 获取所有节点信息 - Process process = repositoryService.getBpmnModel(processDefinition.getId()).getProcesses().get(0); - // 获取全部节点列表，包含子节点 - Collection allElements = FlowableUtils.getAllElements(process.getFlowElements(), null); - - - return null; - } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java index b175aa4a22..b64df5bac0 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java @@ -1090,7 +1090,7 @@ public class ScmVehicleGressionService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(procId); - String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); - String nextName = listResultBean.getData().get(0).getName_(); - List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); - if ("发起申请".equals(nextName)) { - messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); - //清除临时车辆表状态 - baseVehicleTempstateFeign.delByBusSid(query.getBusinessSid()); - } else { - messageFlowableQuery.setMsgContent(scmVehicleGression.getApplicantName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(2, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + ScmVehicleGression finalScmVehicleGression = scmVehicleGression; + Future future1 = pool.submit(() -> { + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + String procId = finalScmVehicleGression.getProcInstId(); + messageFlowVo.setProcInsId(procId); + messageFlowVo.setProcDefId(finalScmVehicleGression.getProcDefId()); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(query.getBusinessSid()); + messageFlowableQuery.setModuleName("存放地点变更申请"); + ResultBean> listResultBean = flowTaskFeign.getLatestTasks(procId); + String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); + String nextName = listResultBean.getData().get(0).getName_(); + List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); + if ("发起申请".equals(nextName)) { + messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); + //清除临时车辆表状态 + baseVehicleTempstateFeign.delByBusSid(query.getBusinessSid()); + } else { + messageFlowableQuery.setMsgContent(finalScmVehicleGression.getApplicantName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + } + messageFlowableQuery.setMsgTitle("存放地点变更"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + }); + } catch (Exception e) { + e.printStackTrace(); } - messageFlowableQuery.setMsgTitle("存放地点变更"); - ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); return rb.success(); } } From 80f3424257a5be40b64453990fa20900033398d9 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 23 Aug 2023 11:16:05 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusSalesOrderLoancontractFeign.java | 2 +- ...usSalesOrderLoancontractFeignFallback.java | 4 +- .../BusSalesOrderVehicleFeign.java | 5 ++ .../BusSalesOrderLoancontractRest.java | 6 +-- .../BusSalesOrderLoancontractService.java | 10 ++-- .../BusSalesOrderVehicleMapper.java | 4 ++ .../BusSalesOrderVehicleRest.java | 5 ++ .../BusSalesOrderVehicleService.java | 6 +++ .../LoanHomeVisitInvestigateInitPropVo.java | 4 ++ .../LoanHomeVisitInvestigateSavePropDto.java | 4 ++ .../LoanHomevisitInvestigateProperty.java | 30 ++++++----- ...HomevisitInvestigatePropertyDetailsVo.java | 8 ++- .../LoanHomevisitInvestigatePropertyDto.java | 4 ++ .../LoanHomevisitPrepVo.java | 4 +- .../LoanHomevisitInvestigateService.java | 32 +++++++++--- ...LoanHomevisitInvestigatePropertyMapper.xml | 22 ++++---- .../LoanHomevisitPrepMapper.java | 2 + .../LoanHomevisitPrepMapper.xml | 22 ++++++++ .../LoanHomevisitPrepService.java | 52 ++++++++++++++++++- ...AppLoanHomeVisitInvestigateInitPropVo.java | 4 ++ ...ppLoanHomeVisitInvestigateSavePropDto.java | 4 ++ 21 files changed, 190 insertions(+), 44 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java index ccd1c0caad..59ed40142c 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java @@ -64,7 +64,7 @@ public interface BusSalesOrderLoancontractFeign { @ApiOperation("新增或修改") @PostMapping("/save") @ResponseBody - public ResultBean save(@RequestBody BusSalesOrderLoancontractDto dto); + public ResultBean save(@RequestBody BusSalesOrderLoancontractDto dto); @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java index cc529279d6..5ffc7d123a 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java @@ -55,8 +55,8 @@ public class BusSalesOrderLoancontractFeignFallback implements BusSalesOrderLoan } @Override - public ResultBean save(BusSalesOrderLoancontractDto dto){ - return ResultBean.fireFail().setMsg("接口anrui-buscenter/bussalesorderloancontract/save无法访问"); + public ResultBean save(BusSalesOrderLoancontractDto dto) { + return null; } @Override diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java index 915b14aa98..670726569b 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java @@ -120,4 +120,9 @@ public interface BusSalesOrderVehicleFeign { @PostMapping("/selectListByvinNo") @ResponseBody ResultBean> selectListByvinNo(@RequestParam("vinNo") String vinNo); + + @ApiOperation("更新订单车辆的贷款人sid和消贷合同sid") + @PostMapping("/updateXDCon") + @ResponseBody + ResultBean updateXDCon(@RequestParam("sid") String sid,@RequestParam("borrowerSid") String borrowerSid,@RequestParam("loanContractSid") String loanContractSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java index 536ba5f24b..c6e82e8871 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java @@ -74,10 +74,10 @@ public class BusSalesOrderLoancontractRest implements BusSalesOrderLoancontractF @Override @ApiOperation("新增或修改") @PostMapping("/save") - public ResultBean save(@RequestBody BusSalesOrderLoancontractDto dto){ + public ResultBean save(@RequestBody BusSalesOrderLoancontractDto dto){ ResultBean rb = ResultBean.fireFail(); - busSalesOrderLoancontractService.saveOrUpdateDto(dto); - return rb.success(); + String sid = busSalesOrderLoancontractService.saveOrUpdateDto(dto); + return rb.success().setData(sid); } @Override diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java index b20ec25597..1915fa4deb 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java @@ -76,19 +76,21 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService SELECT sid, - isRealEstate AS houseCheck, - propertyType AS houseState, - realLoanSituation AS houseLoanKey, - realRemarks AS houseRemarks, - isCar AS carCheck, - carType AS carState, - carLoanSituation AS carLoanKey, + isRealEstate AS houseCheck, + propertyType AS houseState, + realLoanSituationKey AS houseLoanKey, + realLoanSituation AS houseLoan, + realRemarks AS houseRemarks, + isCar AS carCheck, + carType AS carState, + carLoanSituationKey AS carLoanKey, + carLoanSituation AS carLoan, carRemarks, - downPaySourceKey AS downPayment, - otherSourceKey AS otherIncome + downPaySourceKey AS downPaymentKey, + downPaySourceValue AS downPayment, + otherSourceKey AS otherIncomeKey, + otherSourceValue AS otherIncome FROM loan_homevisit_investigate_property WHERE mainSid = #{sid} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.java index cb6288c83a..3b83612f77 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.java @@ -68,4 +68,6 @@ public interface LoanHomevisitPrepMapper extends BaseMapper { void visit(String sid); String initConSetUp(String sid); + + LoanHomevisitPrepVo selectDetails(String sid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.xml index d517f287e0..34123f052f 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.xml @@ -44,4 +44,26 @@ ON lp.`saleOrderBorrowerSid` = bb.`sid` WHERE lp.sid = #{sid} + + \ No newline at end of file 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 f0c3c04f95..6298831353 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 @@ -28,6 +28,13 @@ package com.yxt.anrui.riskcenter.biz.loanhomevisitprep; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; +import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractDto; +import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractFeign; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; +import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApplyVo; @@ -67,6 +74,12 @@ public class LoanHomevisitPrepService extends MybatisBaseService listPageVo(PagerQuery pq) { LoanHomevisitPrepQuery query = pq.getParams(); @@ -190,8 +203,43 @@ public class LoanHomevisitPrepService extends MybatisBaseService busSalesOrderVehicles = busSalesOrderVehicleFeign.selectListByOrderSid(loanHomevisitPrepVo.getSaleOrderSid()).getData(); + if (conSetUpKey.equals("001")) {//一车一合同 + int i = 1; + for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) { + BusSalesOrderLoancontractDto busSalesOrderLoancontractDto = new BusSalesOrderLoancontractDto(); + busSalesOrderLoancontractDto.setSalesOrderSid(loanHomevisitPrepVo.getSaleOrderSid()); + busSalesOrderLoancontractDto.setBorrowerSid(loanHomevisitPrepVo.getBorrowerSid()); + busSalesOrderLoancontractDto.setBorrowerName(loanHomevisitPrepVo.getBorrowerName()); + busSalesOrderLoancontractDto.setVehCount(loanHomevisitPrepVo.getVehCount()); + BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanHomevisitPrepVo.getSaleOrderSid()).getData(); + String num = String.format("%02d", i); + busSalesOrderLoancontractDto.setLoanCotractNo(busSalesOrder.getContractNo() + num); + i = i + 1; + busSalesOrderLoancontractDto.setBankName(loanHomevisitPrepVo.getBankName()); + busSalesOrderLoancontractDto.setPolicyName(loanHomevisitPrepVo.getPolicyName()); + busSalesOrderLoancontractDto.setBusNo("304"); + busSalesOrderLoancontractDto.setBusName("资方终审确认"); + String loanContractSid = busSalesOrderLoancontractFeign.save(busSalesOrderLoancontractDto).getData(); + busSalesOrderVehicleFeign.updateXDCon(busSalesOrderVehicle.getSid(), loanHomevisitPrepVo.getBorrowerSid(), loanContractSid); + } + } else if (conSetUpKey.equals("002")) {//一人一合同 + BusSalesOrderLoancontractDto busSalesOrderLoancontractDto = new BusSalesOrderLoancontractDto(); + busSalesOrderLoancontractDto.setSalesOrderSid(loanHomevisitPrepVo.getSaleOrderSid()); + busSalesOrderLoancontractDto.setBorrowerSid(loanHomevisitPrepVo.getBorrowerSid()); + busSalesOrderLoancontractDto.setBorrowerName(loanHomevisitPrepVo.getBorrowerName()); + busSalesOrderLoancontractDto.setVehCount(loanHomevisitPrepVo.getVehCount()); + BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanHomevisitPrepVo.getSaleOrderSid()).getData(); + busSalesOrderLoancontractDto.setLoanCotractNo(busSalesOrder.getContractNo() + "-01"); + busSalesOrderLoancontractDto.setBankName(loanHomevisitPrepVo.getBankName()); + busSalesOrderLoancontractDto.setPolicyName(loanHomevisitPrepVo.getPolicyName()); + busSalesOrderLoancontractDto.setBusNo("304"); + busSalesOrderLoancontractDto.setBusName("资方终审确认"); + String loanContractSid = busSalesOrderLoancontractFeign.save(busSalesOrderLoancontractDto).getData(); + for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) { + busSalesOrderVehicleFeign.updateXDCon(busSalesOrderVehicle.getSid(), loanHomevisitPrepVo.getBorrowerSid(), loanContractSid); + } } return rb.success(); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitPropVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitPropVo.java index 1afa7fb723..96e4f4c48c 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitPropVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitPropVo.java @@ -28,8 +28,12 @@ public class AppLoanHomeVisitInvestigateInitPropVo implements Vo { private String carLoanKey; @ApiModelProperty("车辆备注") private String carRemarks; + @ApiModelProperty("首付来源key") + private String downPaymentKey; @ApiModelProperty("首付来源") private String downPayment; + @ApiModelProperty("其他收入来源key") + private String otherIncomeKey; @ApiModelProperty("其他收入来源") private String otherIncome; @ApiModelProperty("家访考察表sid") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSavePropDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSavePropDto.java index a2aedeb334..75c8e84e27 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSavePropDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSavePropDto.java @@ -28,8 +28,12 @@ public class AppLoanHomeVisitInvestigateSavePropDto implements Vo { private String carLoanKey; @ApiModelProperty("车辆备注") private String carRemarks; + @ApiModelProperty("首付来源key") + private String downPaymentKey; @ApiModelProperty("首付来源") private String downPayment; + @ApiModelProperty("其他收入来源key") + private String otherIncomeKey; @ApiModelProperty("其他收入来源") private String otherIncome; @ApiModelProperty("家访考察表sid") From d33fa562bd4d053005346c6d6f61e46b67afa02d Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 23 Aug 2023 13:49:38 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehiclestate/BaseVehicleStateService.java | 4 ++-- .../BusSalesOrderVehicleFeignFallback.java | 5 +++++ .../LoanHomeVisitInvestigateInitOrderVo.java | 14 ++++++++++---- .../LoanHomeVisitInvestigateSaveOrderDto.java | 14 ++++++++++---- .../AppLoanHomeVisitInvestigateInitOrderVo.java | 14 ++++++++++---- .../AppLoanHomeVisitInvestigateSaveOrderDto.java | 14 ++++++++++---- 6 files changed, 47 insertions(+), 18 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java index b51154c410..8f65e33d0f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java @@ -96,9 +96,9 @@ public class BaseVehicleStateService extends MybatisBaseService Date: Wed, 23 Aug 2023 14:13:27 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bussalesorder/BusSalesOrderService.java | 20 ++++++------------- .../BusSalesOrderVehicleMapper.java | 2 ++ .../BusSalesOrderVehicleMapper.xml | 4 ++++ .../BusSalesOrderVehicleService.java | 4 ++++ 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 71edc7fa99..7864604780 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 @@ -1951,21 +1951,11 @@ public class BusSalesOrderService extends MybatisBaseService commonContractVoResultBean = commonContractFeign.getContractBySalesOrderSid(record.getSaleOrderSid()); + /* ResultBean commonContractVoResultBean = commonContractFeign.getContractBySalesOrderSid(record.getSaleOrderSid()); if (commonContractVoResultBean.getData() != null) { record.setContractId(commonContractVoResultBean.getData().getContractNo()); - } - AppOrderDetailsVo appOrderDetailsVo = getSaleOrderDetails(record.getSaleOrderSid()).getData(); + }*/ + /*AppOrderDetailsVo appOrderDetailsVo = getSaleOrderDetails(record.getSaleOrderSid()).getData(); AppOrderModelInfoVo modelInfo = appOrderDetailsVo.getModelInfo(); List vinSids = new ArrayList<>(); if (modelInfo != null) { @@ -1975,7 +1965,9 @@ public class BusSalesOrderService extends MybatisBaseService vinSids = busSalesOrderVehicleService.selectBySalesOrderSid(record.getSaleOrderSid()); + vinSids.removeAll(Collections.singleton(null)); if (vinSids.size() > 0) { int i = busHandoverService.selectByCount(record.getContractId(), vinSids); if (record.isShowStopBtn() && i < vinSids.size()) { diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java index 5360752701..988069e9c8 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java @@ -143,6 +143,8 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper selectBySalesOrderSid(String saleOrderSid); + @Update("update bus_sales_order_vehicle set borrowerSid = #{borrowerSid},loanContractSid = #{loanContractSid} where sid = #{sid}") void updateXDCon(@Param("sid") String sid, @Param("borrowerSid") String borrowerSid, @Param("loanContractSid") String loanContractSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml index bdf4478987..45ec10a1b8 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml @@ -216,4 +216,8 @@ AND bs.vinNo != '' + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java index 3449995b5e..6a1d0dbdb8 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java @@ -563,4 +563,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService selectBySalesOrderSid(String saleOrderSid) { + return baseMapper.selectBySalesOrderSid(saleOrderSid); + } } \ No newline at end of file From e636d29f5a951c154ad4d09790e25a7ceb7b4b78 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 23 Aug 2023 15:10:35 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basevehiclestate/BaseVehicleStateFeign.java | 4 ++++ .../biz/basevehiclestate/BaseVehicleStateMapper.java | 2 ++ .../biz/basevehiclestate/BaseVehicleStateMapper.xml | 8 ++++++++ .../biz/basevehiclestate/BaseVehicleStateRest.java | 5 +++++ .../biz/basevehiclestate/BaseVehicleStateService.java | 6 ++++++ .../biz/bussalesorder/BusSalesOrderService.java | 11 +---------- .../finbillapplication/FinBillApplicationService.java | 8 ++++++++ 7 files changed, 34 insertions(+), 10 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java index 7dee4fcd4f..d00d2f4fed 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java @@ -33,4 +33,8 @@ public interface BaseVehicleStateFeign { @PostMapping("selectOneQKKPByBusSid") @ResponseBody ResultBean selectOneQKKPByBusSid(@RequestParam("busSid") String sid); + + @PostMapping("selectByVinSid") + @ResponseBody + ResultBean selectByVinSid(@RequestParam("vehSid") String vehSid); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java index 0c593ce268..e29f8f8317 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java @@ -21,4 +21,6 @@ public interface BaseVehicleStateMapper extends BaseMapper { BaseVehicleState selectOneByBusSid(String busSid); BaseVehicleState selectOneQKKPByBusSid(String sid); + + BaseVehicleState selectByVinSid(String vehSid); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml index 5409c5776e..543e03452d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml @@ -32,4 +32,12 @@ AND carryInvoiceState = '0' AND busState = '401' + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateRest.java index dce1aae138..380384e418 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateRest.java @@ -40,5 +40,10 @@ public class BaseVehicleStateRest implements BaseVehicleStateFeign { return baseVehicleStateService.selectOneQKKPByBusSid(sid); } + @Override + public ResultBean selectByVinSid(String vehSid) { + return baseVehicleStateService.selectByVinSid(vehSid); + } + } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java index 8f65e33d0f..c7a5ea8569 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java @@ -180,4 +180,10 @@ public class BaseVehicleStateService extends MybatisBaseService selectByVinSid(String vehSid) { + ResultBean rb = ResultBean.fireFail(); + BaseVehicleState baseVehicleState = baseMapper.selectByVinSid(vehSid); + return rb.success().setData(baseVehicleState); + } } 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 71edc7fa99..371d51f023 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 @@ -7086,16 +7086,7 @@ public class BusSalesOrderService extends MybatisBaseService> rb = ResultBean.fireFail(); List stringList = baseMapper.selectQKBusinessSid(userSid, useOrgSid); stringList.removeAll(Collections.singleton(null)); - List busSids = new ArrayList<>(); - for (String orderSid : stringList) { - SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetails(orderSid).getData(); - if (solutionsDetailsVo != null) { - if ("02".equals(solutionsDetailsVo.getTypeKey())) { - busSids.add(orderSid); - } - } - } - return rb.success().setData(busSids); + return rb.success().setData(stringList); } public List selectByContractNoToVin(String contractId) { 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 0f893a2cf7..29e7274f42 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 @@ -41,6 +41,7 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehicleappendix.BaseVehicleAppendixFeign; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo; +import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState; import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto; import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum; import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign; @@ -2015,6 +2016,13 @@ public class FinBillApplicationService extends MybatisBaseService finBillVehicles = dto.getFinBillVehicles(); + for (FinBillVehicleDto finBillVehicle : finBillVehicles) { + BaseVehicleState baseVehicleState = baseVehicleStateFeign.selectByVinSid(finBillVehicle.getVehSid()).getData(); + if (baseVehicleState == null){ + return rb.setMsg("车架号" + finBillVehicle.getVinNo() + "已发起过欠款提车或欠款开票，请重新选择"); + } + } String contractNo = dto.getContractNo(); List finBillApplicationDetailsVos = baseMapper.selectByContractNo(contractNo); if (finBillApplicationDetailsVos != null) { From cda25caa6a82c58feba9f9804268ea3e69cbf763 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 23 Aug 2023 15:23:24 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanHomevisitInvestigateOrder.java | 20 +++++++---- ...oanHomevisitInvestigateOrderDetailsVo.java | 34 +++++++++++-------- .../LoanHomevisitInvestigateOrderDto.java | 34 +++++++++++-------- .../LoanHomevisitInvestigateOrderQuery.java | 34 +++++++++++-------- .../LoanHomevisitInvestigateOrderVo.java | 34 +++++++++++-------- .../LoanHomevisitInvestigateOrderMapper.xml | 17 ++++++---- 6 files changed, 103 insertions(+), 70 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrder.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrder.java index f35f6bec7f..0b2aebc7ac 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrder.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrder.java @@ -50,19 +50,25 @@ import lombok.Data; public class LoanHomevisitInvestigateOrder extends BaseEntity { private static final long serialVersionUID = 1L; + @ApiModelProperty("车辆信息确认key") + private String carConfirmKey; @ApiModelProperty("车辆信息确认") - private String carConfirm; // 车辆信息确认 + private String carConfirm; @ApiModelProperty("车辆信息确认备注") - private String carRemarks; // 车辆信息确认备注 + private String carRemarks; + @ApiModelProperty("金融方案信息确认key") + private String finConfirmKey; @ApiModelProperty("金融方案信息确认") - private String finConfirm; // 金融方案信息确认 + private String finConfirm; @ApiModelProperty("金融方案信息确认备注") - private String finRemarks; // 金融方案信息确认备注 + private String finRemarks; + @ApiModelProperty("金融首付比例key") + private String finDownPayKey; @ApiModelProperty("金融首付比例") - private String finDownPay; // 金融首付比例 + private String finDownPay; @ApiModelProperty("金融首付比例备注") - private String finDownPayRemarks; // 金融首付比例备注 + private String finDownPayRemarks; @ApiModelProperty("家访考察表sid") - private String mainSid; // 家访考察表sid + private String mainSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderDetailsVo.java index 89f45d1108..eac45dceee 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderDetailsVo.java @@ -51,19 +51,25 @@ public class LoanHomevisitInvestigateOrderDetailsVo implements Vo { private String sid; // sid - @ApiModelProperty("车辆信息确认") - private String carConfirm; // 车辆信息确认 - @ApiModelProperty("车辆信息确认备注") - private String carRemarks; // 车辆信息确认备注 - @ApiModelProperty("金融方案信息确认") - private String finConfirm; // 金融方案信息确认 - @ApiModelProperty("金融方案信息确认备注") - private String finRemarks; // 金融方案信息确认备注 - @ApiModelProperty("金融首付比例") - private String finDownPay; // 金融首付比例 - @ApiModelProperty("金融首付比例备注") - private String finDownPayRemarks; // 金融首付比例备注 - @ApiModelProperty("家访考察表sid") - private String mainSid; // 家访考察表sid + @ApiModelProperty("车辆信息确认key") + private String carConfirmKey; + @ApiModelProperty("车辆信息确认") + private String carConfirm; + @ApiModelProperty("车辆信息确认备注") + private String carRemarks; + @ApiModelProperty("金融方案信息确认key") + private String finConfirmKey; + @ApiModelProperty("金融方案信息确认") + private String finConfirm; + @ApiModelProperty("金融方案信息确认备注") + private String finRemarks; + @ApiModelProperty("金融首付比例key") + private String finDownPayKey; + @ApiModelProperty("金融首付比例") + private String finDownPay; + @ApiModelProperty("金融首付比例备注") + private String finDownPayRemarks; + @ApiModelProperty("家访考察表sid") + private String mainSid; } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderDto.java index 7bd3c47249..87b7d01605 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderDto.java @@ -51,19 +51,25 @@ public class LoanHomevisitInvestigateOrderDto implements Dto { private String sid; // sid - @ApiModelProperty("车辆信息确认") - private String carConfirm; // 车辆信息确认 - @ApiModelProperty("车辆信息确认备注") - private String carRemarks; // 车辆信息确认备注 - @ApiModelProperty("金融方案信息确认") - private String finConfirm; // 金融方案信息确认 - @ApiModelProperty("金融方案信息确认备注") - private String finRemarks; // 金融方案信息确认备注 - @ApiModelProperty("金融首付比例") - private String finDownPay; // 金融首付比例 - @ApiModelProperty("金融首付比例备注") - private String finDownPayRemarks; // 金融首付比例备注 - @ApiModelProperty("家访考察表sid") - private String mainSid; // 家访考察表sid + @ApiModelProperty("车辆信息确认key") + private String carConfirmKey; + @ApiModelProperty("车辆信息确认") + private String carConfirm; + @ApiModelProperty("车辆信息确认备注") + private String carRemarks; + @ApiModelProperty("金融方案信息确认key") + private String finConfirmKey; + @ApiModelProperty("金融方案信息确认") + private String finConfirm; + @ApiModelProperty("金融方案信息确认备注") + private String finRemarks; + @ApiModelProperty("金融首付比例key") + private String finDownPayKey; + @ApiModelProperty("金融首付比例") + private String finDownPay; + @ApiModelProperty("金融首付比例备注") + private String finDownPayRemarks; + @ApiModelProperty("家访考察表sid") + private String mainSid; } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderQuery.java index 1b02aa05cb..1da4f97412 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderQuery.java @@ -49,19 +49,25 @@ import lombok.Data; @ApiModel(value = "家访考察-订单信息 查询条件", description = "家访考察-订单信息 查询条件") public class LoanHomevisitInvestigateOrderQuery implements Query { - @ApiModelProperty("车辆信息确认") - private String carConfirm; // 车辆信息确认 - @ApiModelProperty("车辆信息确认备注") - private String carRemarks; // 车辆信息确认备注 - @ApiModelProperty("金融方案信息确认") - private String finConfirm; // 金融方案信息确认 - @ApiModelProperty("金融方案信息确认备注") - private String finRemarks; // 金融方案信息确认备注 - @ApiModelProperty("金融首付比例") - private String finDownPay; // 金融首付比例 - @ApiModelProperty("金融首付比例备注") - private String finDownPayRemarks; // 金融首付比例备注 - @ApiModelProperty("家访考察表sid") - private String mainSid; // 家访考察表sid + @ApiModelProperty("车辆信息确认key") + private String carConfirmKey; + @ApiModelProperty("车辆信息确认") + private String carConfirm; + @ApiModelProperty("车辆信息确认备注") + private String carRemarks; + @ApiModelProperty("金融方案信息确认key") + private String finConfirmKey; + @ApiModelProperty("金融方案信息确认") + private String finConfirm; + @ApiModelProperty("金融方案信息确认备注") + private String finRemarks; + @ApiModelProperty("金融首付比例key") + private String finDownPayKey; + @ApiModelProperty("金融首付比例") + private String finDownPay; + @ApiModelProperty("金融首付比例备注") + private String finDownPayRemarks; + @ApiModelProperty("家访考察表sid") + private String mainSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderVo.java index af3ca5e758..6511dceede 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderVo.java @@ -51,19 +51,25 @@ public class LoanHomevisitInvestigateOrderVo implements Vo { private String sid; // sid - @ApiModelProperty("车辆信息确认") - private String carConfirm; // 车辆信息确认 - @ApiModelProperty("车辆信息确认备注") - private String carRemarks; // 车辆信息确认备注 - @ApiModelProperty("金融方案信息确认") - private String finConfirm; // 金融方案信息确认 - @ApiModelProperty("金融方案信息确认备注") - private String finRemarks; // 金融方案信息确认备注 - @ApiModelProperty("金融首付比例") - private String finDownPay; // 金融首付比例 - @ApiModelProperty("金融首付比例备注") - private String finDownPayRemarks; // 金融首付比例备注 - @ApiModelProperty("家访考察表sid") - private String mainSid; // 家访考察表sid + @ApiModelProperty("车辆信息确认key") + private String carConfirmKey; + @ApiModelProperty("车辆信息确认") + private String carConfirm; + @ApiModelProperty("车辆信息确认备注") + private String carRemarks; + @ApiModelProperty("金融方案信息确认key") + private String finConfirmKey; + @ApiModelProperty("金融方案信息确认") + private String finConfirm; + @ApiModelProperty("金融方案信息确认备注") + private String finRemarks; + @ApiModelProperty("金融首付比例key") + private String finDownPayKey; + @ApiModelProperty("金融首付比例") + private String finDownPay; + @ApiModelProperty("金融首付比例备注") + private String finDownPayRemarks; + @ApiModelProperty("家访考察表sid") + private String mainSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderMapper.xml index 60214b591c..43a234c5b7 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderMapper.xml @@ -22,13 +22,16 @@ + + + SELECT + lf.`sid`, + lf.state, + bo.createDate, + li.`resHomeVisDate`, + li.`homeVisAddress`, + bo.`useOrgName`, + bo.`orgName`, + bo.`staffName`, + bo.`contractNo`, + bb.`borrowerName`, + bb.`mobile`, + bb.`policyName`, + li.`homeVisStaffName`, + li.investigateValue + FROM loan_homevisit_fileexamine lf + LEFT JOIN loan_homevisit_investigate li + ON lf.homeVisitSid = li.sid + LEFT JOIN anrui_buscenter.`bus_sales_order_borrower` bb + ON li.`saleOrderBorrowerSid` = bb.`sid` + LEFT JOIN anrui_buscenter.`bus_sales_order` bo + ON li.`saleOrderSid` = bo.`sid` + + ${ew.sqlSegment} + + + + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineRest.java new file mode 100644 index 0000000000..f27ea783ee --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineRest.java @@ -0,0 +1,100 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.riskcenter.biz.loanhomevisitfileexamine; + +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateQuery; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateVo; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamine; +import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineQuery; +import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineDetailsVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineDto; +import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineFeign; + +/** + * Project: anrui-riskcenter(家访资料审核)
+ * File: LoanHomevisitFileexamineFeignFallback.java
+ * Class: com.yxt.anrui.riskcenter.biz.loanhomevisitfileexamine.LoanHomevisitFileexamineRest
+ * Description: 家访资料审核.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-08-24 09:29:41
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "家访资料审核") +@RestController("com.yxt.anrui.riskcenter.biz.loanhomevisitfileexamine.LoanHomevisitFileexamineRest") +@RequestMapping("v1/loanhomevisitfileexamine") +public class LoanHomevisitFileexamineRest implements LoanHomevisitFileexamineFeign { + + @Autowired + private LoanHomevisitFileexamineService loanHomevisitFileexamineService; + + @Override + public ResultBean> homeInforListPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = loanHomevisitFileexamineService.homeInforListPage(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody LoanHomevisitFileexamineDto dto){ + ResultBean rb = ResultBean.fireFail(); + loanHomevisitFileexamineService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + loanHomevisitFileexamineService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + LoanHomevisitFileexamineDetailsVo vo = loanHomevisitFileexamineService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java new file mode 100644 index 0000000000..dca5ee1f43 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java @@ -0,0 +1,366 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.riskcenter.biz.loanhomevisitfileexamine; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractFeign; +import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigate; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateDetailsVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateQuery; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanAttachTypeEnum; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDetailsVo; +import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigate.LoanHomevisitInvestigateService; +import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileService; +import org.apache.commons.lang3.StringUtils; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamine; +import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineQuery; +import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineDetailsVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineDto; +import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineFeign; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Project: anrui-riskcenter(家访资料审核)
+ * File: LoanHomevisitFileexamineService.java
+ * Class: com.yxt.anrui.riskcenter.biz.loanhomevisitfileexamine.LoanHomevisitFileexamineService
+ * Description: 家访资料审核 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-08-24 09:29:41
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class LoanHomevisitFileexamineService extends MybatisBaseService { + + @Autowired + private SysUserFeign sysUserFeign; + @Autowired + private LoanHomevisitInvestigateFileService loanHomevisitInvestigateFileService; + @Autowired + private LoanHomevisitInvestigateService loanHomevisitInvestigateService; + @Autowired + private BusSalesOrderLoancontractFeign busSalesOrderLoancontractFeign; + + public PagerVo homeInforListPage(PagerQuery pq) { + LoanHomevisitFileexamineQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("li.state", query.getType()); + qw.eq("bb.busNo", 303); + if (StringUtils.isNotBlank(query.getMenuUrl())) { + //======================= + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgSidPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgSidPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("bo.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } + if (StringUtils.isNotBlank(query.getUseOrgName())) { + qw.like("bo.useOrgName", query.getUseOrgName()); + } + if (StringUtils.isNotBlank(query.getSaleDeptName())) { + qw.like("bo.orgName", query.getSaleDeptName()); + } + if (StringUtils.isNotBlank(query.getStaffName())) { + qw.like("bo.staffName", query.getStaffName()); + } + if (StringUtils.isNotBlank(query.getContractNo())) { + qw.like("bo.contractNo", query.getContractNo()); + } + if (StringUtils.isNotBlank(query.getLoanPeoName())) { + qw.like("bb.borrowerName", query.getLoanPeoName()); + } + if (StringUtils.isNotBlank(query.getPolicyName())) { + qw.like("bb.policyName", query.getPolicyName()); + } + if (StringUtils.isNotBlank(query.getHomeVisStaffName())) { + qw.like("li.homeVisStaffName", query.getHomeVisStaffName()); + } + String orderStartDate = query.getOrderStartDate(); + String orderEndDate = query.getOrderEndDate(); + qw.apply(StringUtils.isNotBlank(orderStartDate), "date_format (bo.createDate,'%Y-%m-%d') >= date_format('" + orderStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(orderEndDate), "date_format (bo.createDate,'%Y-%m-%d') <= date_format('" + orderEndDate + "','%Y-%m-%d')" + ); + String resHomeVisStartDate = query.getResHomeVisStartDate(); + String resHomeVisEndDate = query.getResHomeVisEndDate(); + qw.apply(StringUtils.isNotBlank(resHomeVisStartDate), "date_format (li.resHomeVisDate,'%Y-%m-%d') >= date_format('" + resHomeVisStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(resHomeVisEndDate), "date_format (li.resHomeVisDate,'%Y-%m-%d') <= date_format('" + resHomeVisEndDate + "','%Y-%m-%d')" + ); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(LoanHomevisitFileexamineDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(LoanHomevisitFileexamineDto dto){ + LoanHomevisitFileexamine entity = new LoanHomevisitFileexamine(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(LoanHomevisitFileexamineDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + LoanHomevisitFileexamine entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public LoanHomevisitFileexamineDetailsVo fetchDetailsVoBySid(String sid){ + LoanHomevisitFileexamineDetailsVo vo = new LoanHomevisitFileexamineDetailsVo(); + LoanHomevisitFileexamine loanHomevisitFileexamine = fetchBySid(sid); + vo.setRemarks(loanHomevisitFileexamine.getRemarks()); + LoanHomevisitInvestigateDetailsVo loanHomevisitInvestigateDetailsVo = loanHomevisitInvestigateService.fetchDetailsVoBySid(loanHomevisitFileexamine.getHomeVisitSid()); + List busSalesOrderLoancontractDetailsVos = busSalesOrderLoancontractFeign.selectByBorrowerSid(loanHomevisitInvestigateDetailsVo.getSaleOrderBorrowerSid()).getData(); + List loanCotractNos = new ArrayList<>(); + List bankContractNos = new ArrayList<>(); + for (BusSalesOrderLoancontractDetailsVo busSalesOrderLoancontractDetailsVo : busSalesOrderLoancontractDetailsVos) { + loanCotractNos.add("消贷合同号" + "(" +busSalesOrderLoancontractDetailsVo.getLoanCotractNo() + ")"); + if (StringUtils.isBlank(busSalesOrderLoancontractDetailsVo.getBankContractNo())){ + bankContractNos.add("资方合同号(暂无)"); + }else { + bankContractNos.add("资方合同号" + "(" +busSalesOrderLoancontractDetailsVo.getLoanCotractNo() + ")"); + } + } + vo.setLoanCotractNos(loanCotractNos); + vo.setBankContractNos(bankContractNos); + //定位信息 + List dwxxImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DWXX.getAttachType()); + List location = new ArrayList<>(); + if (dwxxImages != null && dwxxImages.size() > 0){ + for (LoanHomevisitInvestigateFileDetailsVo dwxxImage : dwxxImages) { + location.add(dwxxImage.getFileUrl()); + } + } + vo.setLocation(location); + //房屋照片 + List fwzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.FWZP.getAttachType()); + List house = new ArrayList<>(); + if (fwzpImages != null && fwzpImages.size() > 0){ + for (LoanHomevisitInvestigateFileDetailsVo fwzpImage : fwzpImages) { + house.add(fwzpImage.getFileUrl()); + } + } + vo.setHouse(house); + //门口照片 + List mkzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.MKZP.getAttachType()); + List doorway = new ArrayList<>(); + if (mkzpImages != null && mkzpImages.size() > 0){ + for (LoanHomevisitInvestigateFileDetailsVo mkzpImage : mkzpImages) { + doorway.add(mkzpImage.getFileUrl()); + } + } + vo.setDoorway(doorway); + //客厅卧室照片 + List ktwszpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.KTWSZP.getAttachType()); + List indoor = new ArrayList<>(); + if (ktwszpImages != null && ktwszpImages.size() > 0){ + for (LoanHomevisitInvestigateFileDetailsVo ktwszpImage : ktwszpImages) { + indoor.add(ktwszpImage.getFileUrl()); + } + } + vo.setIndoor(indoor); + //合影照等 + List hyzdImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.HYZD.getAttachType()); + List groupPhoto = new ArrayList<>(); + if (hyzdImages != null && hyzdImages.size() > 0){ + for (LoanHomevisitInvestigateFileDetailsVo hyzdImage : hyzdImages) { + groupPhoto.add(hyzdImage.getFileUrl()); + } + } + vo.setGroupPhoto(groupPhoto); + //贷款人身份证 + List dkrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRSFZ.getAttachType()); + List lenderIdCard = new ArrayList<>(); + if (dkrsfzImages != null && dkrsfzImages.size() > 0){ + for (LoanHomevisitInvestigateFileDetailsVo dkrsfzImage : dkrsfzImages) { + lenderIdCard.add(dkrsfzImage.getFileUrl()); + } + } + vo.setLenderIdCard(lenderIdCard); + //贷款人户口本 + List dkrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRHKB.getAttachType()); + List lenderAccount = new ArrayList<>(); + if (dkrhkbImages != null && dkrhkbImages.size() > 0){ + for (LoanHomevisitInvestigateFileDetailsVo dkrhkbImage : dkrhkbImages) { + lenderAccount.add(dkrhkbImage.getFileUrl()); + } + } + vo.setLenderAccount(lenderAccount); + //贷款人婚姻证明 + List dkrhyzmImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRHYZM.getAttachType()); + List lenderMarriageCertificate = new ArrayList<>(); + if (dkrhyzmImages != null && dkrhyzmImages.size() > 0){ + for (LoanHomevisitInvestigateFileDetailsVo dkrhyzmImage : dkrhyzmImages) { + lenderMarriageCertificate.add(dkrhyzmImage.getFileUrl()); + } + } + vo.setLenderMarriageCertificate(lenderMarriageCertificate); + //贷款人驾驶本 + List dkrjsbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRJSB.getAttachType()); + List lenderDriverBook = new ArrayList<>(); + if (dkrjsbImages != null && dkrjsbImages.size() > 0){ + for (LoanHomevisitInvestigateFileDetailsVo dkrjsbImage : dkrjsbImages) { + lenderDriverBook.add(dkrjsbImage.getFileUrl()); + } + } + vo.setLenderDriverBook(lenderDriverBook); + //贷款人银行流水 + List dkryhlsImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRYHLS.getAttachType()); + List lenderBankStatement = new ArrayList<>(); + if (dkryhlsImages != null && dkryhlsImages.size() > 0){ + for (LoanHomevisitInvestigateFileDetailsVo dkryhlsImage : dkryhlsImages) { + lenderBankStatement.add(dkryhlsImage.getFileUrl()); + } + } + vo.setLenderBankStatement(lenderBankStatement); + //配偶身份证 + List posfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.POSFZ.getAttachType()); + List spouseIdCard = new ArrayList<>(); + if (posfzImages != null && posfzImages.size() > 0){ + for (LoanHomevisitInvestigateFileDetailsVo posfzImage : posfzImages) { + spouseIdCard.add(posfzImage.getFileUrl()); + } + } + vo.setSpouseIdCard(spouseIdCard); + //配偶户口本 + List pohkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.POHKB.getAttachType()); + List spouseAccount = new ArrayList<>(); + if (pohkbImages != null && pohkbImages.size() > 0){ + for (LoanHomevisitInvestigateFileDetailsVo pohkbImage : pohkbImages) { + spouseAccount.add(pohkbImage.getFileUrl()); + } + } + vo.setSpouseAccount(spouseAccount); + //担保人身份证 + List dbrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRSFZ.getAttachType()); + List pohkbImage = new ArrayList<>(); + if (dbrsfzImages != null && dbrsfzImages.size() > 0){ + for (LoanHomevisitInvestigateFileDetailsVo dbrsfzImage : dbrsfzImages) { + pohkbImage.add(dbrsfzImage.getFileUrl()); + } + } + vo.setGuarantorIdCard(pohkbImage); + //担保人户口本 + List dbrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRHKB.getAttachType()); + List guarantorAccount = new ArrayList<>(); + if (dbrhkbImages != null && dbrhkbImages.size() > 0){ + for (LoanHomevisitInvestigateFileDetailsVo dbrhkbImage : dbrhkbImages) { + guarantorAccount.add(dbrhkbImage.getFileUrl()); + } + } + vo.setGuarantorAccount(guarantorAccount); + //银行卡 + List yhkImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType()); + List yhkImagess = new ArrayList<>(); + if (yhkImages != null && yhkImages.size() > 0){ + for (LoanHomevisitInvestigateFileDetailsVo yhkImage : yhkImages) { + yhkImagess.add(yhkImage.getFileUrl()); + } + } + vo.setYhkImages(yhkImagess); + //房产 + List fcImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.FC.getAttachType()); + List houseProperty = new ArrayList<>(); + if (fcImages != null && fcImages.size() > 0){ + for (LoanHomevisitInvestigateFileDetailsVo fcImage : fcImages) { + houseProperty.add(fcImage.getFileUrl()); + } + } + vo.setHouseProperty(houseProperty); + //车辆 + List clImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.CL.getAttachType()); + List carProperty = new ArrayList<>(); + if (clImages != null && clImages.size() > 0){ + for (LoanHomevisitInvestigateFileDetailsVo clImage : clImages) { + carProperty.add(clImage.getFileUrl()); + } + } + vo.setCarProperty(carProperty); + return vo; + } +} \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.xml index a58d835e75..189d4afd96 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.xml @@ -60,13 +60,15 @@ spouseName, spouseIdNumber AS spouseIdCard, spouseMobile, + spouseCareerKey AS spouseJobKey, spouseCareerValue AS spouseJob, - spouseDomAddress, - spousePreAddress, + spouseDomAddress AS spouseRegisterAddress, + spousePreAddress AS spouseAddress, emergencyContact AS emergencyContactName, emergencyMobile AS emergencyContactMobile, relationshipKey AS emergencyContactTypeKey, - relationshipValue AS emergencyContactType + relationshipValue AS emergencyContactType, + mainSid FROM loan_homevisit_investigate_customer WHERE mainSid = #{sid} 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 87f76d97a3..bfd0fbd567 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 @@ -45,6 +45,8 @@ import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitI import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitInvestigateOrderDetailsVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitInvestigateOrderDto; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomeVisitInvestigateInitOtherPeoVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomeVisitInvestigateSaveOtherPeoDto; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoDto; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateSavePropDto; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateInitPropVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomevisitInvestigatePropertyDetailsVo; @@ -467,6 +469,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService otherPersonnel = dto.getOtherPersonnel(); BeanUtil.copyProperties(dto,loanHomevisitInvestigateCustomerDto); loanHomevisitInvestigateCustomerDto.setIsConfirmRealBuyer(dto.getActualBuyer()); loanHomevisitInvestigateCustomerDto.setBorrowerSid(dto.getLenderSid()); @@ -484,12 +487,30 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderMapper.xml index 43a234c5b7..f591a5804f 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderMapper.xml @@ -31,7 +31,8 @@ lo.finRemarks AS financeRemarks, lo.finDownPayKey AS paymentRatiokey, lo.finDownPay AS paymentRatio, - lo.finDownPayRemarks AS paymentRemarks + lo.finDownPayRemarks AS paymentRemarks, + lo.mainSid FROM loan_homevisit_investigate_order lo LEFT JOIN loan_homevisit_investigate li ON lo.`mainSid` = li.`sid` diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.java index 6379515af5..d9d2eb4a38 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.java @@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomeVisitInvestigateInitOtherPeoVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoDetailsVo; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -66,4 +67,7 @@ public interface LoanHomevisitInvestigateOtherpeoMapper extends BaseMapper selectListVo(); List selByMainSid(String sid); + + @Delete("DELETE FROM loan_homevisit_investigate_otherpeo WHERE mainSid = #{sid}") + void delByMainSid(String sid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.xml index bd93c3abeb..1d1551df1b 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.xml @@ -26,7 +26,7 @@ peoType AS personnelKey, mobile, idNumber AS idCard, - peoDomAddress, + peoDomAddress AS residentAddress, peoPreAddress AS address, workUnit AS company, peoCareerValue AS job diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoService.java index dd0459d04c..8676ee11a1 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoService.java @@ -106,4 +106,8 @@ public class LoanHomevisitInvestigateOtherpeoService extends MybatisBaseService< public List selByMainSid(String sid) { return baseMapper.selByMainSid(sid); } + + public void delByMainSid(String sid) { + baseMapper.delByMainSid(sid); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyMapper.xml index b550a3204c..72d2191b08 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyMapper.xml @@ -33,9 +33,10 @@ carLoanSituation AS carLoan, carRemarks, downPaySourceKey AS downPaymentKey, - downPaySourceValue AS downPayment, + downPaySourceValue AS downPayment, otherSourceKey AS otherIncomeKey, - otherSourceValue AS otherIncome + otherSourceValue AS otherIncome, + mainSid FROM loan_homevisit_investigate_property WHERE mainSid = #{sid} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportMapper.xml index 9ff5933d06..69e082a760 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportMapper.xml @@ -36,7 +36,8 @@ toll AS roadToll, maintenance, expectedRevenue AS income, - netIncome + netIncome, + mainSid FROM loan_homevisit_investigate_transport WHERE mainSid = #{sid} 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 6298831353..845457e41d 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 @@ -210,7 +210,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService otherPersonnel; @ApiModelProperty("紧急联系人姓名") @@ -64,4 +66,6 @@ public class AppLoanHomeVisitInvestigateInitCustomerVo implements Vo { private String emergencyContactType; @ApiModelProperty("紧急联系人类型key") private String emergencyContactTypeKey; + @ApiModelProperty("家访考察表sid") + private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOtherPeoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOtherPeoVo.java index 61ecaa8db7..8418441037 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOtherPeoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOtherPeoVo.java @@ -19,11 +19,13 @@ public class AppLoanHomeVisitInvestigateInitOtherPeoVo implements Vo { @ApiModelProperty("身份证") private String idCard; @ApiModelProperty("户籍地址") - private String peoDomAddress; + private String residentAddress; @ApiModelProperty("现住址") private String address; @ApiModelProperty("公司") private String company; @ApiModelProperty("职业") private String job; + @ApiModelProperty("家访考察表sid") + private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitReportStateVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitReportStateVo.java index b585dcb6c4..866aa48681 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitReportStateVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitReportStateVo.java @@ -17,4 +17,6 @@ public class AppLoanHomeVisitInvestigateInitReportStateVo implements Vo { private String transportState; @ApiModelProperty("资产情况") private String assetsState; + @ApiModelProperty("家访考察表sid") + private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveCustomerDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveCustomerDto.java index cccb2fcdaa..3874859d69 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveCustomerDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveCustomerDto.java @@ -49,12 +49,14 @@ public class AppLoanHomeVisitInvestigateSaveCustomerDto implements Dto { private String spouseIdCard; @ApiModelProperty("配偶电话") private String spouseMobile; + @ApiModelProperty("配偶职业key") + private String spouseJobKey; @ApiModelProperty("配偶职业") private String spouseJob; @ApiModelProperty("配偶户籍地址") - private String spouseDomAddress; + private String spouseRegisterAddress; @ApiModelProperty("配偶现住址") - private String spousePreAddress; + private String spouseAddress; @ApiModelProperty("其他人员") private List otherPersonnel = new ArrayList<>(); @ApiModelProperty("紧急联系人姓名") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveOtherPeoDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveOtherPeoDto.java index 6499f15fe4..d47a6391d4 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveOtherPeoDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveOtherPeoDto.java @@ -19,7 +19,7 @@ public class AppLoanHomeVisitInvestigateSaveOtherPeoDto implements Vo { @ApiModelProperty("身份证") private String idCard; @ApiModelProperty("户籍地址") - private String peoDomAddress; + private String residentAddress; @ApiModelProperty("现住址") private String address; @ApiModelProperty("公司") From c664280a7e7147b28ddd0d8abdf2a2dc05c3661b Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 24 Aug 2023 15:06:09 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanHomevisitInvestigateService.java | 59 ++++++++++++++++--- 1 file changed, 50 insertions(+), 9 deletions(-) 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 bfd0fbd567..9f98910231 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 @@ -28,6 +28,11 @@ package com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigate; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign; +import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp; +import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; +import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.*; @@ -95,6 +100,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService getHomeVisitCustomerInfo(String sid) { ResultBean rb = ResultBean.fireFail(); LoanHomeVisitInvestigateInitCustomerVo loanHomeVisitInvestigateInitCustomerVo = baseMapper.getHomeVisitCustomerInfo(sid); + if (loanHomeVisitInvestigateInitCustomerVo == null){ + loanHomeVisitInvestigateInitCustomerVo = new LoanHomeVisitInvestigateInitCustomerVo(); + LoanHomevisitInvestigate loanHomevisitInvestigate = fetchBySid(sid); + BusSalesOrderBorrowerDetailsVo busSalesOrderBorrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(loanHomevisitInvestigate.getSaleOrderBorrowerSid()).getData(); + CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busSalesOrderBorrowerDetailsVo.getCustomSid()).getData(); + loanHomeVisitInvestigateInitCustomerVo.setLenderSid(busSalesOrderBorrowerDetailsVo.getSid()); + loanHomeVisitInvestigateInitCustomerVo.setLenderNam(busSalesOrderBorrowerDetailsVo.getBorrowerName()); + loanHomeVisitInvestigateInitCustomerVo.setIdNumber(crmCustomerTempVo.getIDNumber()); + loanHomeVisitInvestigateInitCustomerVo.setMobile(busSalesOrderBorrowerDetailsVo.getMobile()); + } //银行卡附件 List loanHomevisitInvestigateFileDetailsVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType()); List bankCardImages = new ArrayList<>(); @@ -486,11 +505,21 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService getHomeVisitOrderInfo(String sid) { ResultBean rb = ResultBean.fireFail(); LoanHomeVisitInvestigateInitOrderVo loanHomeVisitInvestigateInitOrderVos = loanHomevisitInvestigateOrderService.getHomeVisitOrderInfo(sid); - loanHomeVisitInvestigateInitOrderVos.setMainSid(sid); + if (loanHomeVisitInvestigateInitOrderVos == null){ + loanHomeVisitInvestigateInitOrderVos = new LoanHomeVisitInvestigateInitOrderVo(); + loanHomeVisitInvestigateInitOrderVos.setMainSid(sid); + } return rb.success().setData(loanHomeVisitInvestigateInitOrderVos); } @@ -536,7 +568,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService getHomeVisitOperationInfo(String sid) { ResultBean rb = ResultBean.fireFail(); LoanHomeVisitInvestigateInitOperVo loanHomeVisitInvestigateInitOperVo = loanHomevisitInvestigateOperationsService.getHomeVisitOperationInfo(sid); - loanHomeVisitInvestigateInitOperVo.setMainSid(sid); + if (loanHomeVisitInvestigateInitOperVo == null){ + loanHomeVisitInvestigateInitOperVo = new LoanHomeVisitInvestigateInitOperVo(); + loanHomeVisitInvestigateInitOperVo.setMainSid(sid); + } return rb.success().setData(loanHomeVisitInvestigateInitOperVo); } @@ -556,7 +591,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService getHomeVisitTransportInfo(String sid) { ResultBean rb = ResultBean.fireFail(); LoanHomeVisitInvestigateInitTranVo loanHomeVisitInvestigateInitTranVo = loanHomevisitInvestigateTransportService.getHomeVisitTransportInfo(sid); - loanHomeVisitInvestigateInitTranVo.setMainSid(sid); + if (loanHomeVisitInvestigateInitTranVo == null){ + loanHomeVisitInvestigateInitTranVo = new LoanHomeVisitInvestigateInitTranVo(); + loanHomeVisitInvestigateInitTranVo.setMainSid(sid); + } return rb.success().setData(loanHomeVisitInvestigateInitTranVo); } @@ -583,7 +621,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService getHomeVisitAssetsInfo(String sid) { ResultBean rb = ResultBean.fireFail(); LoanHomeVisitInvestigateInitPropVo loanHomeVisitInvestigateInitPropVo = loanHomevisitInvestigatePropertyService.getHomeVisitAssetsInfo(sid); - loanHomeVisitInvestigateInitPropVo.setMainSid(sid); + if (loanHomeVisitInvestigateInitPropVo == null){ + loanHomeVisitInvestigateInitPropVo = new LoanHomeVisitInvestigateInitPropVo(); + loanHomeVisitInvestigateInitPropVo.setMainSid(sid); + } return rb.success().setData(loanHomeVisitInvestigateInitPropVo); } From d1df9a3b94ccdf489d4369a91e3fcadfaf18cbc5 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 24 Aug 2023 15:24:51 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/loanhomevisitfileexamine/LoanHomevisitFileexamine.java | 2 +- .../LoanHomevisitFileexamineDetailsVo.java | 2 ++ .../loanhomevisitfileexamine/LoanHomevisitFileexamineDto.java | 3 ++- .../LoanHomevisitFileexamineService.java | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamine.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamine.java index efd9ea4e71..3cc7e8c5bb 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamine.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamine.java @@ -51,7 +51,7 @@ public class LoanHomevisitFileexamine extends BaseEntity { private static final long serialVersionUID = 1L; @ApiModelProperty("家访考察sid") - private String homeVisitSid; // 家访考察sid + private String homeVisitSid; @ApiModelProperty("销售订单sid") private String saleOrderSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineDetailsVo.java index 90e0d2fadd..0bc4a7fc31 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineDetailsVo.java @@ -53,6 +53,8 @@ public class LoanHomevisitFileexamineDetailsVo implements Vo { private String sid; private String remarks; + private String homeVisitSid; + private String saleOrderSid; @ApiModelProperty("定位信息") private List location; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineDto.java index aecedc96bc..da1166136d 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineDto.java @@ -51,8 +51,9 @@ public class LoanHomevisitFileexamineDto implements Dto { private String sid; // sid + private String remarks; @ApiModelProperty("家访考察sid") - private String homeVisitSid; // 家访考察sid + private String homeVisitSid; @ApiModelProperty("销售订单sid") private String saleOrderSid; } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java index dca5ee1f43..d146117101 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java @@ -193,7 +193,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService busSalesOrderLoancontractDetailsVos = busSalesOrderLoancontractFeign.selectByBorrowerSid(loanHomevisitInvestigateDetailsVo.getSaleOrderBorrowerSid()).getData(); List loanCotractNos = new ArrayList<>();