From ebfd6afaae5a61d807368d9c053d1b148cc39893 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 17 Aug 2023 10:13:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=B6=E8=AE=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanHomevisitInvestigateFeign.java | 8 ++ ...LoanHomevisitInvestigateFeignFallback.java | 5 ++ .../LoanHomevisitInvestigateQuery.java | 4 + .../LoanHomevisitInvestigateRest.java | 7 ++ .../LoanHomevisitInvestigateService.java | 84 +++++++++++++++++++ .../LoanHomeVisitInvestigateFeign.java | 4 + .../LoanHomeVisitInvestigatePageVo.java | 6 +- .../LoanHomeVisitInvestigateRest.java | 5 ++ .../LoanHomeVisitInvestigateService.java | 41 +++++++++ 9 files changed, 162 insertions(+), 2 deletions(-) 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..cc1cbffc7f 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 @@ -186,4 +186,12 @@ public interface LoanHomevisitInvestigateFeign { @PostMapping("/saveAssetCertificateInfo") @ResponseBody public ResultBean saveAssetCertificateInfo(@Valid @RequestBody LoanHomeVisitInvestigateSaveZCLDto dto); + + /******************************************************家访进度*******************************************************/ + + @ApiOperation("家访进度分页列表") + @PostMapping("/jfjdListPage") + @ResponseBody + public ResultBean> jfjdListPage(@RequestBody PagerQuery pq); + } \ No newline at end of file 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 6a90f51f3a..81ffa19796 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 @@ -178,4 +178,9 @@ public class LoanHomevisitInvestigateFeignFallback implements LoanHomevisitInves public ResultBean saveAssetCertificateInfo(LoanHomeVisitInvestigateSaveZCLDto dto) { return null; } + + @Override + public ResultBean> jfjdListPage(PagerQuery pq) { + return null; + } } \ No newline at end of file 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..3379c82b69 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 @@ -69,10 +69,14 @@ public class LoanHomevisitInvestigateQuery implements Query { private String contractNo; @ApiModelProperty("贷款人名称") private String loanPeoName; + @ApiModelProperty("资方名称") + private String bankName; @ApiModelProperty("金融产品名称") private String policyName; @ApiModelProperty("家访专员姓名") private String homeVisStaffName; + @ApiModelProperty("考察结果value") + private String investigateValue; @ApiModelProperty("组织全路径") private String orgSidPath; private String menuSid; 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..d117b659c2 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 @@ -201,4 +201,11 @@ public class LoanHomevisitInvestigateRest implements LoanHomevisitInvestigateFei public ResultBean saveAssetCertificateInfo(LoanHomeVisitInvestigateSaveZCLDto dto) { return loanHomevisitInvestigateService.saveAssetCertificateInfo(dto); } + + @Override + public ResultBean> jfjdListPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = loanHomevisitInvestigateService.jfjdListPage(pq); + return rb.success().setData(pv); + } } 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..6ae88d793e 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 @@ -894,4 +894,88 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService jfjdListPage(PagerQuery pq) { + LoanHomevisitInvestigateQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("li.state", 2); + qw.eq("bb.busNo", 302); + if (StringUtils.isNotBlank(query.getMenuSid())) { + //======================= + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgSidPath()); + privilegeQuery.setMenuUrl(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.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.getBankName())) { + qw.like("bb.bankName", query.getBankName()); + } + if (StringUtils.isNotBlank(query.getHomeVisStaffName())) { + qw.like("li.homeVisStaffName", query.getHomeVisStaffName()); + } + if (StringUtils.isNotBlank(query.getInvestigateValue())) { + qw.like("li.investigateValue", query.getInvestigateValue()); + } + 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; + } } \ No newline at end of file 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 5ad9a84a24..c705b1834b 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 @@ -124,4 +124,8 @@ public interface LoanHomeVisitInvestigateFeign { @ResponseBody public ResultBean saveAssetCertificateInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateSaveZCLDto dto); + @ApiOperation("获取家访申诉列表") + @PostMapping("/getHomeAppealList") + @ResponseBody + ResultBean> getHomeAppealList(@RequestBody PagerQuery pagerQuery); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigatePageVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigatePageVo.java index 6985201e23..2577665c69 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigatePageVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigatePageVo.java @@ -26,7 +26,9 @@ public class LoanHomeVisitInvestigatePageVo implements Vo { @ApiModelProperty("家访地址") private String address; @ApiModelProperty("是否显示办理按钮") - private Boolean showHandleBtn; + private Boolean showHandleBtn = false; @ApiModelProperty("是否显示预约按钮") - private Boolean showAppointmentBtn; + private Boolean showAppointmentBtn = false; + @ApiModelProperty("是否显示申诉按钮") + private Boolean showAppealBtn = false; } 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 0a538616e8..9a9f988781 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 @@ -137,4 +137,9 @@ public class LoanHomeVisitInvestigateRest implements LoanHomeVisitInvestigateFei public ResultBean saveAssetCertificateInfo(AppLoanHomeVisitInvestigateSaveZCLDto dto) { return loanHomeVisitInvestigateService.saveAssetCertificateInfo(dto); } + + @Override + public ResultBean> getHomeAppealList(PagerQuery pagerQuery) { + return loanHomeVisitInvestigateService.getHomeAppealList(pagerQuery); + } } 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 0a1093717c..b6f4de52ef 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 @@ -249,4 +249,45 @@ public class LoanHomeVisitInvestigateService { loanHomevisitInvestigateFeign.saveAssetCertificateInfo(loanHomeVisitInvestigateInitZCLDto); return rb.success(); } + + public ResultBean> getHomeAppealList(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerQuery pq = new PagerQuery<>(); + LoanHomeVisitInvestigatePageQuery params = pagerQuery.getParams(); + LoanHomevisitInvestigateQuery params1 = new LoanHomevisitInvestigateQuery(); + params1.setOrgSidPath(params.getOrgPath()); + params1.setUserSid(params.getUserSid()); + params1.setNames(params.getNames()); + pq.setParams(params1); + ResultBean> resultBean = loanHomevisitInvestigateFeign.jfjdListPage(pq); + List loanHomeVisitInvestigatePageVos = new ArrayList<>(); + PagerVo v = new PagerVo<>(); + List records = resultBean.getData().getRecords(); + for (LoanHomevisitInvestigateVo record : records) { + LoanHomeVisitInvestigatePageVo loanHomeVisitInvestigatePageVo = new LoanHomeVisitInvestigatePageVo(); + loanHomeVisitInvestigatePageVo.setSid(record.getSid()); + loanHomeVisitInvestigatePageVo.setContractId(record.getContractNo()); + if (StringUtils.isNotBlank(record.getResHomeVisDate())){ + loanHomeVisitInvestigatePageVo.setNodeState("已预约"); + }else { + loanHomeVisitInvestigatePageVo.setNodeState("未预约"); + loanHomeVisitInvestigatePageVo.setShowAppointmentBtn(true); + } + loanHomeVisitInvestigatePageVo.setSalesName(record.getStaffName()); + loanHomeVisitInvestigatePageVo.setCreateDate(record.getCreateDate()); + loanHomeVisitInvestigatePageVo.setLenderName(record.getBorrowerName()); + loanHomeVisitInvestigatePageVo.setMobile(record.getMobile()); + loanHomeVisitInvestigatePageVo.setTimes(record.getResHomeVisDate()); + loanHomeVisitInvestigatePageVo.setAddress(record.getHomeVisAddress()); + if (record.getState().equals("1")) { + loanHomeVisitInvestigatePageVo.setShowHandleBtn(true); + } + if (record.getState().equals("2") && record.getInvestigateValue().equals("不通过")){ + loanHomeVisitInvestigatePageVo.setShowAppealBtn(true); + } + loanHomeVisitInvestigatePageVos.add(loanHomeVisitInvestigatePageVo); + } + v.setRecords(loanHomeVisitInvestigatePageVos); + return rb.success().setData(v); + } } \ No newline at end of file From 652098d06c07751a5d098e6ff802ca0edd5e063d Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 17 Aug 2023 14:09:34 +0800 Subject: [PATCH 2/3] =?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/riskcenter/biz/loantemplate/LoanTemplateService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateService.java index 4689ede098..947664f86b 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateService.java @@ -189,6 +189,7 @@ public class LoanTemplateService extends MybatisBaseService formList = loanSolutionsService.getFormList(solutionssVo); templateApplyVo.setFinanceForms(formList); return rb.success().setData(templateApplyVo); From 62f988ea07e04db9cf1fb3ded57256014aa611ef Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 17 Aug 2023 14:48:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehicle/BaseVehicleExportQuery.java | 13 ++-- .../biz/basevehicle/BaseVehicleService.java | 62 ++++++++++++++++--- 2 files changed, 59 insertions(+), 16 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportQuery.java index 3f05cd54b8..bad61df04f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportQuery.java @@ -15,11 +15,8 @@ import java.util.List; public class BaseVehicleExportQuery implements Query { private static final long serialVersionUID = -1272461446561155125L; - /** - * 选中的sid的list - */ - @ApiModelProperty(value = "sids", required = false) - private List sids; + @ApiModelProperty(value = "采购系统") + private String purchaseSystemName; @ApiModelProperty(value = "厂家采购订单类型value") private String manPurOrderTypeValue; @ApiModelProperty(value = "厂家库龄") @@ -62,7 +59,11 @@ public class BaseVehicleExportQuery implements Query { @ApiModelProperty(value = "买断结束日期") private String solidEndDate; - + @ApiModelProperty(value = "分公司名称") + private String orgName; + private String userSid; + private String menuUrl; + private String menuSid; /***************车型查询**********************/ @ApiModelProperty(value = "品牌") diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index d6c2a542a2..302509515c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -545,19 +545,61 @@ public class BaseVehicleService extends MybatisBaseService listExcel(BaseVehicleExportQuery pagerQuery) { QueryWrapper qw = new QueryWrapper<>(); - List sids = pagerQuery.getSids(); - - if (sids != null) { - for (String sid : sids) { - if (sids.size() != 0) { - qw.in("bv.sid", sid); + if (pagerQuery != null) { + //========================================数据授权开始 + if (StringUtils.isNotBlank(pagerQuery.getMenuUrl()) || StringUtils.isNotBlank(pagerQuery.getMenuSid())) { + //======================= + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(pagerQuery.getOrgSidPath()); + privilegeQuery.setMenuUrl(pagerQuery.getMenuUrl()); + privilegeQuery.setMenuSid(pagerQuery.getMenuSid()); + privilegeQuery.setUserSid(pagerQuery.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = pagerQuery.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("bv.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("bv.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("bv.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("bv.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("bv.createBySid", pagerQuery.getUserSid()); + } else { + List p = new ArrayList<>(); + return p; + } + } else { + List p = new ArrayList<>(); + return p; } } - } - if (pagerQuery != null) { + qw.eq("bv.isDelete", "0"); - if (StringUtils.isNotBlank(pagerQuery.getCreateOrgSid())) { - qw.eq("bv.createOrgSid", pagerQuery.getCreateOrgSid()); +// if (StringUtils.isNotBlank(pagerQuery.getCreateOrgSid())) { +// qw.eq("bv.createOrgSid", pagerQuery.getCreateOrgSid()); +// } + if (StringUtils.isNotBlank(pagerQuery.getOrgName())){ + qw.like("bv.createOrgName",pagerQuery.getOrgName()); + } + if (StringUtils.isNotBlank(pagerQuery.getPurchaseSystemName())){ + qw.like("bv.purchaseSystemName",pagerQuery.getPurchaseSystemName()); + } + if (StringUtils.isNotBlank(pagerQuery.getOrgSid())) { + qw.eq("bv.createOrgSid", pagerQuery.getOrgSid()); } if (StringUtils.isNotBlank(pagerQuery.getVinNo())) {//车架号 qw.like("bv.vinNo", pagerQuery.getVinNo());