新增部门和公司的查询

security-protection-service/src/main/java/com/ai/bss/security/protection/controller/EmployeeManagementController.java

@@ -1,17 +1,22 @@
package com.ai.bss.security.protection.controller;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.person.model.Organization;
import com.ai.bss.security.protection.service.interfaces.EmployeeManagementService;
import com.ai.bss.security.protection.utils.EbcConstant;
import com.ai.bss.user.dto.EmployeeDto;
import com.ai.bss.user.dto.UserDto;
@@ -22,67 +27,113 @@ import com.ai.bss.user.dto.UserDto;
@RequestMapping("/employeeManagement")
public class EmployeeManagementController {
    @Autowired
    private EmployeeManagementService employeeManagementService;
	@Autowired
	private EmployeeManagementService employeeManagementService;
    /**
     * 分页查询用户信息
     */
    @ResponseBody
    @RequestMapping("/queryWorkEmployee")
    public CommonResponse<PageBean<UserDto>> queryWorkEmployee(@RequestBody CommonRequest<UserDto> request) throws Exception {
	/**
	 * 分页查询用户信息
	 */
	@ResponseBody
	@RequestMapping("/queryWorkEmployee")
	public CommonResponse<PageBean<UserDto>> queryWorkEmployee(@RequestBody CommonRequest<UserDto> request)
			throws Exception {
		/*UserDto userDto = new UserDto();
		userDto.setOrgId(params.get("orgId"));
		userDto.setCode(params.get("code"));
		userDto.setName(params.get("name"));
		// TODO 组织编码
		userDto.setOrgCode("0000");
		
		// 当前页数
		int pageNumber  = Integer.parseInt(params.get("pageNumber"));
		// 每页条数
		int pageSize = Integer.parseInt(params.get("pageSize"));
		
		CommonRequest<UserDto> request=new CommonRequest<UserDto>(userDto, pageNumber, pageSize);
*/
        //CommonRequest<UserDto> request = CommonRequest.<UserDto>builder().data(userDto).pageNumber(pageNum).pageSize(pageSize).build();
        return employeeManagementService.queryWorkEmployee(request);
    }
    /**
     * 增加用户信息
     */
    @ResponseBody
    @RequestMapping("/createWorkEmployee")
    public CommonResponse<Void> createWorkEmployee(@RequestBody EmployeeDto employeeDto) throws Exception {
        return employeeManagementService.createWorkEmployee(employeeDto);
    }
    /**
     * 删除用户信息
     */
    @ResponseBody
    @RequestMapping("/deleteWorkEmployee")
    public CommonResponse<Void> deleteWorkEmployee(@RequestBody Map<String, String> params) throws Exception {
        if (params == null || params.get("ids") == null || "".equals(params.get("ids"))) {
            return CommonResponse.fail("500", "删除失败");
        }
        return employeeManagementService.deleteWorkEmployee(params);
    }
    /**
     * 修改用户信息
     */
    @ResponseBody
    @RequestMapping("/modifyWorkEmployee")
    public CommonResponse<Void> modifyWorkEmployee(@RequestBody EmployeeDto employeeDto) throws Exception {
        if (employeeDto == null || employeeDto.getId() == null || "".equals(employeeDto.getId())) {
            return CommonResponse.fail("500", "修改失败");
        }
        return employeeManagementService.modifyWorkEmployee(employeeDto);
    }
		*/
		// CommonRequest<UserDto> request = CommonRequest.<UserDto>builder().data(userDto).pageNumber(pageNum).pageSize(pageSize).build();
		return employeeManagementService.queryWorkEmployee(request);
	}
	/**
	 * 增加用户信息
	 */
	@ResponseBody
	@RequestMapping("/createWorkEmployee")
	public CommonResponse<Void> createWorkEmployee(@RequestBody EmployeeDto employeeDto) throws Exception {
		return employeeManagementService.createWorkEmployee(employeeDto);
	}
	/**
	 * 删除用户信息
	 */
	@ResponseBody
	@RequestMapping("/deleteWorkEmployee")
	public CommonResponse<Void> deleteWorkEmployee(@RequestBody Map<String, String> params) throws Exception {
		if (params == null || params.get("ids") == null || "".equals(params.get("ids"))) {
			return CommonResponse.fail("500", "删除失败");
		}
		return employeeManagementService.deleteWorkEmployee(params);
	}
	/**
	 * 修改用户信息
	 */
	@ResponseBody
	@RequestMapping("/modifyWorkEmployee")
	public CommonResponse<Void> modifyWorkEmployee(@RequestBody EmployeeDto employeeDto) throws Exception {
		if (employeeDto == null || employeeDto.getId() == null || "".equals(employeeDto.getId())) {
			return CommonResponse.fail("500", "修改失败");
		}
		return employeeManagementService.modifyWorkEmployee(employeeDto);
	}
	/**
	 * 查询公司列表
	 * 部门的根节点为集团，集团的下一级为公司，公司的下一级为部门
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryCompanyList")
	public CommonResponse<List<Organization>> queryCompanyList() throws Exception {
		return employeeManagementService.queryChildOrgById(EbcConstant.ORGANIZE_ROOT_ID);
	}
	/**
	 * 根据部门ID查询子部门列表
	 * @param orgId
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryChildOrgById")
	public CommonResponse<List<Organization>> queryChildOrgById(@RequestParam(required = false) Long orgId)
			throws Exception {
		if (orgId == null || orgId < 0) {
			return CommonResponse.ok(new ArrayList<Organization>());
		}
		return employeeManagementService.queryChildOrgById(orgId);
	}
	/**
	 * 根据部门ID查询下级及下下级部门列表
	 * @param orgId
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryCycleChildOrg")
	public CommonResponse<List<Organization>> queryCycleChildOrg(@RequestParam(required = false) Long orgId)
			throws Exception {
		if (orgId == null || orgId < 0) {
			return CommonResponse.ok(new ArrayList<Organization>());
		}
		return employeeManagementService.queryCycleChildOrg(orgId);
	}
}

security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/EmployeeManagementServiceImpl.java

@@ -77,4 +77,16 @@ public class EmployeeManagementServiceImpl implements EmployeeManagementService
		return employeeService.modifyEmployee(request);
	}
	@Override
	public CommonResponse<List<Organization>> queryChildOrgById(Long orgId) {
		CommonRequest<Long> organize=new CommonRequest<Long>(orgId);
		return organizationQuery.querySubOrgByOrgId(organize);
	}
	@Override
	public CommonResponse<List<Organization>> queryCycleChildOrg(Long orgId) {
		CommonRequest<Long> organize=new CommonRequest<Long>(orgId);
		return organizationQuery.queryAllSubOrgByOrgId(organize);
	}
}

security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/EmployeeManagementService.java

@@ -3,6 +3,8 @@ package com.ai.bss.security.protection.service.interfaces;
import java.util.List;
import java.util.Map;
import org.springframework.web.bind.annotation.RequestParam;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
@@ -44,4 +46,19 @@ public interface EmployeeManagementService {
	 */
	CommonResponse<Void> modifyWorkEmployee(EmployeeDto employeeDto);
	/**
	 * 根据部门ID查询子部门列表
	 * @param orgId
	 * @return
	 */
	CommonResponse<List<Organization>> queryChildOrgById(Long orgId);
	
	/**
	 * 根据部门ID查询下级及下下级部门列表
	 * @param orgId
	 * @return
	 */
	CommonResponse<List<Organization>> queryCycleChildOrg(Long orgId);
	
	
}

security-protection-service/src/main/java/com/ai/bss/security/protection/utils/EbcConstant.java

@@ -12,6 +12,9 @@ public class EbcConstant {
	// 每页默认查询条数
	public static final int DEFAULT_PAGE_SIZE = 20;
	// 部门列表的根节点(部门的根节点为集团，集团的下一级为公司，公司的下一级为部门)
	public static final Long ORGANIZE_ROOT_ID=1L;
	
	// 异常考勤查询常量异常取值 abnormal，
	public static final String ATTENDANCE_STATUSTYPE_ABNORMAL = "ABNORMAL";