From 87753b0b32ad885f87329c6319fb062ded84d9ae Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 10 Jul 2023 16:21:02 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=91=E8=9E=8D=E4=BA=A7=E5=93=81=E6=94=BF?= =?UTF-8?q?=E7=AD=96=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bussalesorder/BusSalesOrderService.java | 2 - .../anrui/flowable/biz/flow/FlowableRest.java | 113 ++++++++++-------- .../SysFlowableConfigVvo.java | 2 + .../portal/api/sysuser/SysUserFeign.java | 4 + .../api/sysuser/SysUserFeignFallback.java | 5 + .../anrui/portal/api/sysuser/UserssQuery.java | 19 +++ .../anrui/portal/biz/sysuser/SysUserRest.java | 5 + .../portal/biz/sysuser/SysUserService.java | 41 ++++++- .../api/loanfinbank/LoanFinBankFeign.java | 4 + .../loanfinbank/LoanFinBankFeignFallback.java | 5 + .../api/loanfinbank/LoanFinBanksVo.java | 18 +++ .../api/loanfinpolicy/LoanFinPolicyDto.java | 2 +- .../api/loanfinpolicy/LoanFinPolicyVo.java | 2 +- .../api/loanfinpolicy/LoanFinPolicyVos.java | 4 +- .../biz/loanfinbank/LoanFinBankMapper.java | 3 + .../biz/loanfinbank/LoanFinBankMapper.xml | 10 +- .../biz/loanfinbank/LoanFinBankRest.java | 8 +- .../biz/loanfinbank/LoanFinBankService.java | 12 ++ .../biz/loanfinpolicy/LoanFinPolicyMapper.xml | 34 +++++- .../loanfinpolicy/LoanFinPolicyService.java | 18 ++- 20 files changed, 245 insertions(+), 66 deletions(-) create mode 100644 anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/UserssQuery.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBanksVo.java diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 3b2f11abd1..feba768e52 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 @@ -5141,8 +5141,6 @@ public class BusSalesOrderService extends MybatisBaseService map,String taskDefKey) { + public ResultBean cc(Map map, String taskDefKey) { ResultBean rb = ResultBean.fireFail(); log.info("FlowableRest-cc:{}", JSONObject.toJSONString(map)); Object bv1 = map.get("bv"); @@ -197,12 +197,12 @@ public class FlowableRest implements FlowableFeign { return rb.setMsg("抄送失败，流程定义不存在！"); } mfq.setModuleName(process.get("NAME_")); - if(processVariables.containsKey("orderNames")){ + if (processVariables.containsKey("orderNames")) { mfq.setMsgTitle(processVariables.get("orderNames").toString()); - }else{ + } else { mfq.setMsgTitle(process.get("NAME_")); } - if(processVariables.containsKey("sendRecommendSid")){//增加的其他的抄送人 + if (processVariables.containsKey("sendRecommendSid")) {//增加的其他的抄送人 userSids.append(processVariables.get("sendRecommendSid").toString()).append(","); } userSids.deleteCharAt(userSids.length() - 1); @@ -305,7 +305,7 @@ public class FlowableRest implements FlowableFeign { if (!success) { // return rb.setMsg(nextNodeUserSidsOfCreate.getMsg()); nextNodeUserSids_ = ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId(); - }else{ + } else { nextNodeUserSids_ = nextNodeUserSidsOfCreate.getData().getUserSid(); dto.getFormVariables().put(BusinessVariables.ORGPATH, nextNodeUserSidsOfCreate.getData().getOrgPath()); } @@ -333,11 +333,11 @@ public class FlowableRest implements FlowableFeign { public ResultBean handleProsess(BusinessVariables dto) { ResultBean rb = ResultBean.fireFail(); ResultBean updateFlowFieldVoResultBean = handleProsess(dto, true); - log.info("流程返回：{}",JSONObject.toJSONString(updateFlowFieldVoResultBean)); + log.info("流程返回：{}", JSONObject.toJSONString(updateFlowFieldVoResultBean)); //需要判断办结后再执行 TODO if (updateFlowFieldVoResultBean.getSuccess()) { - log.info("流程返回：{}",JSONObject.toJSONString(updateFlowFieldVoResultBean)); - if ("Event_end".equals(updateFlowFieldVoResultBean.getData().getTaskDefKey())) { + log.info("流程返回：{}", JSONObject.toJSONString(updateFlowFieldVoResultBean)); + if ("Event_end".equals(updateFlowFieldVoResultBean.getData().getTaskDefKey())) { try { ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() .setNameFormat("demo-pool-%d").build(); @@ -351,7 +351,7 @@ public class FlowableRest implements FlowableFeign { UpdateFlowFieldVo ufVo = updateFlowFieldVoResultBean.getData(); ufVo.setTaskId(dto.getTaskId()); map.put("uff", ufVo); - cc(map,dto.getTaskDefKey()); + cc(map, dto.getTaskDefKey()); }); } catch (Exception e) { e.printStackTrace(); @@ -389,31 +389,37 @@ public class FlowableRest implements FlowableFeign { boolean isChange = false; String firstName = ""; String firstSid = ""; + String changeName = ""; if (StringUtils.isBlank(nextUserSid)) { ResultBean nextNodeUserSidsOfSubmit = getNextNodeUserSidsOfSubmit(dto); if (!nextNodeUserSidsOfSubmit.getSuccess()) { -// return rb.setMsg("nextUserSid 不能为空！"); - //=================================添加系统个管理员自动审批 + //下一环节用户为空的情况 nextUserSid = ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId(); adminContains = true; - }else{ + } else { nextUserSid = nextNodeUserSidsOfSubmit.getData().getUserSid(); formVariables.put(BusinessVariables.ORGPATH, nextNodeUserSidsOfSubmit.getData().getOrgPath()); - if(nextUserSid != null){ + //下一环节不为空，查询下一环节用户是否有转办人 + if (nextUserSid != null) { List nextUserList = Arrays.asList(nextUserSid.split(",")); - if(nextUserList.size() == 1){ + if (nextUserList.size() == 1) { + //下一环节用户sid firstSid = nextUserList.get(0); ResultBean sysUserVoResultBean = sysUserFeign.fetchBySid(firstSid); - if(sysUserVoResultBean.getData() != null){ + if (sysUserVoResultBean.getData() != null) { + //下一环节用户名称 firstName = sysUserVoResultBean.getData().getName(); } SysFlowableConfigQuery sysFlowableConfigQuery = new SysFlowableConfigQuery(); sysFlowableConfigQuery.setUserSid(firstSid); sysFlowableConfigQuery.setNowDate(new Date()); ResultBean sysFlowableConfigVvoResultBean = sysFlowableConfigFeign.selectByUserSid(sysFlowableConfigQuery); - if(sysFlowableConfigVvoResultBean.getData() != null){ - if(StringUtils.isNotBlank(sysFlowableConfigVvoResultBean.getData().getChangeUserSid())){ + if (sysFlowableConfigVvoResultBean.getData() != null) { + if (StringUtils.isNotBlank(sysFlowableConfigVvoResultBean.getData().getChangeUserSid())) { + //转办人sid nextUserSid = sysFlowableConfigVvoResultBean.getData().getChangeUserSid(); + //转办人名称 + changeName = sysFlowableConfigVvoResultBean.getData().getChangeName(); isChange = true; } } @@ -421,8 +427,9 @@ public class FlowableRest implements FlowableFeign { } } - }else{ - if(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId().equals(nextUserSid)){ + } else { + //若下一环节用户与系统管理员一致，则自动审批 + if (ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId().equals(nextUserSid)) { adminContains = true; } } @@ -442,6 +449,7 @@ public class FlowableRest implements FlowableFeign { if (StringUtils.isBlank(businessSid)) { return rb.setMsg("业务sid 不能为空！"); } + //查询任务id为taskId的任务是否存在 Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); if (Objects.isNull(task)) { return rb.setMsg("任务不存在"); @@ -454,7 +462,7 @@ public class FlowableRest implements FlowableFeign { String taskDefKey = ""; vo.setSid(businessSid); - if (DelegationState.PENDING.equals(task.getDelegationState())) { + if (DelegationState.PENDING.equals(task.getDelegationState())) {//加签 taskService.addComment(taskId, instanceId, FlowComment.DELEGATE.getType(), comment); taskService.resolveTask(taskId, formVariables); @@ -469,15 +477,11 @@ public class FlowableRest implements FlowableFeign { if (ll.getData().size() > 0) { LatestTaskVo latestTaskVo = ll.getData().get(0); String id_ = latestTaskVo.getId_(); - if(isChange){//添加评论 - ResultBean sysUserVoResultBean = sysUserFeign.fetchBySid(nextUserSid); + if (isChange) {//若下一环节用户存在转办人则添加评论 ProcessCommentDto processCommentDto = new ProcessCommentDto(); processCommentDto.setReviewerSid(firstSid); - if(sysUserVoResultBean.getData() != null){ - String changeName = sysUserVoResultBean.getData().getName(); - processCommentDto.setReviewer(firstName); - processCommentDto.setContent("交"+changeName+"转办"); - } + processCommentDto.setReviewer(firstName); + processCommentDto.setContent("交" + changeName + "转办"); processCommentDto.setTime(new Date()); processCommentDto.setProcessId(dto.getInstanceId()); processCommentService.saveOrUpdateDto(processCommentDto); @@ -494,7 +498,7 @@ public class FlowableRest implements FlowableFeign { vo.setNodeState(FlowComment.SETTLE.getRemark()); } } - if (adminContains) { + if (adminContains) {//若下一环节用户与系统管理员一致，则自动审批 dto.setUserSid(nextUserSid); dto.setTaskId(vo.getTaskId()); dto.setTaskDefKey(taskDefKey); @@ -510,13 +514,13 @@ public class FlowableRest implements FlowableFeign { if (taskDefKey.equals(id) && i + 1 < flowElements.size()) { FlowElement flowElement1 = flowElements.get(i + 1); List sysUserVoLists2 = new ArrayList<>(); - if(i+2 candidateGroups = userTask.getCandidateGroups(); //根据角色查询用户 - for (String roleSid : candidateGroups) { + /*for (String roleSid : candidateGroups) { UserQuery userQuery = new UserQuery(); userQuery.setRoleSid(roleSid); userQuery.setOrgSidPath(dto.getOrgSidPath()); @@ -526,6 +530,13 @@ public class FlowableRest implements FlowableFeign { continue; } sysUserVoLists2.addAll(userByRole.getData()); + }*/ + UserssQuery userssQuery = new UserssQuery(); + userssQuery.setCandidateGroups(candidateGroups); + userssQuery.setOrgSidPath(dto.getOrgSidPath()); + sysUserVoLists2 = sysUserFeign.getUsersByRoles(userssQuery).getData(); + if (sysUserVoLists2 == null) { + sysUserVoLists2 = new ArrayList<>(); } } } @@ -534,7 +545,7 @@ public class FlowableRest implements FlowableFeign { List candidateGroups = userTask.getCandidateGroups(); List sysUserVoLists = new ArrayList<>(); //根据角色查询用户 - for (String roleSid : candidateGroups) { + /* for (String roleSid : candidateGroups) { UserQuery userQuery = new UserQuery(); userQuery.setRoleSid(roleSid); userQuery.setOrgSidPath(dto.getOrgSidPath()); @@ -544,6 +555,13 @@ public class FlowableRest implements FlowableFeign { continue; } sysUserVoLists.addAll(userByRole.getData()); + }*/ + UserssQuery userssQuery = new UserssQuery(); + userssQuery.setCandidateGroups(candidateGroups); + userssQuery.setOrgSidPath(dto.getOrgSidPath()); + sysUserVoLists = sysUserFeign.getUsersByRoles(userssQuery).getData(); + if (sysUserVoLists == null) { + sysUserVoLists = new ArrayList<>(); } //当前环节运营部总经理 刘丽艳 点击同意 下一环节 事业部副总经理 （nextUserSid） 和事业部总经理（sysUserVoLists.get(0).getSid()） //判断查询回来的用户的集合size是1 并且用户的sid和下一环节的用户的sid相同。 @@ -552,7 +570,7 @@ public class FlowableRest implements FlowableFeign { break; } //如果下一环节无用户，则默认系统管理员自动审批 - if(sysUserVoLists.size() == 0 && sysUserVoLists2.size() == 1 && sysUserVoLists2.get(0).getSid().equals(nextUserSid)){ + if (sysUserVoLists.size() == 0 && sysUserVoLists2.size() == 1 && sysUserVoLists2.get(0).getSid().equals(nextUserSid)) { contains = true; break; } @@ -579,6 +597,7 @@ public class FlowableRest implements FlowableFeign { /** * 未添加系统管理员自动审批功能 + * * @param dto * @param b 是否连续跳转环节 * @return @@ -604,7 +623,7 @@ public class FlowableRest implements FlowableFeign { ResultBean nextNodeUserSidsOfSubmit = getNextNodeUserSidsOfSubmit(dto); if (!nextNodeUserSidsOfSubmit.getSuccess()) { return rb.setMsg("nextUserSid 不能为空！"); - }else{ + } else { nextUserSid = nextNodeUserSidsOfSubmit.getData().getUserSid(); formVariables.put(BusinessVariables.ORGPATH, nextNodeUserSidsOfSubmit.getData().getOrgPath()); @@ -811,8 +830,8 @@ public class FlowableRest implements FlowableFeign { } @Override - public ResultBean> selectFlowVaributes(String taskId) { - ResultBean> rb = ResultBean.fireFail(); + public ResultBean> selectFlowVaributes(String taskId) { + ResultBean> rb = ResultBean.fireFail(); HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery() .includeProcessVariables().taskId(taskId).singleResult(); Map processVariables = historicTaskInstance.getProcessVariables(); @@ -845,12 +864,12 @@ public class FlowableRest implements FlowableFeign { shareUserQuery.setMemberSids(memberSidList); //查询所勾选的人员和勾选的部门下的去重后的所有人员的用户sid ResultBean> staffList = sysUserFeign.shareSelectUser(shareUserQuery); - if(memberSidList == null && orgSidList != null && orgSidList.size()>0){ - if(staffList.getData() == null || staffList.getData().size() == 0){ + if (memberSidList == null && orgSidList != null && orgSidList.size() > 0) { + if (staffList.getData() == null || staffList.getData().size() == 0) { return rb.setMsg("所选部门下无分享人员"); } } - if(memberSidList == null && orgSidList == null && orgSidList.size() == 0){ + if (memberSidList == null && orgSidList == null && orgSidList.size() == 0) { return rb.setMsg("请选择人员"); } //组装分享的消息数据 @@ -878,7 +897,7 @@ public class FlowableRest implements FlowableFeign { } log.info("分享方法-historicTaskInstance:{}", JSONObject.toJSONString(historicTaskInstance)); StringBuilder userSids = new StringBuilder(); - staffList.getData().forEach(f->{ + staffList.getData().forEach(f -> { userSids.append(f).append(","); }); userSids.deleteCharAt(userSids.length() - 1); @@ -904,9 +923,9 @@ public class FlowableRest implements FlowableFeign { BeanUtil.copyProperties(uff, messageFlowVo); mfq.setUfVo(messageFlowVo); mfq.setModuleName(process.get("NAME_")); - if(processVariables.containsKey("orderNames")){ + if (processVariables.containsKey("orderNames")) { mfq.setMsgTitle(processVariables.get("orderNames").toString()); - }else{ + } else { mfq.setMsgTitle(process.get("NAME_")); } @@ -921,18 +940,18 @@ public class FlowableRest implements FlowableFeign { @Override public ResultBean selectFlows(String proDefId, String proInsId) { - return flowableService.selectFlows(proDefId,proInsId); + return flowableService.selectFlows(proDefId, proInsId); } @Override public ResultBean> getMap(FlowProcessMapQuery query) { - ResultBean> rb = ResultBean.fireFail(); - Map variables = query.getVariables(); - String contractNo = query.getContractNo(); + ResultBean> rb = ResultBean.fireFail(); + Map variables = query.getVariables(); + String contractNo = query.getContractNo(); String proDefKey = query.getProDefKey(); Map process = processService.getProcessDefByDefId(proDefKey); - String orderNames = contractNo+process.get("NAME_"); - variables.put("orderNames",orderNames); + String orderNames = contractNo + process.get("NAME_"); + variables.put("orderNames", orderNames); return rb.success().setData(variables); } } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigVvo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigVvo.java index abfcc91709..e522c7bb68 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigVvo.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigVvo.java @@ -14,4 +14,6 @@ public class SysFlowableConfigVvo implements Vo { private static final long serialVersionUID = -3291554285219440731L; @ApiModelProperty("转办人sid") private String changeUserSid; + @ApiModelProperty("转办人名称") + private String changeName; } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java index 18746ee6e6..1b9d425830 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java @@ -199,6 +199,10 @@ public interface SysUserFeign { @GetMapping(value = "getUserByRole") ResultBean> getUserByRole(@SpringQueryMap UserQuery query); + @ApiOperation(value = "获取本机构链角色的用户") + @PostMapping(value = "getUsersByRoles") + ResultBean> getUsersByRoles(@RequestBody UserssQuery usersQuery); + /** * 参数：当前用户角色sid，部门sid * diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java index d641593826..19a12a7b16 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java @@ -186,6 +186,11 @@ public class SysUserFeignFallback implements SysUserFeign { return null; } + @Override + public ResultBean> getUsersByRoles(UserssQuery usersQuery) { + return null; + } + @Override public ResultBean> getUserByOrgRole(UserRoleQuery query) { return null; diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/UserssQuery.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/UserssQuery.java new file mode 100644 index 0000000000..084c1988dc --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/UserssQuery.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.portal.api.sysuser; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/7/10 + **/ +@Data +public class UserssQuery { + + private List candidateGroups = new ArrayList<>(); + + private String orgSidPath; +} diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java index ec5f9e2aa7..f732cd35a3 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java @@ -605,6 +605,11 @@ public class SysUserRest implements SysUserFeign { return sysUserService.getUserByRole(query); } + @Override + public ResultBean> getUsersByRoles(UserssQuery usersQuery) { + return sysUserService.getUsersByRoles(usersQuery); + } + @Override public ResultBean> getUserByOrgRole(UserRoleQuery query) { return sysUserService.getUserByOrgRole(query); diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java index 495ed26dbd..ee7d5293cc 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java @@ -1118,6 +1118,43 @@ public class SysUserService extends MybatisBaseService { return rb.success().setData(sysUserVoList); + } + + public ResultBean> getUsersByRoles(UserssQuery usersQuery) { + ResultBean> rb = ResultBean.fireFail(); + List sysUserVoList = new ArrayList<>(); + List candidateGroups = usersQuery.getCandidateGroups(); + candidateGroups.removeAll(Collections.singleton(null)); + String orgSidPath = usersQuery.getOrgSidPath(); + if (!candidateGroups.isEmpty()) { + for (String roleSid : candidateGroups) { + //根据角色sid获取角色的层级 + String levelTypeKey = sysRoleService.getLevelType(roleSid); + if (StringUtils.isNotBlank(levelTypeKey)) { + if (orgSidPath.split("/").length >= Integer.parseInt(levelTypeKey) - 1) { + String levelOrgSid = orgSidPath.split("/")[Integer.parseInt(levelTypeKey) - 1]; + sysUserVoList = baseMapper.getUserByRole(roleSid, levelOrgSid); + if (sysUserVoList.size() > 1) { + List stringList = sysUserVoList.stream().map(v -> v.getSid()).collect(Collectors.toList()); + List sysUserVoList1 = baseMapper.getUserMessageByRole(roleSid, levelOrgSid, stringList); + sysUserVoList1.removeAll(Collections.singleton(null)); + if (sysUserVoList1.size() > 0) { + sysUserVoList = sysUserVoList1; + } + } + } + sysUserVoList.removeAll(Collections.singleton(null)); + sysUserVoList.forEach(t -> { + t.setOrgSidPath(orgSidPath); + }); + } else { + return rb.setMsg("该角色层级未设置").setData(sysUserVoList); + } + } + } + return rb.success().setData(sysUserVoList); + + } public ResultBean>> getUserByOrgSid(String orgSid, String userSid) { @@ -1417,7 +1454,7 @@ public class SysUserService extends MybatisBaseService { List roleSidList = sysUserRoleService.selectRoleSid(query.getUserSid()); roleSidList.removeAll(Collections.singleton(null)); //查询层级对应的角色权限id - List roleIdList = sysRoleService.selectByRole(roleSidList, menuSid,query.getUserSid()); + List roleIdList = sysRoleService.selectByRole(roleSidList, menuSid, query.getUserSid()); roleIdList.removeAll(Collections.singleton(null)); if (!roleIdList.isEmpty()) { for (int i = 0; i < roleIdList.size(); i++) { @@ -1439,7 +1476,7 @@ public class SysUserService extends MybatisBaseService { List roleSidList = sysUserRoleService.selectRoleSid(query.getUserSid()); roleSidList.removeAll(Collections.singleton(null)); //查询层级对应的角色权限id - List roleSid = sysRoleService.selectByMobileRole(roleSidList, menuSid,query.getUserSid()); + List roleSid = sysRoleService.selectByMobileRole(roleSidList, menuSid, query.getUserSid()); roleSid.removeAll(Collections.singleton(null)); if (!roleSid.isEmpty()) { for (int i = 0; i < roleSid.size(); i++) { diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankFeign.java index f7bc613c1d..d992f0312f 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankFeign.java @@ -113,4 +113,8 @@ public interface LoanFinBankFeign { @ApiOperation("手机端查询资方的列表") @PostMapping("/selectAppFinBankList") public ResultBean> selectAppFinBankList(@RequestBody PagerQuery pq); + + @ApiOperation("产品政策查询资方下拉框") + @GetMapping("/selectListByOrgPath") + ResultBean> selectListByOrgPath(@RequestParam("orgPath") String orgPath); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankFeignFallback.java index 00243bb26c..07fa851598 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankFeignFallback.java @@ -70,4 +70,9 @@ public class LoanFinBankFeignFallback implements LoanFinBankFeign { return ResultBean.fireFail().setMsg("接口anrui-base/basefinbank/selectAppFinBankList无法访问"); } + @Override + public ResultBean> selectListByOrgPath(String orgPath) { + return null; + } + } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBanksVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBanksVo.java new file mode 100644 index 0000000000..7fddbbf7ea --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBanksVo.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.riskcenter.api.loanfinbank; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/7/10 + **/ +@Data +public class LoanFinBanksVo implements Vo { + private static final long serialVersionUID = -2396821681988455147L; + + private String sid; + + private String name; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyDto.java index 641d9890a4..4f2ee019d6 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyDto.java @@ -74,7 +74,7 @@ public class LoanFinPolicyDto implements Dto { @ApiModelProperty("有效期至") private String validDateTo; @ApiModelProperty("是否有其他融：1有，0无") - private int isOtherProduct; + private boolean isOtherProduct; @ApiModelProperty("全组织路径") private String orgPath; @ApiModelProperty("适用销售部门List") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyVo.java index 09b58732dc..48fcd84f9b 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyVo.java @@ -70,7 +70,7 @@ public class LoanFinPolicyVo implements Vo { @ApiModelProperty("有效期至") private String validDateTo; @ApiModelProperty("是否有其他融：1有，0无") - private int isOtherProduct; + private boolean isOtherProduct; @ApiModelProperty("适用销售部门sids(逗号分隔)") private String useDeptSids; @ApiModelProperty("适用销售部门名称(逗号分隔)") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyVos.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyVos.java index cdf2ed9736..f6f47bd413 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyVos.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyVos.java @@ -12,7 +12,7 @@ import lombok.Data; @Data public class LoanFinPolicyVos implements Vo { private static final long serialVersionUID = 7126087240752513932L; - + private String sid; @ApiModelProperty("报备状态") private String filingStateValue; @ApiModelProperty("风控状态") @@ -52,5 +52,5 @@ public class LoanFinPolicyVos implements Vo { @ApiModelProperty("名义/留购价款") private String nominalPrice; @ApiModelProperty("是否有其他融") - private int isOtherProduct; + private boolean isOtherProduct; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankMapper.java index 6b30f9849d..e4461cad7c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankMapper.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBank; import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBankExportVo; import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBankVo; +import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBanksVo; import com.yxt.common.core.result.AppResultData; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -85,4 +86,6 @@ public interface LoanFinBankMapper extends BaseMapper { @Update("update loan_fin_bank set isDelete = 1 where sid =#{sid}") int updateBySidDelete(String sid); + + List selectListByOrgSid(String orgSid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankMapper.xml index aa4885667d..a1d64e383a 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankMapper.xml @@ -51,8 +51,8 @@ + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankRest.java index 8da5242efe..a9c83fbcd3 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankRest.java @@ -1,6 +1,5 @@ package com.yxt.anrui.riskcenter.biz.loanfinbank; -import com.yxt.anrui.base.api.basefinbank.*; import com.yxt.anrui.riskcenter.api.loanfinbank.*; import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.core.query.PagerQuery; @@ -16,8 +15,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; -import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.Map; @@ -171,4 +168,9 @@ public class LoanFinBankRest implements LoanFinBankFeign { PagerVo pv = loanFinBankService.selectAppFinBankList(pq); return rb.success().setData(pv); } + + @Override + public ResultBean> selectListByOrgPath(String orgPath) { + return loanFinBankService.selectListByOrgPath(orgPath); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankService.java index fde5dd6d6d..80b46ff019 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankService.java @@ -5,6 +5,7 @@ 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.riskcenter.api.loanfinbank.*; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -16,6 +17,7 @@ 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; import java.util.Map; @@ -39,6 +41,8 @@ public class LoanFinBankService extends MybatisBaseService listPage(PagerQuery pq) { LoanFinBankQuery query = pq.getParams(); @@ -210,4 +214,12 @@ public class LoanFinBankService extends MybatisBaseService> selectListByOrgPath(String orgPath) { + ResultBean> rb = ResultBean.fireFail(); + String orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + List list = baseMapper.selectListByOrgSid(orgSid); + list.removeAll(Collections.singleton(null)); + return rb.success().setData(list); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml index 6804560fa5..02aebb2d54 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml @@ -2,7 +2,39 @@