From b53007b7c2f921f0fda1d818982976dbe74f4736 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 28 Dec 2022 15:40:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=80=E5=8E=86=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/hrmresource/bo/ResourceBO.java | 4 ++-- .../impl/PersonnelResumeServiceImpl.java | 20 +++++++++---------- .../web/PersonnelResumeController.java | 15 +++++--------- 3 files changed, 17 insertions(+), 22 deletions(-) diff --git a/src/com/engine/organization/entity/hrmresource/bo/ResourceBO.java b/src/com/engine/organization/entity/hrmresource/bo/ResourceBO.java index d7ad29e0..016f65e7 100644 --- a/src/com/engine/organization/entity/hrmresource/bo/ResourceBO.java +++ b/src/com/engine/organization/entity/hrmresource/bo/ResourceBO.java @@ -18,8 +18,8 @@ public class ResourceBO { return builderJobs.stream().map(item -> { SearchTree tree = new SearchTree(); tree.setCanClick(true); - tree.setCanceled(true); - tree.setIcon("icon-coms-content-o"); + tree.setCanceled(false); + tree.setIcon("icon-coms-currency-Customer"); tree.setId(item.getId().toString()); tree.setIsParent(false); tree.setIsVirtual("0"); diff --git a/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java b/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java index a396cc8b..192e0a75 100644 --- a/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java +++ b/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java @@ -59,7 +59,7 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu String keyword = params.getKeyword(); String id = params.getId(); String type = Util.null2String(params.getType()); - List treeList = getFilterCompany(id, type, keyword); + List treeList = getFilterDatas(id, type, keyword); return SearchTreeUtil.getSearchTree(type, treeList); } @@ -70,23 +70,23 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu ArrayList topMenuList = new ArrayList<>(); ArrayList rightMenuList = new ArrayList<>(); // 新增 - topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("screening").menuIcon("icon-coms-New-Flow").menuName("人员筛选").type("BTN_Screening").build()); - topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("currentExport").menuIcon("icon-coms-edit").menuName("导出当前").type("BTN_CurrentExport").build()); - topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("MergeExport").menuIcon("icon-coms-Delete").menuName("全部导出（合并）").type("BTN_MergeExport").build()); - topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("AllExport").menuIcon("icon-coms-Delete").menuName("全部导出").type("BTN_AllExport").build()); + topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("screening").menuIcon("icon-coms-man").menuName("人员筛选").type("BTN_Screening").build()); + topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("currentExport").menuIcon("icon-coms-export").menuName("导出当前").type("BTN_CurrentExport").build()); + topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("MergeExport").menuIcon("icon-coms02-coms2-Batch-export").menuName("全部导出（合并）").type("BTN_MergeExport").build()); + topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("AllExport").menuIcon("icon-coms02-coms2-export").menuName("全部导出").type("BTN_AllExport").build()); resultMap.put("topMenu", topMenuList); // 新增 - rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("screening").menuIcon("icon-coms-New-Flow").menuName("人员筛选").type("BTN_Screening").build()); - rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("currentExport").menuIcon("icon-coms-edit").menuName("导出当前").type("BTN_CurrentExport").build()); - rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("MergeExport").menuIcon("icon-coms-Delete").menuName("全部导出（合并）").type("BTN_MergeExport").build()); - rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("AllExport").menuIcon("icon-coms-Delete").menuName("全部导出").type("BTN_AllExport").build()); + rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("screening").menuIcon("icon-coms-man").menuName("人员筛选").type("BTN_Screening").build()); + rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("currentExport").menuIcon("icon-coms-export").menuName("导出当前").type("BTN_CurrentExport").build()); + rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("MergeExport").menuIcon("icon-coms02-coms2-Batch-export").menuName("全部导出（合并）").type("BTN_MergeExport").build()); + rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("AllExport").menuIcon("icon-coms02-coms2-export").menuName("全部导出").type("BTN_AllExport").build()); resultMap.put("rightMenu", rightMenuList); return resultMap; } - public List getFilterCompany(String id, String type, String keyword) { + public List getFilterDatas(String id, String type, String keyword) { List searchTree = new ArrayList<>(); // 通过分部、公司 组装数据 if (StringUtil.isEmpty(id) || ModuleTypeEnum.subcompanyfielddefined.getValue().toString().equals(type)) { diff --git a/src/com/engine/organization/web/PersonnelResumeController.java b/src/com/engine/organization/web/PersonnelResumeController.java index 50e641f0..d3fe3002 100644 --- a/src/com/engine/organization/web/PersonnelResumeController.java +++ b/src/com/engine/organization/web/PersonnelResumeController.java @@ -39,16 +39,11 @@ public class PersonnelResumeController { @GET @Path("/getSearchTree") @Produces(MediaType.APPLICATION_JSON) - public ReturnResult getSearchTree(@Context HttpServletRequest request, @Context HttpServletResponse response) { - try { - User user = HrmUserVarify.getUser(request, response); - Map map = ParamUtil.request2Map(request); - SearchTreeParams params = JSONObject.toJavaObject((JSON) JSONObject.toJSON(map), SearchTreeParams.class); - return ReturnResult.successed(getPersonnelResumeWrapper(user).getSearchTree(params)); - } catch (Exception e) { - return ReturnResult.exceptionHandle(e); - } - + public Map getSearchTree(@Context HttpServletRequest request, @Context HttpServletResponse response) { + User user = HrmUserVarify.getUser(request, response); + Map map = ParamUtil.request2Map(request); + SearchTreeParams params = JSONObject.toJavaObject((JSON) JSONObject.toJSON(map), SearchTreeParams.class); + return getPersonnelResumeWrapper(user).getSearchTree(params); } @GET