DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、添加公司员工管理关联系统用户表

Browse Source 
2、添加项目延期字段，缺乏逻辑开发
3、完成库存管理ui开发
4、创建task后针对于个人的任务安排数据库work表，将在下次迭代后完成三表联查业务逻辑完善
5、添加库存管理的模板下载、excl整流后批量导入
混淆项1、work的时间粒度到人|任务 2、已分配任务员工是否在分配任务页面显示
This commit is contained in:
86156
2024-11-03 17:07:07 +08:00
parent 256952f0cb
commit 36a60d2f02
13 changed files with 786 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
View File

@@ -92,4 +92,6 @@ public interface SysUserMapper extends BaseMapperPlus<SysUserMapper, SysUser, Sy
*/
SysUser selectUserById(Long userId);
}

10
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
View File

@@ -24,6 +24,16 @@ public interface ISysUserService {
*/
List<SysUser> selectUserList(SysUser user);
/**
* 根据条件分页查询用户列表
*
* @param user 用户信息
* @return 用户信息集合信息
*/
TableDataInfo<SysUser> selectUserListByRoleId(SysUser user,PageQuery pageQuery);
/**
* 根据条件分页查询已分配用户角色列表
*

10
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
View File

@@ -71,7 +71,15 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
return baseMapper.selectUserList(this.buildQueryWrapper(user));
}
private Wrapper<SysUser> buildQueryWrapper(SysUser user) {
@Override
public TableDataInfo<SysUser> selectUserListByRoleId(SysUser user, PageQuery pageQuery) {
QueryWrapper<SysUser> sysUserWrapper = this.buildQueryWrapper(user);
sysUserWrapper.eq("sr.role_id", 1852970465740505090L);
Page<SysUser> page = baseMapper.selectPageUserList(pageQuery.build(), sysUserWrapper);
return TableDataInfo.build(page);
}
private QueryWrapper<SysUser> buildQueryWrapper(SysUser user) {
Map<String, Object> params = user.getParams();
QueryWrapper<SysUser> wrapper = Wrappers.query();
wrapper.eq("u.del_flag", UserConstants.USER_NORMAL)

11
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@@ -24,6 +24,9 @@
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="remark" column="remark"/>
<result property="idCard" column="id_card"/>
<result property="bankCard" column="bank_card"/>
<result property="laborCost" column="labor_cost"/>
<association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult"/>
<collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
</resultMap>
@@ -85,10 +88,12 @@
</sql>
<select id="selectPageUserList" resultMap="SysUserResult">
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
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,u.id_card,u.bank_card,u.labor_cost,
u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader,sr.role_id,sr.role_name
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role sur on sur.user_id = u.user_id
left join sys_role sr on sr.role_id = sur.role_id
${ew.getCustomSqlSegment}
</select>
@@ -139,4 +144,6 @@
</select>
</mapper>