Commit 718fb005 authored by 周昊's avatar 周昊

1、开发接口获取项目下的人员

parent b27bc19a
...@@ -9,6 +9,7 @@ import com.censoft.censoftrongtong.service.IRiskPlanService; ...@@ -9,6 +9,7 @@ import com.censoft.censoftrongtong.service.IRiskPlanService;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
...@@ -58,6 +59,17 @@ public class RiskPlanAppController extends BaseController { ...@@ -58,6 +59,17 @@ public class RiskPlanAppController extends BaseController {
return R.ok(ledgerBuildingService.getBuildingListByProjectId(projectId)); return R.ok(ledgerBuildingService.getBuildingListByProjectId(projectId));
} }
/**
* 获取项目下的人员
*
* @param projectId 项目id
* @real_return {@link R<List<SysUser>>}
*/
@GetMapping("/user/list/{projectId}")
public R<List<SysUser>> getUserListByProjectId(@PathVariable Long projectId){
return R.ok(ledgerProjectService.getUserListByProjectId(projectId));
}
/** /**
* 保存计划 * 保存计划
* *
......
package com.censoft.censoftrongtong.service; package com.censoft.censoftrongtong.service;
import com.censoft.censoftrongtong.domain.LedgerProject; import com.censoft.censoftrongtong.domain.LedgerProject;
import com.ruoyi.common.core.domain.entity.SysUser;
import java.util.List; import java.util.List;
...@@ -67,4 +68,12 @@ public interface ILedgerProjectService ...@@ -67,4 +68,12 @@ public interface ILedgerProjectService
* @return 基础数据-项目集合 * @return 基础数据-项目集合
*/ */
public List<LedgerProject> getProjectListByDeptId(LedgerProject ledgerProject); public List<LedgerProject> getProjectListByDeptId(LedgerProject ledgerProject);
/**
* 获取项目所在部门下的所有人员
*
* @param projectId 项目id
* @return 人员list
*/
public List<SysUser> getUserListByProjectId(Long projectId);
} }
...@@ -6,10 +6,14 @@ import com.censoft.censoftrongtong.domain.LedgerProject; ...@@ -6,10 +6,14 @@ import com.censoft.censoftrongtong.domain.LedgerProject;
import com.censoft.censoftrongtong.mapper.LedgerProjectMapper; import com.censoft.censoftrongtong.mapper.LedgerProjectMapper;
import com.censoft.censoftrongtong.service.ILedgerProjectService; import com.censoft.censoftrongtong.service.ILedgerProjectService;
import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource;
/** /**
* 基础数据-项目Service业务层处理 * 基础数据-项目Service业务层处理
* *
...@@ -22,6 +26,9 @@ public class LedgerProjectServiceImpl implements ILedgerProjectService ...@@ -22,6 +26,9 @@ public class LedgerProjectServiceImpl implements ILedgerProjectService
@Autowired @Autowired
private LedgerProjectMapper ledgerProjectMapper; private LedgerProjectMapper ledgerProjectMapper;
@Resource
private ISysUserService userService;
/** /**
* 查询基础数据-项目 * 查询基础数据-项目
* *
...@@ -100,4 +107,10 @@ public class LedgerProjectServiceImpl implements ILedgerProjectService ...@@ -100,4 +107,10 @@ public class LedgerProjectServiceImpl implements ILedgerProjectService
public List<LedgerProject> getProjectListByDeptId(LedgerProject ledgerProject) { public List<LedgerProject> getProjectListByDeptId(LedgerProject ledgerProject) {
return ledgerProjectMapper.getProjectListByDeptId(ledgerProject); return ledgerProjectMapper.getProjectListByDeptId(ledgerProject);
} }
@Override
public List<SysUser> getUserListByProjectId(Long projectId) {
LedgerProject ledgerProject = selectLedgerProjectById(projectId);
return userService.getListByDeptIdUnder(ledgerProject.getDeptId());
}
} }
...@@ -124,4 +124,6 @@ public interface SysUserMapper ...@@ -124,4 +124,6 @@ public interface SysUserMapper
* @return 结果 * @return 结果
*/ */
public SysUser checkEmailUnique(String email); public SysUser checkEmailUnique(String email);
List<SysUser> getListByDeptIdUnder(@Param("deptId") Long deptId);
} }
...@@ -203,4 +203,12 @@ public interface ISysUserService ...@@ -203,4 +203,12 @@ public interface ISysUserService
* @return 结果 * @return 结果
*/ */
public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName); public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
/**
* 获取部门及以下的人员
*
* @param deptId 部门id
* @return 用户信息集合信息
*/
List<SysUser> getListByDeptIdUnder(Long deptId);
} }
...@@ -541,4 +541,9 @@ public class SysUserServiceImpl implements ISysUserService ...@@ -541,4 +541,9 @@ public class SysUserServiceImpl implements ISysUserService
} }
return successMsg.toString(); return successMsg.toString();
} }
@Override
public List<SysUser> getListByDeptIdUnder(Long deptId) {
return userMapper.getListByDeptIdUnder(deptId);
}
} }
...@@ -141,8 +141,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -141,8 +141,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult"> <select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1 select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
</select> </select>
<select id="getListByDeptIdUnder" resultMap="SysUserResult">
<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId"> SELECT
u.user_id,
u.dept_id,
u.nick_name,
u.user_name,
u.email,
u.avatar,
u.phonenumber,
u.sex,
u.STATUS,
u.del_flag,
u.login_ip,
u.login_date,
u.create_by,
u.create_time,
u.remark,
d.dept_name,
d.leader
FROM
sys_user u
LEFT JOIN sys_dept d ON u.dept_id = d.dept_id
WHERE
u.del_flag = '0'
AND ( u.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = #{deptId} OR find_in_set( #{deptId}, ancestors ) ) )
</select>
<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
insert into sys_user( insert into sys_user(
<if test="userId != null and userId != 0">user_id,</if> <if test="userId != null and userId != 0">user_id,</if>
<if test="deptId != null and deptId != 0">dept_id,</if> <if test="deptId != null and deptId != 0">dept_id,</if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment