From 2dd73a3d928b6a5a24d82f8a11f4d710b5b0ea06 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 21 Aug 2023 08:52:30 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/biz/commoncontract/CommonContractService.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 6ca32c6919..02c9a2365d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -2707,13 +2707,9 @@ public class CommonContractService extends MybatisBaseService busVehicleQKKPVos = busSalesOrderVehicleFeign.appVehicleQKKPList(busVehicleQKKPQuery).getData(); - if (busVehicleQKKPVos != null) { - if (busVehicleQKKPVos.size() != 0) { - recordsNew.add(record); - } + Boolean aBoolean = busSalesOrderVehicleFeign.appVehicleQKKPList2(record.getContractNo()).getData(); + if (aBoolean){ + recordsNew.add(record); } } pagging.setRecords(recordsNew); From 197e936a2b4081900382083b53ccf087d1b2edec Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 21 Aug 2023 09:10:05 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/anrui/base/biz/commoncontract/CommonContractService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 02c9a2365d..f099d6e051 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -2678,7 +2678,6 @@ public class CommonContractService extends MybatisBaseService> busList = busSalesOrderFeign.selectBusinessSidByQKKP(params.getUserSid(), params.getOrgPath()); From 86e09cc5e8fbf65be9b668a3e1121950377e6d69 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 21 Aug 2023 09:47:17 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 406368d3a0..66e5ede8e1 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 @@ -5416,7 +5416,7 @@ public class BusSalesOrderService extends MybatisBaseService vinList = appOrderModelInfoVo.getVinListsVos(); for (int i = 0; i < vinList.size(); i++) { UnCollectionDto unCollectionDto = new UnCollectionDto(); From 7578edff7fb6457f8a75bef354b06a752fafd745 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 21 Aug 2023 09:49:02 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../buscenter/biz/bussalesorder/BusSalesOrderService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 66e5ede8e1..677237a118 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 @@ -4887,9 +4887,9 @@ public class BusSalesOrderService extends MybatisBaseService Date: Mon, 21 Aug 2023 10:30:30 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/api/basevehiclestate/BaseVehicleStateEnum.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java index ef6fe0b4d0..827422262a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java @@ -67,8 +67,6 @@ public class BaseVehicleStateEnum { DDBA_SUBMIT("1", "订单提交"), DDBA_PASS("2", "订单审核通过"), CKKP_PASS("3", "出库开票审核通过"), - CKKP_SAVE("17", "出库申请保存"), - CKKP_DELETE("18", "出库申请修改"), JC_PASS("4", "交车审核通过"), BUS_STOP("5", "业务终止"), DDBA_SAVEVIN("6", "录入车架号"), @@ -82,8 +80,10 @@ public class BaseVehicleStateEnum { TC("14", "退车"), JCZBTIJ("15", "交车准备提交"), JCTJ("16", "交车提交"), - QKKPTJ("17","欠款开票提交"), - QKKPZZ("18","欠款开票终止"), + CKKP_SAVE("17", "出库申请保存"), + CKKP_DELETE("18", "出库申请修改"), + QKKPTJ("19","欠款开票提交"), + QKKPZZ("20","欠款开票终止"), ; private String typeKey; From c40957e9c98d3f385a695b398072075ad4c32c54 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 21 Aug 2023 13:34:18 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/bussalesorder/BusSalesOrderMapper.xml | 4 +- .../bussalesorder/BusSalesOrderService.java | 53 +++++++++++-------- 2 files changed, 35 insertions(+), 22 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index babee8e210..9db9dcae3a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -512,9 +512,11 @@ select distinct bo.sid from bus_sales_order bo left join bus_sales_order_vehicle bv on bv.salesOrderSid = bo.sid + left join anrui_riskcenter.loan_solutions ls on ls.salesOrderSid = bo.sid ${ew.sqlSegment} and bo.createBySid = #{userSid} and bo.useOrgSid = #{useOrgSid} and bo.nodeState = '已办结' - and bo.financePlan = '2' + + and ls.typeKey = '' and length(bv.linkSid)>0 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 677237a118..4c35b50722 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 @@ -1505,29 +1505,40 @@ public class BusSalesOrderService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + Future future1 = pool.submit(() -> { + //极光推送 + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + messageFlowVo.setProcInsId(procId1); + messageFlowVo.setProcDefId(busSalesOrder1.getProcDefId()); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap((Map) variables.get("app")); + messageFlowableQuery.setBusinessSid(query.getBusinessSid()); + messageFlowableQuery.setModuleName("销售订单申请"); + ResultBean> listResultBean2 = flowTaskFeign.getLatestTasks(procId1); + String nextNodeUserSids2 = listResultBean2.getData().get(0).getASSIGNEE_(); + List receiveSidList2 = Arrays.asList(nextNodeUserSids2.split(",")); + String nextName2 = listResultBean2.getData().get(0).getName_(); + if ("销售订单申请".equals(nextName2)) { + messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); + } else { + messageFlowableQuery.setMsgContent(busSalesOrder.get().getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + } - //极光推送 - MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); - MessageFlowVo messageFlowVo = new MessageFlowVo(); - BeanUtil.copyProperties(ufVo, messageFlowVo); - messageFlowVo.setProcInsId(procId1); - messageFlowVo.setProcDefId(busSalesOrder1.getProcDefId()); - messageFlowableQuery.setUfVo(messageFlowVo); - messageFlowableQuery.setAppMap((Map) variables.get("app")); - messageFlowableQuery.setBusinessSid(query.getBusinessSid()); - messageFlowableQuery.setModuleName("销售订单申请"); - ResultBean> listResultBean2 = flowTaskFeign.getLatestTasks(procId1); - String nextNodeUserSids2 = listResultBean2.getData().get(0).getASSIGNEE_(); - List receiveSidList2 = Arrays.asList(nextNodeUserSids2.split(",")); - String nextName2 = listResultBean2.getData().get(0).getName_(); - if ("销售订单申请".equals(nextName2)) { - messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); - } else { - messageFlowableQuery.setMsgContent(busSalesOrder.get().getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); - } + messageFlowableQuery.setMsgTitle("销售订单"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); - messageFlowableQuery.setMsgTitle("销售订单"); - ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + }); + } catch (Exception e) { + e.printStackTrace(); + } return rb.success(); From de4cb27957aae004a5ca587be92221165dc30312 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 21 Aug 2023 14:20:13 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index 9db9dcae3a..4f8260c224 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -516,7 +516,7 @@ ${ew.sqlSegment} and bo.createBySid = #{userSid} and bo.useOrgSid = #{useOrgSid} and bo.nodeState = '已办结' - and ls.typeKey = '' + and ls.typeKey = '02' and length(bv.linkSid)>0 From 8c4105d91d4aa5aeef7a03aff794adb577baa8f2 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 21 Aug 2023 16:01:39 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commoncontract/CommonContractFeign.java | 1 - .../commoncontract/CommonContractService.java | 23 ------ .../api/bussalesorder/BusSalesOrderFeign.java | 2 +- .../BusSalesOrderVehicleFeign.java | 8 +- .../BusSalesOrderVehicleFeignFallback.java | 10 +-- .../biz/bussalesorder/BusSalesOrderMapper.xml | 49 ++++++----- .../BusSalesOrderVehicleMapper.java | 2 + .../BusSalesOrderVehicleMapper.xml | 40 +++++++-- .../BusSalesOrderVehicleRest.java | 10 ++- .../BusSalesOrderVehicleService.java | 71 ++++++++++++---- .../LoanHomevisitInvestigateFeign.java | 5 ++ ...LoanHomevisitInvestigateFeignFallback.java | 5 ++ .../LoanHomevisitInvestigateQuery.java | 1 + .../LoanHomevisitPrepFeign.java | 2 +- .../LoanHomevisitPrepQuery.java | 2 + .../LoanHomevisitPrepVo.java | 10 ++- .../LoanHomevisitInvestigateRest.java | 7 ++ .../LoanHomevisitInvestigateService.java | 81 +++++++++++++++++++ .../LoanHomevisitPrepMapper.xml | 4 +- .../LoanHomevisitPrepService.java | 3 + .../autoservice/approval/AppRovalService.java | 2 +- 21 files changed, 251 insertions(+), 87 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java index 1f6496d97a..adc9274d3b 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java @@ -254,5 +254,4 @@ public interface CommonContractFeign { @PostMapping("/getApprovalContractList") @ResponseBody ResultBean> getApprovalContractList(@RequestBody PagerQuery query); - } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index f099d6e051..30ff9df0a4 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -2694,25 +2694,15 @@ public class CommonContractService extends MybatisBaseService page = PagerUtil.queryToPage(query); IPage pagging = baseMapper.selectByStaffSid(page, qw); List records = pagging.getRecords(); - List recordsNew = new ArrayList<>(); for (CommonContractVo record : records) { String createDate = record.getCreateDate(); DateTime dateTime = DateUtil.parse(createDate, "yyyy-MM-dd"); createDate = DateUtil.formatDate(dateTime); record.setCreateDate(createDate); BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(record.getContractNo()).getData(); - if (!"已办结".equals(busSalesOrder.getNodeState()) || !"2".equals(busSalesOrder.getFinancePlan())) { - continue; - } record.setSaleTypeKey(busSalesOrder.getPayTypeKey()); record.setSaleTypeValue(busSalesOrder.getPayType()); - Boolean aBoolean = busSalesOrderVehicleFeign.appVehicleQKKPList2(record.getContractNo()).getData(); - if (aBoolean){ - recordsNew.add(record); - } } - pagging.setRecords(recordsNew); - pagging.setTotal(recordsNew.size()); PagerVo p = PagerUtil.pageToVo(pagging, null); return rb.success().setData(p); } @@ -2758,19 +2748,6 @@ public class CommonContractService extends MybatisBaseService page = PagerUtil.queryToPage(query); IPage iPage = baseMapper.getApprovalContractList(page, qw); - if (params.getStateType() == 2) { - List records = iPage.getRecords(); - List recordsNew = new ArrayList<>(); - if (records != null) { - for (ContractPageVo record : records) { - Boolean aBoolean = busSalesOrderVehicleFeign.appVehicleQKKPList2(record.getContractId()).getData(); - if (aBoolean){ - recordsNew.add(record); - } - } - } - iPage.setRecords(recordsNew); - } return iPage; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java index d073e06830..34777eef46 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java @@ -321,7 +321,7 @@ public interface BusSalesOrderFeign { @ResponseBody ResultBean> selectBusinessSid(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath); - @ApiOperation("欠款开票三方金融-外部金融已审核通过的业务sid") + @ApiOperation("欠款开票三方金融已审核通过的业务sid") @GetMapping("/selectBusinessSidByQKKP") @ResponseBody ResultBean> selectBusinessSidByQKKP(@RequestParam("userSid") String userSid, @RequestParam("useOrgSid") String useOrgSid); 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 2f7dd183e2..915b14aa98 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 @@ -87,6 +87,10 @@ public interface BusSalesOrderVehicleFeign { @PostMapping("/appVehicleQKKPList") ResultBean> appVehicleQKKPList(@RequestBody BusVehicleQKKPQuery query); + @ApiOperation("移动端-欠款开票选择车辆列表2") + @PostMapping("/appVehicleQKKPList2") + ResultBean> appVehicleQKKPList2(@RequestBody BusVehicleQKKPQuery query); + @ApiOperation("移动端欠款提车选择车辆") @PostMapping("/getCanUseCars") ResultBean> getCanUseCars(@RequestBody QCarQuery query); @@ -116,8 +120,4 @@ public interface BusSalesOrderVehicleFeign { @PostMapping("/selectListByvinNo") @ResponseBody ResultBean> selectListByvinNo(@RequestParam("vinNo") String vinNo); - - @ApiOperation("移动端-欠款开票选择车辆列表2") - @PostMapping("/appVehicleQKKPList2") - ResultBean appVehicleQKKPList2(@RequestParam("contractNo") String contractNo); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java index ac97c62394..148530d8d8 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java @@ -78,6 +78,11 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe return null; } + @Override + public ResultBean> appVehicleQKKPList2(BusVehicleQKKPQuery query) { + return null; + } + @Override public ResultBean> getCanUseCars(QCarQuery query) { return null; @@ -108,9 +113,4 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe return null; } - @Override - public ResultBean appVehicleQKKPList2(String contractNo) { - return null; - } - } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index 9db9dcae3a..28502b1881 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -205,7 +205,7 @@ p.quantity as number, bm.modelSid from bus_sales_order_model bm - left join bus_sales_order_price p on bm.salesOrderSid = p.salesOrderSid + left join bus_sales_order_price p on bm.salesOrderSid = p.salesOrderSid where bm.salesOrderSid = #{saleOrderSid} @@ -298,8 +298,8 @@ bs.distributorUnitTwo as intermediaryUnit2, bs.distributorPriceTwo as agencyFee2 from bus_sales_order bo - left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid - left join bus_sales_order_submit bs on bo.sid = bs.salesOrderSid + left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid + left join bus_sales_order_submit bs on bo.sid = bs.salesOrderSid where bo.sid = #{sid} @@ -316,9 +316,9 @@ bo.staffName as sellerName, bo.notes as addRemarks, case bo.type - when 1 then '现车' - when 2 then '采购订单' - when 3 then '排产' end as orderType, + when 1 then '现车' + when 2 then '采购订单' + when 3 then '排产' end as orderType, bo.orgSid, bo.billNo, bo.financePlanValue, @@ -395,7 +395,7 @@ bo.mobile as modelName, bsov.linkNo AS vin FROM bus_sales_order bo - LEFT JOIN bus_sales_order_vehicle bsov ON bsov.salesOrderSid = bo.sid + LEFT JOIN bus_sales_order_vehicle bsov ON bsov.salesOrderSid = bo.sid WHERE bo.contractNo = #{contractNo} select linkSid from bus_sales_order_vehicle bv - left join bus_sales_order bo on bo.sid = bv.salesOrderSid + left join bus_sales_order bo on bo.sid = bv.salesOrderSid where bo.contractNo = #{contractNo} and bv.linkNo = #{vinNo} @@ -453,7 +453,7 @@ @@ -546,8 +551,8 @@ select cc.sid from bus_sales_order bo - left join anrui_base.common_contract cc on cc.contractNo = bo.contractNo + left join anrui_base.common_contract cc on cc.contractNo = bo.contractNo where bo.sid = #{sid} \ No newline at end of file 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 c8db5ca131..228e19a05d 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 @@ -119,6 +119,8 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper appVehicleQKKPList(@Param(Constants.WRAPPER) QueryWrapper qw); + List appVehicleQKKPList2(@Param(Constants.WRAPPER) QueryWrapper qw); + List getCanUseCars(@Param(Constants.WRAPPER) QueryWrapper qw); IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); 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 0c1bd37693..3963758977 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 @@ -83,7 +83,7 @@ @@ -92,7 +92,7 @@ resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle"> select bv.* from bus_delivered bd - left join bus_sales_order_vehicle bv on bv.sid = bd.busVinSid + left join bus_sales_order_vehicle bv on bv.sid = bd.busVinSid where bd.contractNo = #{contractNo} and bd.state = 1 and length(bv.linkSid) > 0 @@ -100,11 +100,15 @@ + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java index f3d8c3603d..790c320511 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java @@ -89,6 +89,11 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign { return busSalesOrderVehicleService.appVehicleQKKPList(query); } + @Override + public ResultBean> appVehicleQKKPList2(BusVehicleQKKPQuery query) { + return busSalesOrderVehicleService.appVehicleQKKPList2(query); + } + @Override public ResultBean> getCanUseCars(QCarQuery query) { return busSalesOrderVehicleService.getCanUseCars(query); @@ -123,8 +128,5 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign { return busSalesOrderVehicleService.selectListByvinNo(vinNo); } - @Override - public ResultBean appVehicleQKKPList2(String contractNo) { - return busSalesOrderVehicleService.appVehicleQKKPList2(contractNo); - } + } 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 8717185a5f..2170d84cc3 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 @@ -294,6 +294,61 @@ public class BusSalesOrderVehicleService extends MybatisBaseService> appVehicleQKKPList2(BusVehicleQKKPQuery query) { + ResultBean rb = ResultBean.fireFail(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("bso.contractNo", query.getContractNo()); + if (query.getVinSids() != null) { + if (query.getVinSids().size() > 0) { + qw.notIn("bsov.linkSid", query.getVinSids()); + } + } + List busVehicleQKKPVos = baseMapper.appVehicleQKKPList2(qw); + List busVehicleQKKPTrailerVos = new ArrayList<>(); + if (busVehicleQKKPVos != null && busVehicleQKKPVos.size() > 0) { + for (BusVehicleQKKPVo record : busVehicleQKKPVos) { + //判断相同车辆是否存在已提交的申请 + FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(record.getVehSid()).getData(); + if (finBillVehicleDetailsVo != null) { + busVehicleQKKPVos.remove(record); + if (busVehicleQKKPVos.size() == 0){ + break; + } + } + String vehSid = record.getVehSid(); + if (StringUtils.isNotBlank(vehSid)){ + BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = busArrearsCarryVehicleApplyService.selSubmitLc(vehSid).getData(); + if (busArrearsCarryVehicleApply != null){ + busVehicleQKKPVos.remove(record); + if (busVehicleQKKPVos.size() == 0){ + break; + } + } + BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(vehSid).getData(); + if (baseVehicleCertificateVo != null) { + record.setCertificateState(baseVehicleCertificateVo.getCertificateState()); + record.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue()); + List stringList = baseVehicleAppendixFeign.selectBySid(baseVehicleCertificateVo.getSid()).getData(); + record.setZcHgzImages(stringList); + } + TraliveredVo traliveredVo = baseTrailerFeign.trailerList(vehSid, query.getContractNo()).getData(); + List trailerVos = traliveredVo.getList(); + if (trailerVos != null && trailerVos.size() > 0) { + for (TrailerVo trailerVo : trailerVos) { + BusVehicleQKKPTrailerVo busVehicleQKKPTrailerVo = new BusVehicleQKKPTrailerVo(); + busVehicleQKKPTrailerVo.setVinNo(traliveredVo.getVinNo()); + busVehicleQKKPTrailerVo.setGcVinNo(trailerVo.getTrailerVinNo()); + busVehicleQKKPTrailerVo.setOneBillMoney(trailerVo.getDealPrice()); + busVehicleQKKPTrailerVos.add(busVehicleQKKPTrailerVo); + record.setTrailers(busVehicleQKKPTrailerVos); + } + } + } + } + } + return rb.success().setData(busVehicleQKKPVos); + } + public ResultBean> appVehicleQKKPList(BusVehicleQKKPQuery query) { ResultBean rb = ResultBean.fireFail(); QueryWrapper qw = new QueryWrapper<>(); @@ -517,20 +572,4 @@ public class BusSalesOrderVehicleService extends MybatisBaseService appVehicleQKKPList2(String contractNo) { - ResultBean rb = ResultBean.fireFail(); - Boolean i = false; - BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(contractNo); - List busSalesOrderVehicles = busSalesOrderVehicleService.selectByOrderSid(busSalesOrder.getSid()); - for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) { - String sid = busSalesOrderVehicle.getSid(); - BaseVehicleState baseVehicleState = baseVehicleStateFeign.selectOneQKKPByBusSid(sid).getData(); - if (baseVehicleState != null){ - i = true; - break; - } - } - return rb.success().setData(i); - } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java index fbcf75330e..7ed83ec4a7 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java @@ -72,6 +72,11 @@ public interface LoanHomevisitInvestigateFeign { @ResponseBody public ResultBean> listPage(@RequestBody PagerQuery pq); + @ApiOperation("家访资料审核") + @PostMapping("/homeInforListPage") + @ResponseBody + public ResultBean> homeInforListPage(@RequestBody PagerQuery pq); + @ApiOperation("是否通过") @PostMapping("/isPassThrough") @ResponseBody diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java index af8dac3f56..588a9647b8 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java @@ -65,6 +65,11 @@ public class LoanHomevisitInvestigateFeignFallback implements LoanHomevisitInves return rb.setMsg("接口anrui-riskcenter/loanhomevisitinvestigate/listPage无法访问"); } + @Override + public ResultBean> homeInforListPage(PagerQuery pq) { + return null; + } + @Override public ResultBean isPassThrough(String sid, String pass) { return null; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateQuery.java index a2c120e79d..15ed40f7a0 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateQuery.java @@ -76,6 +76,7 @@ public class LoanHomevisitInvestigateQuery implements Query { @ApiModelProperty("组织全路径") private String orgSidPath; private String menuSid; + private String menuUrl; private String type; private String names; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepFeign.java index 6aedf1edd1..7e49251e13 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepFeign.java @@ -62,7 +62,7 @@ public interface LoanHomevisitPrepFeign { public ResultBean> listPage(@RequestBody PagerQuery pq); @ApiOperation("准备完毕") - @PostMapping("/visit") + @GetMapping("/visit") @ResponseBody public ResultBean visit(@RequestParam("sid") String sid); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepQuery.java index 7ca953da14..834f4880d6 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepQuery.java @@ -67,6 +67,8 @@ public class LoanHomevisitPrepQuery implements Query { private String loanPeoName; @ApiModelProperty("资方名称") private String capitalName; + @ApiModelProperty("金融产品名称") + private String policyName; @ApiModelProperty("组织全路径") private String orgSidPath; private String menuUrl; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepVo.java index 846e054855..5390c0f261 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepVo.java @@ -26,12 +26,15 @@ package com.yxt.anrui.riskcenter.api.loanhomevisitprep; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * Project: anrui-riskcenter(家访准备)
* File: LoanHomevisitPrepVo.java
@@ -51,8 +54,11 @@ public class LoanHomevisitPrepVo implements Vo { private String sid; + @ApiModelProperty("销售订单sid") + private String saleOrderSid; @ApiModelProperty("订单日期") - private String createDate; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date createDate; @ApiModelProperty("分公司名称") private String useOrgName; @ApiModelProperty("销售部门名称") @@ -69,4 +75,6 @@ public class LoanHomevisitPrepVo implements Vo { private String mobile; @ApiModelProperty("资方名称") private String bankName; + @ApiModelProperty("金融产品名称") + private String policyName; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java index 203cd0bea4..e86aab1401 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java @@ -75,6 +75,13 @@ public class LoanHomevisitInvestigateRest implements LoanHomevisitInvestigateFei return rb.success().setData(pv); } + @Override + public ResultBean> homeInforListPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = loanHomevisitInvestigateService.homeInforListPage(pq); + return rb.success().setData(pv); + } + @Override public ResultBean isPassThrough(String sid, String pass) { return loanHomevisitInvestigateService.isPassThrough(sid,pass); 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 df6abc30a0..e6f49505f3 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 @@ -190,6 +190,87 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService homeInforListPage(PagerQuery pq) { + LoanHomevisitInvestigateQuery 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(LoanHomevisitInvestigateDto dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { 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 458eae5bcd..e2d463a8b8 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 @@ -6,6 +6,7 @@ \ No newline at end of file From a60ad01225fa90704e214d1df31c20243a46302b Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 21 Aug 2023 16:39:19 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/bussalesorder/BusSalesOrderMapper.xml | 18 +++++++++-- .../bussalesorder/BusSalesOrderService.java | 5 ++- .../BusSalesOrderVehicleMapper.xml | 29 +++++++++++++++-- .../BusSalesOrderVehicleService.java | 8 ++--- .../anrui/flowable/api/flow2/FlowFeign.java | 5 +++ .../anrui/flowable/biz/flow2/FlowRest.java | 7 ++++- .../anrui/flowable/biz/flow2/FlowService.java | 31 +++++++++++++++++-- 7 files changed, 87 insertions(+), 16 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index fd90023924..2ff8de9bfc 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -509,16 +509,28 @@ @@ -150,9 +170,14 @@ from bus_sales_order_vehicle bv left join bus_sales_order bo on bo.sid = bv.salesOrderSid left join bus_sales_order_model bm on bo.sid = bm.salesOrderSid + LEFT JOIN anrui_base.base_vehicle_state bs ON bs.busSid = bv.sid ${ew.sqlSegment} - and length(bv.linkSid)>0 + AND bs.finSourceKey = '2' + AND length( bv.linkSid )> 0 + AND bs.finState = '0' + AND bs.carryVehicleState = '0' + AND bs.busState = '401' 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 2170d84cc3..96055e79da 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 @@ -424,7 +424,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService> resultBean = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()); if (!resultBean.getData().isEmpty()) { resultBean.getData().removeAll(Collections.singleton(null)); @@ -439,7 +439,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService list = baseMapper.getCanUseCars(qw); list.removeAll(Collections.singleton(null)); if (!list.isEmpty()) { @@ -490,7 +490,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService> resultBean = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()); + /* ResultBean> resultBean = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()); if (!resultBean.getData().isEmpty()) { resultBean.getData().removeAll(Collections.singleton(null)); List vinSidList = resultBean.getData().stream().map(v -> v.getVehSid()).collect(Collectors.toList()); @@ -504,7 +504,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); List list = pagging.getRecords(); 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 9e4f439e5f..6198639d99 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 @@ -31,4 +31,9 @@ public interface FlowFeign { @PostMapping(value = "/handleProsess") @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 eb77c65232..5faa7d7719 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 @@ -57,7 +57,7 @@ public class FlowRest implements FlowFeign { formVariables.put("createrOrgPath", orgPath); formVariables.put("businessSid", bv.getBusinessSid()); //获取下一环节待办人 - if(StringUtils.isBlank(bv.getNextNodeUserSids())){ + if (StringUtils.isBlank(bv.getNextNodeUserSids())) { ResultBean userResultBean = flowService.getNextNodeUser(bv); bv.setNextNodeUserSids(userResultBean.getData()); } @@ -100,5 +100,10 @@ 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 0a1aa20f05..7b6417f123 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 @@ -134,6 +134,7 @@ public class FlowService extends MybatisBaseService { /** * 根据业务参数取流程流转的环节 信息 + * * @param bv * @return */ @@ -273,6 +274,7 @@ public class FlowService extends MybatisBaseService { /** * 启动流程 + * * @param bv * @return */ @@ -426,6 +428,7 @@ public class FlowService extends MybatisBaseService { /** * 办理 + * * @param bv * @param b * @return @@ -726,10 +729,10 @@ public class FlowService extends MybatisBaseService { userSids.append(processVariables.get("sendRecommendSid").toString()).append(","); } //查询是否有设置转办的，抄送给设置转办人员 - List zbUserSids = processCommentService.selectByIdAndComment("转办",bv.getInstanceId()); + List zbUserSids = processCommentService.selectByIdAndComment("转办", bv.getInstanceId()); zbUserSids.removeAll(Collections.singleton(null)); - if(!zbUserSids.isEmpty()){ - String zbUser = String.join(",",zbUserSids); + if (!zbUserSids.isEmpty()) { + String zbUser = String.join(",", zbUserSids); userSids.append(zbUser).append(","); } userSids.deleteCharAt(userSids.length() - 1); @@ -746,4 +749,26 @@ public class FlowService extends MybatisBaseService { } + 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; + } } From 21fa0a6f19a6f18de2bb9c8a2a872e497eab06aa Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 21 Aug 2023 17:23:59 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E9=A3=8E=E6=8E=A7=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=81=E9=99=84=E4=BB=B6=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/base/api/basefiles/BaseFiles.java | 72 +++++ .../api/basefiles/BaseFilesDetailsVo.java | 40 +++ .../base/api/basefiles/BaseFilesDto.java | 80 ++++++ .../base/api/basefiles/BaseFilesFeign.java | 107 ++++++++ .../api/basefiles/BaseFilesFeignFallback.java | 79 ++++++ .../base/api/basefiles/BaseFilesQuery.java | 61 +++++ .../anrui/base/api/basefiles/BaseFilesVo.java | 75 +++++ .../base/biz/basefiles/BaseFilesMapper.java | 62 +++++ .../base/biz/basefiles/BaseFilesMapper.xml | 27 ++ .../base/biz/basefiles/BaseFilesRest.java | 92 +++++++ .../base/biz/basefiles/BaseFilesService.java | 257 ++++++++++++++++++ .../api/loanparameter/LoanParameter.java | 32 +++ .../loanparameter/LoanParameterDetailsVo.java | 25 ++ .../api/loanparameter/LoanParameterDto.java | 27 ++ .../api/loanparameter/LoanParameterFeign.java | 53 ++++ .../LoanParameterFeignFallback.java | 35 +++ .../api/loanparameter/LoanParameterQuery.java | 29 ++ .../api/loanparameter/LoanParameterVo.java | 23 ++ .../loanparameter/LoanParameterMapper.java | 24 ++ .../biz/loanparameter/LoanParameterMapper.xml | 21 ++ .../biz/loanparameter/LoanParameterRest.java | 51 ++++ .../loanparameter/LoanParameterService.java | 148 ++++++++++ 22 files changed, 1420 insertions(+) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFiles.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesDetailsVo.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesDto.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesFeign.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesFeignFallback.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesQuery.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesVo.java create mode 100644 anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesMapper.java create mode 100644 anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesMapper.xml create mode 100644 anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesRest.java create mode 100644 anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesService.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameter.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterDetailsVo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterDto.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterFeign.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterFeignFallback.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterQuery.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterVo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterMapper.java create mode 100644 anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterMapper.xml create mode 100644 anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterRest.java create mode 100644 anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterService.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFiles.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFiles.java new file mode 100644 index 0000000000..8af566ddc3 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFiles.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.basefiles; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-base(安瑞基础信息)
+ * File: BaseDataList.java
+ * Class: com.yxt.anrui.base.api.basedatalist.BaseDataList
+ * Description: 资料清单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-02-26 09:59:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "附件清单", description = "附件清单") +@TableName("base_files") +@Data +public class BaseFiles extends BaseEntity { + private static final long serialVersionUID = 1L; + @ApiModelProperty("业务类别key") + private String busTypeKey; + @ApiModelProperty("业务类别value") + private String busTypeValue; + @ApiModelProperty("文件编号") + private String fileNo; + @ApiModelProperty("文件名称") + private String fileName; + @ApiModelProperty("文件格式") + private String fileType; + @ApiModelProperty("示例") + private String sample; + @ApiModelProperty("份数") + private Integer count; + @ApiModelProperty("是否必传0非必传，1必传") + private Integer isUpload; + @ApiModelProperty("分公司sid") + private String useOrgSid; + @ApiModelProperty("分公司名") + private String useOrgName; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesDetailsVo.java new file mode 100644 index 0000000000..e44a9df0ca --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesDetailsVo.java @@ -0,0 +1,40 @@ +package com.yxt.anrui.base.api.basefiles; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/2/26 15:40 + * @Description + */ +@Data +public class BaseFilesDetailsVo implements Vo { + private static final long serialVersionUID = -8075833659958149115L; + private String sid; + private String userSid; + @ApiModelProperty("业务类别key") + private String busTypeKey; + @ApiModelProperty("业务类别value") + private String busTypeValue; + @ApiModelProperty("文件编号") + private String fileNo; + @ApiModelProperty("文件名称") + private String fileName; + @ApiModelProperty("文件格式") + private String fileType; + @ApiModelProperty("份数") + private Integer count; + @ApiModelProperty("是否必传0非必传，1必传") + private Integer isUpload; + @ApiModelProperty("分公司sid") + private String useOrgSid; + @ApiModelProperty("示例") + private List files = new ArrayList<>(); + @ApiModelProperty("备注") + private String remarks; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesDto.java new file mode 100644 index 0000000000..d0382a9e05 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesDto.java @@ -0,0 +1,80 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.basefiles; + + +import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.ArrayList; +import java.util.List; + +/** + * Project: anrui-base(安瑞基础信息)
+ * File: BaseDataListDto.java
+ * Class: com.yxt.anrui.base.api.basedatalist.BaseDataListDto
+ * Description: 资料清单 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-02-26 09:59:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "资料清单 数据传输对象", description = "资料清单 数据传输对象") +@Data +public class BaseFilesDto implements Dto { + private static final long serialVersionUID = 6031157146326125370L; + + private String sid; + private String userSid; + @ApiModelProperty("业务类别key") + private String busTypeKey; + @ApiModelProperty("业务类别value") + private String busTypeValue; + @ApiModelProperty("文件编号") + private String fileNo; + @ApiModelProperty("文件名称") + private String fileName; + @ApiModelProperty("文件格式") + private String fileType; + @ApiModelProperty("份数") + private Integer count; + @ApiModelProperty("是否必传0非必传，1必传") + private Integer isUpload; + @ApiModelProperty("分公司sid") + private String useOrgSid; + @ApiModelProperty("示例") + private List files = new ArrayList<>(); + @ApiModelProperty("备注") + private String remarks; +} \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesFeign.java new file mode 100644 index 0000000000..68c0ff0a15 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesFeign.java @@ -0,0 +1,107 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.basefiles; + +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.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; + +/** + * Project: anrui-base(安瑞基础信息)
+ * File: BaseDataListFeign.java
+ * Class: com.yxt.anrui.base.api.basedatalist.BaseDataListFeign
+ * Description: 资料清单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-02-26 09:59:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "附件清单") +@FeignClient( + contextId = "anrui-base-BaseFiles", + name = "anrui-base", + path = "v1/basefiles", + fallback = BaseFilesFeignFallback.class) +public interface BaseFilesFeign { + /** + * PC-附件清单分页列表 + * + * @param pq 查询条件 + * @return + */ + @ApiOperation("PC-附件清单分页列表") + @PostMapping("/listPage") + @ResponseBody + ResultBean> listPage(@RequestBody PagerQuery pq); + + /** + * PC-附件清单新增保存 + * + * @param dto 数据传输对象 + * @return + */ + @ApiOperation("新增编辑") + @PostMapping("/saveOrUpdate") + ResultBean saveOrUpdateBaseFiles(@RequestBody BaseFilesDto dto); + + /** + * PC-附件清单编辑初始化和详情 + * + * @param sid 资料清单sid + * @return + */ + @ApiOperation("编辑初始化、详情") + @GetMapping("/details/{sid}") + ResultBean selectDetails(@PathVariable("sid") String sid); + + @ApiOperation("批量删除") + @DeleteMapping("/deleteBySids") + @ResponseBody + public ResultBean deleteBySids(@RequestBody String[] sids); + + + /** + * PC-生成文件编号 + * + * @param busTypeKey 业务类型key + * @return + */ + @ApiOperation("生成文件编号") + @GetMapping("/createFileNo") + ResultBean createFileNo(@RequestParam("busTypeKey") String busTypeKey); + + +} \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesFeignFallback.java new file mode 100644 index 0000000000..5b888ae2c1 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesFeignFallback.java @@ -0,0 +1,79 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.basefiles; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui-base(安瑞基础信息)
+ * File: BaseDataListFeignFallback.java
+ * Class: com.yxt.anrui.base.api.basedatalist.BaseDataListFeignFallback
+ * Description: 资料清单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-02-26 09:59:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class BaseFilesFeignFallback implements BaseFilesFeign { + + + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean saveOrUpdateBaseFiles(BaseFilesDto dto) { + return null; + } + + + @Override + public ResultBean selectDetails(String sid) { + return null; + } + + @Override + public ResultBean deleteBySids(String[] sids) { + return null; + } + + @Override + public ResultBean createFileNo(String busTypeKey) { + return null; + } + + +} \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesQuery.java new file mode 100644 index 0000000000..ecb8351138 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesQuery.java @@ -0,0 +1,61 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.basefiles; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-base(安瑞基础信息)
+ * File: BaseDataListQuery.java
+ * Class: com.yxt.anrui.base.api.basedatalist.BaseDataListQuery
+ * Description: 资料清单 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-02-26 09:59:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "资料清单 查询条件", description = "资料清单 查询条件") +@Data +public class BaseFilesQuery implements Query { + + private String userSid; + @ApiModelProperty("业务类别key") + private String busTypeKey; + @ApiModelProperty("文件名称") + private String fileName; + @ApiModelProperty("是否必传0非必传，1必传") + private Integer isUpload; + @ApiModelProperty("分公司sid") + private String useOrgSid; + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesVo.java new file mode 100644 index 0000000000..4cc2592527 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFilesVo.java @@ -0,0 +1,75 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.basefiles; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * Project: anrui-base(安瑞基础信息)
+ * File: BaseDataListVo.java
+ * Class: com.yxt.anrui.base.api.basedatalist.BaseDataListVo
+ * Description: 资料清单 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-02-26 09:59:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "资料清单 视图数据对象", description = "资料清单 视图数据对象") +@Data +public class BaseFilesVo implements Vo { + + private static final long serialVersionUID = 8585166912605249026L; + @ApiModelProperty(value = "sid") + private String sid; + @ApiModelProperty("业务类别value") + private String busTypeValue; + @ApiModelProperty("文件名称") + private String fileName; + @ApiModelProperty("文件格式") + private String fileType; + @ApiModelProperty("份数") + private Integer count; + @ApiModelProperty("是否必传0非必传，1必传") + private Integer isUpload; + @ApiModelProperty("示例") + private String sample; + @ApiModelProperty("示例") + private List files = new ArrayList<>(); + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("查看附件按钮显示") + private Boolean showSampleBtn; +} \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesMapper.java new file mode 100644 index 0000000000..dcdcc7eb21 --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesMapper.java @@ -0,0 +1,62 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.biz.basefiles; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.base.api.basefiles.BaseFiles; +import com.yxt.anrui.base.api.basefiles.BaseFilesVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + + +/** + * Project: anrui-base(安瑞基础信息)
+ * File: BaseDataListMapper.java
+ * Class: com.yxt.anrui.base.biz.basedatalist.BaseDataListMapper
+ * Description: 资料清单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-02-26 09:59:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface BaseFilesMapper extends BaseMapper { + + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + + int updateBySidDelete(String sid); + + + String createFileNo(String busTypeKey); +} \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesMapper.xml new file mode 100644 index 0000000000..13e446a146 --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesMapper.xml @@ -0,0 +1,27 @@ + + + + + update base_files + set isDelete = 1 + where sid = #{sid} + + + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesRest.java new file mode 100644 index 0000000000..267210a2fb --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesRest.java @@ -0,0 +1,92 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.biz.basefiles; + +import com.yxt.anrui.base.api.basefiles.*; + +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 org.springframework.beans.factory.annotation.Autowired; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; +import java.util.Arrays; +import java.util.List; + +/** + * Project: anrui-base(安瑞基础信息)
+ * File: BaseDataListFeignFallback.java
+ * Class: com.yxt.anrui.base.biz.basedatalist.BaseDataListRest
+ * Description: 资料清单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-02-26 09:59:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "资料清单") +@RestController("com.yxt.anrui.base.biz.basefiles.BaseFilesRest") +@RequestMapping("v1/basefiles") +public class BaseFilesRest implements BaseFilesFeign { + + @Autowired + private BaseFilesService baseFilesService; + + @Override + public ResultBean> listPage(PagerQuery pq) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = baseFilesService.listPage(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean saveOrUpdateBaseFiles(BaseFilesDto dto) { + return baseFilesService.saveOrUpdateBaseFiles(dto); + } + + + @Override + public ResultBean selectDetails(String sid) { + return baseFilesService.selectDetails(sid); + } + + @Override + public ResultBean deleteBySids(String[] sids) { + return baseFilesService.deleteBySids(sids); + } + + @Override + public ResultBean createFileNo(String busTypeKey) { + return baseFilesService.createFileNo(busTypeKey); + } + +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesService.java new file mode 100644 index 0000000000..92f9956c21 --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefiles/BaseFilesService.java @@ -0,0 +1,257 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.biz.basefiles; + +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.base.api.basefiles.*; +import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; +import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter; +import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterQuery; +import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo; +import com.yxt.common.base.config.component.FileUploadComponent; +import com.yxt.common.base.service.MybatisBaseService; + +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.List; + +/** + * Project: anrui-base(安瑞基础信息)
+ * File: BaseDataListService.java
+ * Class: com.yxt.anrui.base.biz.basedatalist.BaseDataListService
+ * Description: 资料清单 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-02-26 09:59:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class BaseFilesService extends MybatisBaseService { + + + @Autowired + private FileUploadComponent fileUploadComponent; + @Autowired + private CommonAppendixService commonAppendixService; + + @Autowired + private SysOrganizationFeign sysOrganizationFeign; + + /** + * 编辑保存 + * + * @param dto + * @return + */ + public ResultBean saveOrUpdateBaseFiles(BaseFilesDto dto) { + ResultBean rb = ResultBean.fireFail(); + if (StringUtils.isNotBlank(dto.getSid())) { + BaseFiles baseFiles = fetchBySid(dto.getSid()); + BeanUtil.copyProperties(dto, baseFiles, "id", "sid"); + StringBuilder sb = new StringBuilder(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + if (!dto.getFiles().isEmpty()) { + for (String filePath : dto.getFiles()) { + String path = filePath.substring(urlPrefix.length()); + sb.append(path).append(","); + } + sb.delete(sb.length() - 1, sb.length()); + baseFiles.setSample(sb.toString()); + } + baseMapper.updateById(baseFiles); + } else { + BaseFiles baseFiles = new BaseFiles(); + BeanUtil.copyProperties(dto, baseFiles, "id", "sid"); + baseFiles.setCreateBySid(dto.getUserSid()); + String userOrgSid = dto.getUseOrgSid(); + baseFiles.setUseOrgSid(userOrgSid); + ResultBean organizationVo = sysOrganizationFeign.fetchBySid(userOrgSid); + if (organizationVo.getSuccess()) { + SysOrganizationVo organizationVoData = organizationVo.getData(); + if (null != organizationVoData) { + baseFiles.setUseOrgName(organizationVoData.getName()); + } + } + StringBuilder sb = new StringBuilder(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + if (!dto.getFiles().isEmpty()) { + for (String filePath : dto.getFiles()) { + String path = filePath.substring(urlPrefix.length()); + sb.append(path).append(","); + } + sb.delete(sb.length() - 1, sb.length()); + baseFiles.setSample(sb.toString()); + } + baseMapper.insert(baseFiles); + } + return rb.success(); + } + + /** + * 分页列表 + * + * @param pq + * @return + */ + public PagerVo listPage(PagerQuery pq) { + IPage page = PagerUtil.queryToPage(pq); + BaseFilesQuery pagerQuery = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + //业务类型 + if (StringUtils.isNotBlank(pagerQuery.getBusTypeKey())) { + qw.eq("busTypeKey", pagerQuery.getBusTypeKey()); + } + //文件名称 + if (StringUtils.isNotBlank(pagerQuery.getFileName())) { + qw.like("fileName", pagerQuery.getFileName()); + } + //是否必传 + if (null != pagerQuery.getIsUpload()) { + qw.eq("isUpload", pagerQuery.getIsUpload()); + } + qw.eq("useOrgSid", pagerQuery.getUseOrgSid()); + qw.eq("isDelete", 0); + qw.orderByDesc("createTime"); + IPage pagging = baseMapper.listPage(page, qw); + List records = pagging.getRecords(); + records.removeAll(Collections.singleton(null)); + if (!records.isEmpty()) { + for (BaseFilesVo record : records) { + record.setShowSampleBtn(false); + if (StringUtils.isNotBlank(record.getSample())) { + record.setShowSampleBtn(true); + String filePath = record.getSample(); + List filePaths = new ArrayList<>(); + String array[] = filePath.split(","); + for (int i = 0; i < array.length; i++) { + String urlPrefix = fileUploadComponent.getUrlPrefix(); + filePath = urlPrefix + array[i]; + filePaths.add(filePath); + record.setFiles(filePaths); + } + } + } + } + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + /** + * 编辑回显 + * + * @param sid + * @return + */ + public ResultBean selectDetails(String sid) { + ResultBean rb = ResultBean.fireFail(); + BaseFilesDetailsVo vo = new BaseFilesDetailsVo(); + BaseFiles baseFiles = fetchBySid(sid); + BeanUtil.copyProperties(baseFiles, vo); + if (StringUtils.isNotBlank(baseFiles.getSample())) { + String filePath = baseFiles.getSample(); + List filePaths = new ArrayList<>(); + String array[] = filePath.split(","); + for (int i = 0; i < array.length; i++) { + String urlPrefix = fileUploadComponent.getUrlPrefix(); + filePath = urlPrefix + array[i]; + filePaths.add(filePath); + vo.setFiles(filePaths); + } + } + return rb.success().setData(vo); + } + + /** + * 批量删除 + * + * @param sids + * @return + */ + public ResultBean deleteBySids(String[] sids) { + ResultBean rb = ResultBean.fireFail(); + for (String sid : sids) { + int count = baseMapper.updateBySidDelete(sid); + if (count == 0) { + return rb.setMsg("删除失败"); + } + } + return ResultBean.fireSuccess().setMsg("删除成功"); + } + + /** + * 生成文件编号 + * + * @param busTypeKey + * @return + */ + public ResultBean createFileNo(String busTypeKey) { + ResultBean rb = ResultBean.fireFail(); + String fileNo = baseMapper.createFileNo(busTypeKey); + String finNo = ""; + if (StringUtils.isNotBlank(fileNo)) { + String substringFileNo = fileNo.substring(busTypeKey.length()); + int parseInt = Integer.parseInt(substringFileNo); + if (parseInt >= 999) { + int i = Integer.parseInt(substringFileNo); + int finalNo = i + 1; + String value = String.valueOf(finalNo); + finNo = busTypeKey + value; + } else { + String countNo = substringFileNo.substring(substringFileNo.lastIndexOf('0') + 1, substringFileNo.length()); + int i = Integer.parseInt(countNo); + int finalNo = i + 1; + String value = String.valueOf(finalNo); + if (i == 99) { + finNo = busTypeKey + value; + } else if (i < 99 && i >= 9) { + finNo = busTypeKey + "0" + value; + } else if (i < 9) { + finNo = busTypeKey + "00" + value; + } + } + } else { + finNo = busTypeKey + "001"; + } + return rb.success().setData(finNo); + } +} \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameter.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameter.java new file mode 100644 index 0000000000..44ec58ea2b --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameter.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.riskcenter.api.loanparameter; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author Administrator + * @description + * @date 2023/8/16 14:34 + */ +@Data +@ApiModel(value = "风控参数", description = "风控参数") +@TableName("loan_parameter") +public class LoanParameter extends BaseEntity { + @ApiModelProperty("参数编码") + private String parameterNo; + @ApiModelProperty("参数名称") + private String parameterName; + @ApiModelProperty("参数值") + private String parameterValue; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("使用组织名称") + private String useOrgName; + @ApiModelProperty("使用组织全路径") + private String orgSidPath; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterDetailsVo.java new file mode 100644 index 0000000000..5598fdf27b --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterDetailsVo.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.riskcenter.api.loanparameter; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/8/21 9:13 + */ +@Data +public class LoanParameterDetailsVo implements Vo { + private String sid; + private String remarks; + private String userSid; + @ApiModelProperty("参数编码") + private String parameterNo; + @ApiModelProperty("参数名称") + private String parameterName; + @ApiModelProperty("参数值") + private String parameterValue; + @ApiModelProperty("使用组织全路径") + private String orgPath; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterDto.java new file mode 100644 index 0000000000..5506a8705e --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterDto.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.riskcenter.api.loanparameter; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/8/21 9:12 + */ +@Data +public class LoanParameterDto implements Dto { + + private String sid; + private String remarks; + private String userSid; + @ApiModelProperty("参数编码") + private String parameterNo; + @ApiModelProperty("参数名称") + private String parameterName; + @ApiModelProperty("参数值") + private String parameterValue; + @ApiModelProperty("使用组织全路径") + private String orgPath; + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterFeign.java new file mode 100644 index 0000000000..833d4df97e --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterFeign.java @@ -0,0 +1,53 @@ +package com.yxt.anrui.riskcenter.api.loanparameter; + +import com.yxt.anrui.riskcenter.api.loanfinpolicyrecordapply.LoanFinPolicyApplyQuery; +import com.yxt.anrui.riskcenter.api.loanfinpolicyrecordapply.LoanFinPolicyApplyVo; +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.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + + +/** + * @description: 风控参数 + * @author: fan + * @date: 2023/7/6 + **/ +@Api(tags = "风控参数") +@FeignClient( + contextId = "anrui-riskcenter-LoanParameter", + name = "anrui-riskcenter", + path = "v1/loanparameter", + fallback = LoanParameterFeignFallback.class) +public interface LoanParameterFeign { + + /** + * 根据条件分页查询数据的列表（已测试） + * + * @param pq + */ + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + + @ApiOperation("新增或修改") + @PostMapping("/saveOrUpdate") + @ResponseBody + public ResultBean saveOrUpdateParameter(@RequestBody LoanParameterDto dto); + + @ApiOperation("批量删除") + @DeleteMapping("/deleteBySids") + @ResponseBody + public ResultBean deleteBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterFeignFallback.java new file mode 100644 index 0000000000..d34f88f1fe --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterFeignFallback.java @@ -0,0 +1,35 @@ +package com.yxt.anrui.riskcenter.api.loanparameter; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Component; + +/** + * @author Administrator + * @description + * @date 2023/8/16 14:36 + */ +@Component +public class LoanParameterFeignFallback implements LoanParameterFeign { + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean saveOrUpdateParameter(LoanParameterDto dto) { + return null; + } + + + @Override + public ResultBean deleteBySids(String[] sids) { + return null; + } + + @Override + public ResultBean fetchDetailsBySid(String sid) { + return null; + } +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterQuery.java new file mode 100644 index 0000000000..c52a9d43ae --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterQuery.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.riskcenter.api.loanparameter; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/8/16 15:05 + */ +@Data +public class LoanParameterQuery implements Query { + + @ApiModelProperty("参数编码") + private String parameterNo; + @ApiModelProperty("参数名称") + private String parameterName; + @ApiModelProperty("组织全路径") + private String orgPath; + @ApiModelProperty("菜单sid") + private String menuSid; + @ApiModelProperty("菜单url") + private String menuUrl; + @ApiModelProperty("用户sid") + private String userSid; + + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterVo.java new file mode 100644 index 0000000000..f2f5dce78c --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterVo.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.riskcenter.api.loanparameter; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/8/16 15:04 + */ +@Data +public class LoanParameterVo implements Vo { + private String sid; + @ApiModelProperty("参数编码") + private String parameterNo; + @ApiModelProperty("参数名称") + private String parameterName; + @ApiModelProperty("参数值") + private String parameterValue; + @ApiModelProperty("备注") + private String remarks; +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterMapper.java new file mode 100644 index 0000000000..a8ce00219d --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterMapper.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.riskcenter.biz.loanparameter; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter; +import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + + +/** + * @description: + * @author: fan + * @date: 2023/8/21 + **/ +@Mapper +public interface LoanParameterMapper extends BaseMapper { + + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + int updateBySidDelete(String sid); +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterMapper.xml new file mode 100644 index 0000000000..48b1e7753b --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterMapper.xml @@ -0,0 +1,21 @@ + + + + + update loan_parameter + set isDelete = 1 + where sid = #{sid} + + + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterRest.java new file mode 100644 index 0000000000..f42e65ffa1 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterRest.java @@ -0,0 +1,51 @@ +package com.yxt.anrui.riskcenter.biz.loanparameter; + + +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderVo; +import com.yxt.anrui.riskcenter.api.loanparameter.*; +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 org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @description: + * @author: fan + * @date: 2023/8/21 + **/ +@Api(tags = "风控参数") +@RestController +@RequestMapping("v1/loanparameter") +public class LoanParameterRest implements LoanParameterFeign { + + @Autowired + private LoanParameterService parameterService; + + @Override + public ResultBean> listPage(PagerQuery pq) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = parameterService.listPage(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean saveOrUpdateParameter(LoanParameterDto dto) { + return parameterService.saveOrUpdateParameter(dto); + } + + @Override + public ResultBean deleteBySids(String[] sids) { + return parameterService.deleteBySids(sids); + } + + @Override + public ResultBean fetchDetailsBySid(String sid) { + return parameterService.fetchDetailsBySid(sid); + } +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterService.java new file mode 100644 index 0000000000..ab1569d4e1 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterService.java @@ -0,0 +1,148 @@ +package com.yxt.anrui.riskcenter.biz.loanparameter; + +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.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy; +import com.yxt.anrui.riskcenter.api.loanparameter.*; +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 org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Collections; +import java.util.List; + + +/** + * @description: + * @author: fan + * @date: 2023/8/21 + **/ +@Service +public class LoanParameterService extends MybatisBaseService { + + @Autowired + private SysUserFeign sysUserFeign; + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + private SysOrganizationFeign sysOrganizationFeign; + + public PagerVo listPage(PagerQuery pq) { + IPage page = PagerUtil.queryToPage(pq); + LoanParameterQuery pagerQuery = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + //======================= + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(pagerQuery.getOrgPath()); + privilegeQuery.setMenuSid(pagerQuery.getMenuSid()); + privilegeQuery.setMenuUrl(pagerQuery.getMenuUrl()); + privilegeQuery.setUserSid(pagerQuery.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = pagerQuery.getOrgPath(); + 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("orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("createBySid", pagerQuery.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + //======================= + //参数编码 + if (StringUtils.isNotBlank(pagerQuery.getParameterNo())) { + qw.like("parameterNo", pagerQuery.getParameterNo()); + } + //参数名称 + if (StringUtils.isNotBlank(pagerQuery.getParameterName())) { + qw.like("parameterName", pagerQuery.getParameterName()); + } + qw.eq("isDelete", 0); + qw.orderByDesc("createTime"); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public ResultBean saveOrUpdateParameter(LoanParameterDto dto) { + ResultBean rb = ResultBean.fireFail(); + if (StringUtils.isNotBlank(dto.getSid())) { + LoanParameter loanParameter = fetchBySid(dto.getSid()); + BeanUtil.copyProperties(dto, loanParameter, "id", "sid"); + baseMapper.updateById(loanParameter); + } else { + LoanParameter loanParameter = new LoanParameter(); + BeanUtil.copyProperties(dto, loanParameter, "id", "sid"); + loanParameter.setOrgSidPath(dto.getOrgPath()); + loanParameter.setCreateBySid(dto.getUserSid()); + ResultBean orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()); + if (orgSidByPath.getSuccess()) { + String userOrgSid = orgSidByPath.getData(); + loanParameter.setUseOrgSid(userOrgSid); + ResultBean organizationVo = sysOrganizationFeign.fetchBySid(userOrgSid); + if (organizationVo.getSuccess()) { + SysOrganizationVo organizationVoData = organizationVo.getData(); + if (null != organizationVoData) { + loanParameter.setUseOrgName(organizationVoData.getName()); + } + } + } + baseMapper.insert(loanParameter); + } + return rb.success(); + } + + public ResultBean deleteBySids(String[] sids) { + ResultBean rb = ResultBean.fireFail(); + for (String sid : sids) { + int count = baseMapper.updateBySidDelete(sid); + if (count == 0) { + return rb.setMsg("删除失败"); + } + } + return ResultBean.fireSuccess().setMsg("删除成功"); + } + + public ResultBean fetchDetailsBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanParameterDetailsVo vo = new LoanParameterDetailsVo(); + LoanParameter loanParameter = fetchBySid(sid); + BeanUtil.copyProperties(loanParameter, vo); + vo.setUserSid(loanParameter.getCreateBySid()); + vo.setOrgPath(loanParameter.getOrgSidPath()); + return rb.success().setData(vo); + } +} From 9e9c5fa3e33dd6cc2a67167a858cef41d8171ea6 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 21 Aug 2023 17:35:40 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanHomeVisitInvestigateInitZMWJVo.java | 2 ++ .../AppLoanHomeVisitInvestigateInitZCLVo.java | 2 +- .../AppLoanHomeVisitInvestigateSaveZCLDto.java | 2 +- .../LoanHomeVisitInvestigateService.java | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZMWJVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZMWJVo.java index 5e581b7e7a..9157aecc18 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZMWJVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZMWJVo.java @@ -28,6 +28,8 @@ public class LoanHomeVisitInvestigateInitZMWJVo implements Vo { private List guarantorIdCard; @ApiModelProperty("担保人户口本") private List guarantorAccount; + @ApiModelProperty("是否有配偶") + private Boolean spouseState = true; @ApiModelProperty("家访考察表sid") private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZCLVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZCLVo.java index aa775851ea..4ed58adfce 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZCLVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZCLVo.java @@ -11,7 +11,7 @@ public class AppLoanHomeVisitInvestigateInitZCLVo implements Vo { private String sid; @ApiModelProperty("银行卡") - private List yhkImages; + private List bankCardProperty; @ApiModelProperty("房产") private List houseProperty; @ApiModelProperty("车辆") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveZCLDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveZCLDto.java index a7e47b4de2..8bd14c37eb 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveZCLDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveZCLDto.java @@ -11,7 +11,7 @@ public class AppLoanHomeVisitInvestigateSaveZCLDto implements Vo { private String sid; @ApiModelProperty("银行卡") - private List yhkImages; + private List bankCardProperty; @ApiModelProperty("房产") private List houseProperty; @ApiModelProperty("车辆") diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java index 4d952bfcd0..7ac29e8e5f 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java @@ -261,6 +261,7 @@ public class LoanHomeVisitInvestigateService { LoanHomeVisitInvestigateInitZCLVo data = loanHomevisitInvestigateFeign.getAssetCertificateInfo(sid).getData(); AppLoanHomeVisitInvestigateInitZCLVo appLoanHomeVisitInvestigateInitZCLVo = new AppLoanHomeVisitInvestigateInitZCLVo(); BeanUtil.copyProperties(data,appLoanHomeVisitInvestigateInitZCLVo); + appLoanHomeVisitInvestigateInitZCLVo.setBankCardProperty(data.getYhkImages()); return rb.success().setData(appLoanHomeVisitInvestigateInitZCLVo); } @@ -268,6 +269,7 @@ public class LoanHomeVisitInvestigateService { ResultBean rb = ResultBean.fireFail(); LoanHomeVisitInvestigateSaveZCLDto loanHomeVisitInvestigateInitZCLDto = new LoanHomeVisitInvestigateSaveZCLDto(); BeanUtil.copyProperties(dto,loanHomeVisitInvestigateInitZCLDto); + loanHomeVisitInvestigateInitZCLDto.setYhkImages(dto.getBankCardProperty()); loanHomevisitInvestigateFeign.saveAssetCertificateInfo(loanHomeVisitInvestigateInitZCLDto); return rb.success(); }