From bdc813000e664551818c910917a9e23f8f58fdb8 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 21 Jun 2022 17:50:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=20=E6=8C=89=E9=92=AE=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=20=E6=98=AF=E5=90=A6=E7=A6=81=E7=94=A8?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/company/dto/CompListDTO.java | 2 +- .../department/dto/DepartmentListDTO.java | 2 +- .../entity/job/dto/JobListDTO.java | 2 +- .../entity/postion/vo/PostInfoTableVO.java | 2 +- .../entity/scheme/vo/GradeTableVO.java | 2 +- .../entity/scheme/vo/LevelTableVO.java | 2 +- .../entity/scheme/vo/SchemeTableVO.java | 2 +- .../entity/sequence/vo/SequenceTableVO.java | 2 +- .../service/HrmResourceService.java | 15 +++++++ .../service/impl/HrmResourceServiceImpl.java | 45 +++++++++++++++++++ .../web/HrmResourceController.java | 39 ++++++++++++++++ .../wrapper/HrmResourceWrapper.java | 8 ++++ 12 files changed, 115 insertions(+), 8 deletions(-) diff --git a/src/com/engine/organization/entity/company/dto/CompListDTO.java b/src/com/engine/organization/entity/company/dto/CompListDTO.java index 1e630d21..5e13182b 100644 --- a/src/com/engine/organization/entity/company/dto/CompListDTO.java +++ b/src/com/engine/organization/entity/company/dto/CompListDTO.java @@ -82,7 +82,7 @@ public class CompListDTO { /** * 禁用标记 */ - @TableTitle(title = "禁用标记", dataIndex = "forbiddenTag", key = "forbiddenTag") + @TableTitle(title = "是否启用", dataIndex = "forbiddenTag", key = "forbiddenTag") private int forbiddenTag; /** diff --git a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java index b7c24e29..301470cf 100644 --- a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java +++ b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java @@ -91,7 +91,7 @@ public class DepartmentListDTO { /** * 禁用标记 */ - @TableTitle(title = "禁用标记", dataIndex = "forbiddenTag", key = "forbiddenTag") + @TableTitle(title = "是否启用", dataIndex = "forbiddenTag", key = "forbiddenTag") private int forbiddenTag; /** * 操作列 diff --git a/src/com/engine/organization/entity/job/dto/JobListDTO.java b/src/com/engine/organization/entity/job/dto/JobListDTO.java index 28b7c573..676f22f6 100644 --- a/src/com/engine/organization/entity/job/dto/JobListDTO.java +++ b/src/com/engine/organization/entity/job/dto/JobListDTO.java @@ -85,7 +85,7 @@ public class JobListDTO { /** * 禁用标记 */ - @TableTitle(title = "禁用标记", dataIndex = "forbiddenTag", key = "forbiddenTag") + @TableTitle(title = "是否启用", dataIndex = "forbiddenTag", key = "forbiddenTag") private Integer forbiddenTag; /** diff --git a/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java b/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java index 58bd87d5..b84dc5f3 100644 --- a/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java +++ b/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java @@ -81,6 +81,6 @@ public class PostInfoTableVO { /** * 禁用标记 */ - @OrganizationTableColumn(text = "禁用标记", width = "20%", column = "forbidden_tag") + @OrganizationTableColumn(text = "是否启用", width = "20%", column = "forbidden_tag") private Integer forbiddenTag; } diff --git a/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java b/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java index ef037941..6a36d9db 100644 --- a/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java +++ b/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java @@ -82,6 +82,6 @@ public class GradeTableVO { /** * 禁用标记 */ - @OrganizationTableColumn(text = "禁用标记", width = "20%", column = "forbidden_tag") + @OrganizationTableColumn(text = "是否启用", width = "20%", column = "forbidden_tag") private int forbiddenTag; } diff --git a/src/com/engine/organization/entity/scheme/vo/LevelTableVO.java b/src/com/engine/organization/entity/scheme/vo/LevelTableVO.java index f33db78a..1f05775d 100644 --- a/src/com/engine/organization/entity/scheme/vo/LevelTableVO.java +++ b/src/com/engine/organization/entity/scheme/vo/LevelTableVO.java @@ -73,6 +73,6 @@ public class LevelTableVO { /** * 禁用标记 */ - @OrganizationTableColumn(text = "禁用标记", width = "20%", column = "forbidden_tag") + @OrganizationTableColumn(text = "是否启用", width = "20%", column = "forbidden_tag") private Integer forbiddenTag; } diff --git a/src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java b/src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java index ed40b29c..f17e3f26 100644 --- a/src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java +++ b/src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java @@ -66,6 +66,6 @@ public class SchemeTableVO { /** * 禁用标识 */ - @OrganizationTableColumn(text = "禁用标记", width = "25%", column = "forbidden_tag") + @OrganizationTableColumn(text = "是否启用", width = "25%", column = "forbidden_tag") private Integer forbiddenTag; } diff --git a/src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java b/src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java index b061d363..c4c4e0e9 100644 --- a/src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java +++ b/src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java @@ -79,6 +79,6 @@ public class SequenceTableVO { /** * 禁用标记 */ - @OrganizationTableColumn(text = "禁用标记", width = "20%", column = "forbidden_tag") + @OrganizationTableColumn(text = "是否启用", width = "20%", column = "forbidden_tag") private Integer forbiddenTag; } diff --git a/src/com/engine/organization/service/HrmResourceService.java b/src/com/engine/organization/service/HrmResourceService.java index 7d1f6c48..9afee6ed 100644 --- a/src/com/engine/organization/service/HrmResourceService.java +++ b/src/com/engine/organization/service/HrmResourceService.java @@ -58,4 +58,19 @@ public interface HrmResourceService { * @return */ int updateForm(Map params); + + /** + * 获取搜索条件 + * + * @param params + * @return + */ + Map getSearchCondition(Map params); + + /** + * 获取列表页面按钮信息 + * + * @return + */ + Map getHasRight(); } diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index 35d6631c..e1cbc1ff 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -1,6 +1,7 @@ package com.engine.organization.service.impl; import com.api.browser.bean.SearchConditionGroup; +import com.api.browser.bean.SearchConditionItem; import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; @@ -23,7 +24,9 @@ import com.engine.organization.mapper.extend.ExtendTitleMapper; import com.engine.organization.mapper.job.JobMapper; import com.engine.organization.service.ExtService; import com.engine.organization.service.HrmResourceService; +import com.engine.organization.util.MenuBtn; import com.engine.organization.util.OrganizationAssert; +import com.engine.organization.util.OrganizationFormItemUtil; import com.engine.organization.util.db.DBType; import com.engine.organization.util.db.MapperProxyFactory; import com.engine.organization.util.tree.SearchTreeUtil; @@ -197,6 +200,48 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic return updateCount; } + @Override + public Map getSearchCondition(Map params) { + Map apiDatas = new HashMap<>(); + List addGroups = new ArrayList<>(); + List conditionItems = new ArrayList<>(); + SearchConditionItem lastNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "姓名", "lastName"); + SearchConditionItem managerIdItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "直接上级", "managerId"); + SearchConditionItem companyIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "分部", "161", "companyId", "compBrowser"); + SearchConditionItem departmentIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "部门", "161", "departmentId", "deptBrowser"); + SearchConditionItem telephoneItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "办公电话", "telephone"); + SearchConditionItem mobileItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "移动电话", "mobile"); + SearchConditionItem mobileCallItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "其他电话", "mobileCall"); + SearchConditionItem jobTitleItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "岗位", "161", "jobTitle", "jobBrowser"); + + conditionItems.add(lastNameItem); + conditionItems.add(managerIdItem); + conditionItems.add(companyIdItem); + conditionItems.add(departmentIdItem); + conditionItems.add(telephoneItem); + conditionItems.add(mobileItem); + conditionItems.add(mobileCallItem); + conditionItems.add(jobTitleItem); + + addGroups.add(new SearchConditionGroup("高级搜索条件", true, conditionItems)); + apiDatas.put("conditions", addGroups); + return apiDatas; + } + + @Override + public Map getHasRight() { + Map btnDatas = new HashMap<>(); + ArrayList topMenuList = new ArrayList<>(); + ArrayList rightMenuList = new ArrayList<>(); + // 新建人员 + topMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName("新建人员").type("BTN_Addnew").build()); + btnDatas.put("topMenu", topMenuList); + // 新建人员 + rightMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName("新建人员").type("BTN_Addnew").build()); + btnDatas.put("rightMenu", rightMenuList); + return btnDatas; + } + /** * 查询条件 * diff --git a/src/com/engine/organization/web/HrmResourceController.java b/src/com/engine/organization/web/HrmResourceController.java index af961909..b3c5e9ac 100644 --- a/src/com/engine/organization/web/HrmResourceController.java +++ b/src/com/engine/organization/web/HrmResourceController.java @@ -148,4 +148,43 @@ public class HrmResourceController { return ReturnResult.exceptionHandle(e.getMessage()); } } + + /** + * 高级搜索条件 + * + * @param request + * @param response + * @return + */ + @GET + @Path("/getSearchCondition") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult getSearchCondition(@Context HttpServletRequest request, @Context HttpServletResponse response) { + try { + User user = HrmUserVarify.getUser(request, response); + Map map = ParamUtil.request2Map(request); + return ReturnResult.successed(getHrmResourceWrapper(user).getSearchCondition(map)); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } + + /** + * 列表页顶部按钮 + * + * @param request + * @param response + * @return + */ + @GET + @Path("/getHasRight") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) { + try { + User user = HrmUserVarify.getUser(request, response); + return ReturnResult.successed(getHrmResourceWrapper(user).getHasRight()); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } } diff --git a/src/com/engine/organization/wrapper/HrmResourceWrapper.java b/src/com/engine/organization/wrapper/HrmResourceWrapper.java index 61a9c72f..938e8344 100644 --- a/src/com/engine/organization/wrapper/HrmResourceWrapper.java +++ b/src/com/engine/organization/wrapper/HrmResourceWrapper.java @@ -44,4 +44,12 @@ public class HrmResourceWrapper extends Service { public int updateForm(Map params) { return getHrmResourceService(user).updateForm(params); } + + public Map getSearchCondition(Map params) { + return getHrmResourceService(user).getSearchCondition(params); + } + + public Map getHasRight() { + return getHrmResourceService(user).getHasRight(); + } }