From 0cf53949f06666a24dd9012062aa0404c6571ba7 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 7 Sep 2023 15:43:39 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanPreloanCreditApplyFeign.java | 2 ++ .../LoanFinOtherPolicyMapper.xml | 2 +- .../biz/loanfinpolicy/LoanFinPolicyMapper.xml | 2 +- .../saleOrders/AppBusSalesOrderFeign.java | 5 ++++ .../AppBusSalesOrderFeignFallback.java | 5 ++++ .../autoservice/saleOrders/OrderLoanVo.java | 6 ++++ .../terminal/api/base/common/CommonFeign.java | 5 ++++ .../saleOrders/AppBusSalesOrderRest.java | 5 ++++ .../saleOrders/AppBusSalesOrderService.java | 21 +++++++++++++ .../terminal/biz/base/common/CommonRest.java | 5 ++++ .../biz/base/common/CommonService.java | 30 +++++++++++++++++++ 11 files changed, 86 insertions(+), 2 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeign.java index c2cc3202e7..44fe09d097 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeign.java @@ -96,4 +96,6 @@ public interface LoanPreloanCreditApplyFeign { @ResponseBody ResultBean judgeIsLoan(@RequestParam("sid") String sid); + + } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml index 300367e696..a0e3afa7db 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml @@ -38,7 +38,7 @@ + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealRest.java index 08ff7f4d08..cf5122c4a7 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealRest.java @@ -70,6 +70,13 @@ public class LoanHomevisitAppealRest implements LoanHomevisitAppealFeign { return rb.success().setData(pv); } + @Override + public ResultBean> getHomeAppealList2(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = loanHomevisitAppealService.getHomeAppealList2(pq); + return rb.success().setData(pv); + } + @Override @ApiOperation("新增或修改") @PostMapping("/save") diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealService.java index c826a915c8..89832c349b 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealService.java @@ -204,9 +204,60 @@ public class LoanHomevisitAppealService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } + + public PagerVo getHomeAppealList2(PagerQuery pq) { + LoanHomevisitAppealQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getMenuSid())) { + //======================= + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgSidPath()); + privilegeQuery.setMenuSid(query.getMenuSid()); + 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.getNames())){ + qw.and(wrapper -> wrapper.like("bb.borrowerName", query.getNames()).or().like("li.homeVisStaffName", query.getNames())); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.getHomeAppealList2(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } public String saveOrUpdateDto(LoanHomevisitAppealDto dto){ - String dtoSid = dto.getSid(); + String dtoSid = dto.getSsSid(); List ssImages = dto.getSsImages(); if (StringUtils.isBlank(dtoSid)) { //生成单据编号 @@ -263,7 +314,7 @@ public class LoanHomevisitAppealService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); - appMap.put("sid", businessSid); + appMap.put("kcSid", loanHomevisitAppeal.getHomeVisitSid()); + appMap.put("ssSid", loanHomevisitAppeal.getSid()); variables.put("app", appMap); FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); if (StringUtils.isBlank(loanHomevisitAppeal.getProcDefId())) { @@ -500,7 +552,8 @@ public class LoanHomevisitAppealService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); - appMap.put("sid", businessSid); + appMap.put("kcSid", loanHomevisitAppeal.getHomeVisitSid()); + appMap.put("ssSid", loanHomevisitAppeal.getSid()); variables.put("app", appMap); flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); @@ -629,7 +682,7 @@ public class LoanHomevisitAppealService extends MybatisBaseService homeInforListPage(PagerQuery pq) { LoanHomevisitFileexamineQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); - qw.eq("li.state", query.getType()); - qw.eq("bb.busNo", 303); + qw.eq("li.state", 2); + qw.eq("lf.state", query.getType()); + if ("1".equals(query.getType())){ + qw.eq("bb.busNo", 303); + } if (StringUtils.isNotBlank(query.getMenuUrl())) { //======================= PrivilegeQuery privilegeQuery = new PrivilegeQuery(); @@ -426,7 +429,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService loanHomevisitInvestigateFileDetailsVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), busSalesOrderLoancontractDetailsVo.getLoanCotractNo()); - if (loanHomevisitInvestigateFileDetailsVos != null && loanHomevisitInvestigateFileDetailsVos.size() > 0){ + if (loanHomevisitInvestigateFileDetailsVos != null && loanHomevisitInvestigateFileDetailsVos.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : loanHomevisitInvestigateFileDetailsVos) { loanCotractImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); } @@ -440,7 +443,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService loanHomevisitInvestigateFileDetailsVos2 = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), busSalesOrderLoancontractDetailsVo.getLoanCotractNo()); - if (loanHomevisitInvestigateFileDetailsVos2 != null && loanHomevisitInvestigateFileDetailsVos2.size() > 0){ + if (loanHomevisitInvestigateFileDetailsVos2 != null && loanHomevisitInvestigateFileDetailsVos2.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : loanHomevisitInvestigateFileDetailsVos2) { bankContractImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitAppealPageVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitAppealPageVo.java new file mode 100644 index 0000000000..8f41049597 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitAppealPageVo.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppLoanHomeVisitAppealPageVo implements Vo { + + @ApiModelProperty("sid") + private String sid; + @ApiModelProperty("分公司-销售部门-销售专员") + private String salesName; + @ApiModelProperty("贷款人姓名") + private String lenderName; + @ApiModelProperty("家访人员") + private String jfMember; + @ApiModelProperty("预约家访日期") + private String times; + @ApiModelProperty("家访考察意见") + private String remarks; + @ApiModelProperty("申诉原因") + private String appealReason; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomevisitAppealDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomevisitAppealDto.java index 0fdc95cb92..af54b83e1b 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomevisitAppealDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomevisitAppealDto.java @@ -51,7 +51,7 @@ import java.util.List; @ApiModel(value = "家访考察申诉 数据传输对象", description = "家访考察申诉 数据传输对象") public class AppLoanHomevisitAppealDto implements Dto { - private String sid; + private String ssSid; @ApiModelProperty("申诉原因") private String appealReason; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java index f5957e3aa7..6888df6084 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java @@ -149,6 +149,11 @@ public interface LoanHomeVisitInvestigateFeign { @ResponseBody ResultBean> getHomeAppealList(@RequestBody PagerQuery pagerQuery); + @ApiOperation("获取家访申诉列表") + @PostMapping("/getHomeAppealList2") + @ResponseBody + ResultBean> getHomeAppealList2(@RequestBody PagerQuery pagerQuery); + @ApiOperation("初始化家访申诉") @GetMapping("/getHomeVisitAppealInfo") @ResponseBody diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java index deb5345b71..b7b7be772f 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java @@ -164,6 +164,11 @@ public class LoanHomeVisitInvestigateRest implements LoanHomeVisitInvestigateFei return loanHomeVisitInvestigateService.getHomeAppealList(pagerQuery); } + @Override + public ResultBean> getHomeAppealList2(PagerQuery pagerQuery) { + return loanHomeVisitInvestigateService.getHomeAppealList2(pagerQuery); + } + @Override public ResultBean getHomeVisitAppealInfo(String kcSid, String ssSid) { return loanHomeVisitInvestigateService.getHomeVisitAppealInfo(kcSid, ssSid); 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 ce79651007..3daddd6e1e 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 @@ -27,18 +27,7 @@ package com.yxt.anrui.terminal.biz.risk.loanhomevisitinvestigate; import cn.hutool.core.bean.BeanUtil; -import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; -import com.yxt.anrui.portal.api.sysuser.SysUserFeign; -import com.yxt.anrui.portal.api.sysuser.SysUserVo; -import com.yxt.anrui.riskcenter.api.loancreditappealapply.flowable.LoanCreditApplyCompleteDto; -import com.yxt.anrui.riskcenter.api.loancreditappealapply.flowable.LoanCreditApplyNodeQuery; -import com.yxt.anrui.riskcenter.api.loancreditappealapply.flowable.LoanCreditApplyNodeVo; -import com.yxt.anrui.riskcenter.api.loancreditappealapply.flowable.LoanCreditApplyTaskQuery; -import com.yxt.anrui.riskcenter.api.loancreditappealpeo.LoanCreditAppealPeoDto; -import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomeVisitInitAppealVo; -import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealFeign; -import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealQuery; -import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.*; import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.flowable.*; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.*; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomeVisitInvestigateInitCustomerVo; @@ -365,6 +354,35 @@ public class LoanHomeVisitInvestigateService { return rb.success().setData(v); } + public ResultBean> getHomeAppealList2(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerQuery pq = new PagerQuery<>(); + LoanHomeVisitInvestigatePageQuery params = pagerQuery.getParams(); + LoanHomevisitAppealQuery loanHomevisitAppealQuery = new LoanHomevisitAppealQuery(); + loanHomevisitAppealQuery.setOrgSidPath(params.getOrgPath()); + loanHomevisitAppealQuery.setUserSid(params.getUserSid()); + loanHomevisitAppealQuery.setNames(params.getNames()); + loanHomevisitAppealQuery.setMenuSid(params.getMenuSid()); + pq.setParams(loanHomevisitAppealQuery); + ResultBean> resultBean = loanHomevisitAppealFeign.getHomeAppealList2(pq); + List appLoanHomeVisitAppealPageVos = new ArrayList<>(); + PagerVo v = new PagerVo<>(); + List records = resultBean.getData().getRecords(); + for (LoanHomeVisitAppealPageVo record : records) { + AppLoanHomeVisitAppealPageVo appealPageVo = new AppLoanHomeVisitAppealPageVo(); + appealPageVo.setSid(record.getSid()); + appealPageVo.setSalesName(record.getUseOrgName() + "-" + record.getOrgName() + "-" + record.getStaffName()); + appealPageVo.setLenderName(record.getLenderName()); + appealPageVo.setJfMember(record.getJfMember()); + appealPageVo.setTimes(record.getTimes()); + appealPageVo.setRemarks(record.getRemarks()); + appealPageVo.setAppealReason(record.getAppealReason()); + appLoanHomeVisitAppealPageVos.add(appealPageVo); + } + v.setRecords(appLoanHomeVisitAppealPageVos); + return rb.success().setData(v); + } + public ResultBean submitCreditInfo(SubmitHomeAppealApplyDto dto) { ResultBean rb = ResultBean.fireFail(); SubmitHomeAppealDto submitHomeAppealDto = new SubmitHomeAppealDto(); From a68f5790dcb2e54b059def65d31c33168ecad565 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 7 Sep 2023 17:23:33 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanHomevisitInvestigateService.java | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 ad5850e879..4541e0e576 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 @@ -36,6 +36,7 @@ import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineDto; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.*; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomeVisitInvestigateInitCustomerVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomeVisitInvestigateSaveCustomerDto; @@ -61,6 +62,7 @@ import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVi import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomevisitInvestigateTransportDetailsVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomevisitInvestigateTransportDto; +import com.yxt.anrui.riskcenter.biz.loanhomevisitfileexamine.LoanHomevisitFileexamineService; import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerService; import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileService; import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigateoperations.LoanHomevisitInvestigateOperationsService; @@ -119,6 +121,8 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService listPageVo(PagerQuery pq) { @@ -1139,6 +1143,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService Date: Fri, 8 Sep 2023 09:38:18 +0800 Subject: [PATCH 4/6] =?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 | 1 + .../biz/bussalesorder/BusSalesOrderService.java | 11 +++++++++++ .../loanpreloancreditapply/LoanOrderPreloanVo.java | 2 -- 3 files changed, 12 insertions(+), 2 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 5eedec4232..4ba5304f38 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 @@ -57,6 +57,7 @@ when 0 then '否' when 1 then '是' end as insuranceInfo, if(bo.nodeState = '已办结', true, false) as showStopBtn, + if(bo.nodeState = '已办结', true, false) as showBorrowBtn, bo.nodeState is null as showUpdateBtn, bo.nodeState is null as showDeleteBtn, 0 as showFinancialBtn, 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 98aeda179f..f16bcbadbd 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 @@ -2099,6 +2099,17 @@ public class BusSalesOrderService extends MybatisBaseService Date: Fri, 8 Sep 2023 10:19:41 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=A1=AE=E5=AE=9A=E8=B4=B7=E6=AC=BE?= =?UTF-8?q?=E4=BA=BA=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanOrderPreloanVo.java | 1 + .../LoanPreloanCreditApplyMapper.xml | 2 +- .../LoanPreloanCreditApplyService.java | 36 +++++++++---------- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanOrderPreloanVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanOrderPreloanVo.java index 1b1fd81d57..42f9a14e1b 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanOrderPreloanVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanOrderPreloanVo.java @@ -20,4 +20,5 @@ public class LoanOrderPreloanVo implements Vo { private String confirmBtn; + } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml index 0b8389bbbf..f7f27abe73 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml @@ -48,7 +48,7 @@ select la.* from loan_preloan_credit_apply la left join anrui_buscenter.bus_sales_order bo on bo.customerSid = la.custSid - where bo.sid = #{sid} and la.state = 0 + where bo.sid = #{sid} order by la.createTime desc limit 1 diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java index 170782bc76..e8441716be 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java @@ -578,32 +578,30 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService Date: Fri, 8 Sep 2023 11:01:59 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=A1=AE=E5=AE=9A=E8=B4=B7=E6=AC=BE?= =?UTF-8?q?=E4=BA=BA=E5=88=97=E8=A1=A8=E5=8F=8A=E7=A1=AE=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusSalesOrderVehicle.java | 2 + .../BusSalesOrderBorrowerMapper.java | 8 ++++ .../BusSalesOrderBorrowerMapper.xml | 10 +++++ .../BusSalesOrderBorrowerService.java | 42 ++++++++++++++++++- .../BusSalesOrderPriceMapper.java | 3 ++ .../BusSalesOrderPriceMapper.xml | 4 ++ .../BusSalesOrderPriceService.java | 5 +++ .../LoanPreloanQuery.java | 2 + .../LoanPreloanCreditApplyMapper.java | 2 + .../LoanPreloanCreditApplyMapper.xml | 4 ++ .../LoanPreloanCreditApplyService.java | 7 ++++ 11 files changed, 87 insertions(+), 2 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicle.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicle.java index 65a2199c8e..02628a22a8 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicle.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicle.java @@ -65,5 +65,7 @@ public class BusSalesOrderVehicle extends BaseEntity { private String temporaryNo; @ApiModelProperty("临时客户名称") private String temporaryName; + @ApiModelProperty("贷款人sid") + private String borrowerSid; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java index 36c740547d..bbed69f2fd 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java @@ -29,6 +29,9 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; +import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy; +import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -68,4 +71,9 @@ public interface BusSalesOrderBorrowerMapper extends BaseMapper select ifnull(sum(vehCount),0) from bus_sales_order_borrower where salesOrderSid = #{sid} + + + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java index be65ea6c6a..1999e6cd3a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java @@ -30,7 +30,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.buscenter.api.bussalesorderborrower.*; import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice; +import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDto; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceService; +import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService; +import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy; +import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -41,6 +46,7 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Collections; import java.util.List; /** @@ -61,6 +67,8 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService createQueryWrapper(BusSalesOrderBorrowerQuery query) { @@ -134,7 +142,37 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService list = busSalesOrderPriceService.selectByOrdersSid(sid); + list.removeAll(Collections.singleton(null)); + if (list.size() < query.getVehCount()) { + return rb.setMsg("销售订单剩余台数不足"); + } + for (int i = 0; i < query.getVehCount(); i++) { + BusSalesOrderVehicle busSalesOrderVehicle = list.get(i); + busSalesOrderVehicle.setBorrowerSid(query.getCustomSid()); + busSalesOrderVehicleService.updateById(busSalesOrderVehicle); + } + baseMapper.insert(busSalesOrderBorrower); + return rb.success(); } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.java index ca9fd13c83..e9b31f7da0 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.java @@ -30,6 +30,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo; import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice; import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderprice.app.AppBusSalesOrderPriceVo; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -96,4 +97,6 @@ public interface BusSalesOrderPriceMapper extends BaseMapper BusSalesOrderPrice selectByContractNoOne(String contractNo); List selectListByOrderSid(@Param("saleOrderSid")String saleOrderSid); + + List selectByOrdersSid(String sid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml index 0057b397cc..562795ecf6 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml @@ -73,4 +73,8 @@ from bus_sales_order_price where salesOrderSid = #{saleOrderSid} + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java index aa05c46c2b..74924fa939 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java @@ -35,6 +35,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDetailsV import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDto; import com.yxt.anrui.buscenter.api.bussalesorderprice.app.AppBusSalesOrderPriceDto; import com.yxt.anrui.buscenter.api.bussalesorderprice.app.AppBusSalesOrderPriceVo; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService; import com.yxt.anrui.buscenter.biz.bussalesordermakeup.BusSalesOrderMakeupService; import com.yxt.anrui.buscenter.biz.bussalesordermodel.BusSalesOrderModelService; @@ -213,4 +214,8 @@ public class BusSalesOrderPriceService extends MybatisBaseService selectListByOrderSid(String saleOrderSid) { return baseMapper.selectListByOrderSid(saleOrderSid); } + + public List selectByOrdersSid(String sid) { + return baseMapper.selectByOrdersSid(sid); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanQuery.java index 2914add206..ef90bd3f27 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanQuery.java @@ -24,4 +24,6 @@ public class LoanPreloanQuery implements Query { @ApiModelProperty("移动端：姓名、身份证、手机号") private String name; + @ApiModelProperty("销售订单sid") + private String orderSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.java index 5fffe96d39..6976bf54e0 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.java @@ -65,4 +65,6 @@ public interface LoanPreloanCreditApplyMapper extends BaseMapper selectBySid(String orderSid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml index f7f27abe73..8efc961183 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml @@ -58,4 +58,8 @@ left join anrui_buscenter.bus_sales_order_price bp on bp.salesOrderSid = bo.sid where bo.sid = #{sid} + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java index e8441716be..0d0948a510 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java @@ -54,6 +54,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Collections; import java.util.List; @Service @@ -562,6 +563,12 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService borrowSidList = baseMapper.selectBySid(query.getOrderSid()); + borrowSidList.removeAll(Collections.singleton(null)); + if(borrowSidList.size()>0){ + qw.notIn("la.custSid",borrowSidList); + } } IPage page = PagerUtil.queryToPage(pagerQuery); IPage pagging = baseMapper.getOrderLoanPagerList(page, qw, query.getName());