Commit 4003553c authored by mx's avatar mx

员工管理

parent bd9a946e
...@@ -11,11 +11,12 @@ import org.rcisoft.core.model.CyPageInfo; ...@@ -11,11 +11,12 @@ import org.rcisoft.core.model.CyPageInfo;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import java.math.BigInteger;
import java.util.List; import java.util.List;
/** /**
* Created with cy on 2022年11月18日 上午9:03:23. * Created with cy on 2022年11月18日 上午9:03:23.
*/ */
@Mapper @Mapper
public interface SysDeptRepositorys extends CyBaseMapper<SysDept> { public interface SysDeptRepositorys extends CyBaseMapper<SysDept> {
...@@ -24,11 +25,13 @@ public interface SysDeptRepositorys extends CyBaseMapper<SysDept> { ...@@ -24,11 +25,13 @@ public interface SysDeptRepositorys extends CyBaseMapper<SysDept> {
/** /**
* 分页查询 sysDept * 分页查询 sysDept
*
*/ */
IPage<SysDept> querySysDeptsPaged(CyPageInfo cyPageInfo,@Param("entity") SysDept sysDept); IPage<SysDept> querySysDeptsPaged(CyPageInfo cyPageInfo, @Param("entity") SysDept sysDept);
//查询部门 //查询部门
List<SysUser> queryDept(SysUser sysUser); List<SysUser> queryDept(SysUser sysUser);
//根据id查询部门
List<SysDept> queryDeptById(BigInteger deptId);
} }
...@@ -30,5 +30,8 @@ public interface SysDictDataRepositorys extends CyBaseMapper<SysDictData> { ...@@ -30,5 +30,8 @@ public interface SysDictDataRepositorys extends CyBaseMapper<SysDictData> {
//查询字典 //查询字典
List<SysUser> queryData(SysUser sysUser); List<SysUser> queryData(SysUser sysUser);
//根据职位id查询职位字典
List<SysDictData> queryDataByPosition(String position);
} }
...@@ -22,6 +22,14 @@ import java.util.List; ...@@ -22,6 +22,14 @@ import java.util.List;
@TableName("sys_user") @TableName("sys_user")
public class SysUser extends CyIdIncreEntity<SysUser> { public class SysUser extends CyIdIncreEntity<SysUser> {
//职位中文名
@Transient
private String dictLabel;
//部门名称
@Transient
private String deptName;
//排序 //排序
@Transient @Transient
private String px; private String px;
......
...@@ -8,6 +8,7 @@ import org.rcisoft.core.model.CyPersistModel; ...@@ -8,6 +8,7 @@ import org.rcisoft.core.model.CyPersistModel;
import org.rcisoft.sys.sysuser.dao.SysDeptRepositorys; import org.rcisoft.sys.sysuser.dao.SysDeptRepositorys;
import org.rcisoft.sys.sysuser.dao.SysDictDataRepositorys; import org.rcisoft.sys.sysuser.dao.SysDictDataRepositorys;
import org.rcisoft.sys.sysuser.dao.SysUserRepositorys; import org.rcisoft.sys.sysuser.dao.SysUserRepositorys;
import org.rcisoft.sys.sysuser.entity.SysDept;
import org.rcisoft.sys.sysuser.entity.SysDictData; import org.rcisoft.sys.sysuser.entity.SysDictData;
import org.rcisoft.sys.sysuser.entity.SysUser; import org.rcisoft.sys.sysuser.entity.SysUser;
import org.rcisoft.sys.sysuser.service.SysUserService; import org.rcisoft.sys.sysuser.service.SysUserService;
...@@ -18,6 +19,7 @@ import org.springframework.transaction.annotation.Propagation; ...@@ -18,6 +19,7 @@ import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.rcisoft.core.model.CyPageInfo; import org.rcisoft.core.model.CyPageInfo;
import java.math.BigInteger;
import java.util.List; import java.util.List;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -116,9 +118,28 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser> ...@@ -116,9 +118,28 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
* @return * @return
*/ */
@Override @Override
public IPage<SysUser> findAllByPagination(CyPageInfo<SysUser> paginationUtility, public IPage<SysUser> findAllByPagination(CyPageInfo<SysUser> paginationUtility, SysUser sysUser) {
SysUser sysUser) { IPage<SysUser> sysUserIPage = baseMapper.querySysUsersPaged(paginationUtility, sysUser);
return baseMapper.querySysUsersPaged(paginationUtility, sysUser); for (int i = 0; i < sysUserIPage.getSize(); i++) {
BigInteger deptId = sysUserIPage.getRecords().get(i).getDeptId();
//根据部门id查询部门表
List<SysDept> sysDepts = sysDeptRepositorys.queryDeptById(deptId);
if (sysDepts.size() != 0) {
//获取部门名称
String deptName = sysDepts.get(0).getDeptName();
sysUserIPage.getRecords().get(i).setDeptName(deptName);
}
//查询职位id
String position = sysUserIPage.getRecords().get(i).getPosition();
List<SysDictData> sysDictData = sysDictDataRepositorys.queryDataByPosition(position);
if (sysDictData.size() != 0) {
//查询职位中文名
String dictLabel = sysDictData.get(0).getDictLabel();
sysUserIPage.getRecords().get(i).setDictLabel(dictLabel);
}
}
return sysUserIPage;
} }
......
...@@ -50,4 +50,12 @@ ...@@ -50,4 +50,12 @@
WHERE del_flag = 0 WHERE del_flag = 0
</select> </select>
<select id="queryDeptById" resultMap="BaseResultMap">
SELECT *
FROM sys_dept
WHERE del_flag = 0
and business_id = #{deptId}
</select>
</mapper> </mapper>
\ No newline at end of file
...@@ -50,4 +50,12 @@ ...@@ -50,4 +50,12 @@
WHERE dict_type = #{dictType} WHERE dict_type = #{dictType}
and del_flag = 0 and del_flag = 0
</select> </select>
<select id="queryDataByPosition" resultMap="BaseResultMap">
SELECT *
FROM sys_dict_data
WHERE dict_type = "position"
and del_flag = 0
and dict_value = #{position}
</select>
</mapper> </mapper>
\ No newline at end of file
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