!111 人员管理查询条件 按钮接口， 是否禁用名称更改

Merge pull request !111 from dxfeng/feature/dxf

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;
 
     /**

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;
     /**
      * 操作列

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;
 
     /**

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;
 }

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;
 }

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;
 }

src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java

@@ -67,6 +67,6 @@ public class SchemeTableVO {
     /**
      * 禁用标识
      */
-    @OrganizationTableColumn(text = "禁用标记", width = "25%", column = "forbidden_tag")
+    @OrganizationTableColumn(text = "是否启用", width = "25%", column = "forbidden_tag")
     private Integer forbiddenTag;
 }

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;
 }

src/com/engine/organization/service/HrmResourceService.java

@@ -58,4 +58,19 @@ public interface HrmResourceService {
      * @return
      */
     int updateForm(Map<String, Object> params);
+
+    /**
+     * 获取搜索条件
+     *
+     * @param params
+     * @return
+     */
+    Map<String, Object> getSearchCondition(Map<String, Object> params);
+
+    /**
+     * 获取列表页面按钮信息
+     *
+     * @return
+     */
+    Map<String, Object> getHasRight();
 }

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<String, Object> getSearchCondition(Map<String, Object> params) {
+        Map<String, Object> apiDatas = new HashMap<>();
+        List<SearchConditionGroup> addGroups = new ArrayList<>();
+        List<SearchConditionItem> 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<String, Object> getHasRight() {
+        Map<String, Object> btnDatas = new HashMap<>();
+        ArrayList<MenuBtn> topMenuList = new ArrayList<>();
+        ArrayList<MenuBtn> 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;
+    }
+
     /**
      * 查询条件
      *

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<String, Object> 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());
+        }
+    }
 }

src/com/engine/organization/wrapper/HrmResourceWrapper.java

@@ -44,4 +44,12 @@ public class HrmResourceWrapper extends Service {
     public int updateForm(Map<String, Object> params) {
         return getHrmResourceService(user).updateForm(params);
     }
+
+    public Map<String, Object> getSearchCondition(Map<String, Object> params) {
+        return getHrmResourceService(user).getSearchCondition(params);
+    }
+
+    public Map<String, Object> getHasRight() {
+        return getHrmResourceService(user).getHasRight();
+    }
 }