febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/constant/DicCode.java
@@ -77,4 +77,9 @@ * 入离职类型 */ public final static String IN_OUT_TYPE = "LZTYPE"; /** * 岗位变更类型 */ public final static String JOB_CHANGE_TYPE = "changeType"; } febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java
@@ -70,7 +70,7 @@ @FieldInfo(name = "changeType", type = "varchar", explain = "调岗类型") @TableField("changeType") @ExcelField(value = "调岗类型",writeConverterExp = "2=升职,3=调动") // @ExcelField(value = "调岗类型",writeConverterExp = "2=升职,3=调动") private String changeType = ""; @FieldInfo(name = "changeDate", type = "date", explain = "调岗位日期") @@ -161,4 +161,10 @@ @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)") @TableField(exist = false) private String allDeptName = ""; @FieldInfo(name = "changeTypeName", type = "varchar", explain = "调岗类型") @TableField(exist = false) @ExcelField(value = "调岗类型") private String changeTypeName = ""; } febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.xml
@@ -3,13 +3,13 @@ <mapper namespace="cc.mrbird.febs.server.hr.mapper.EmpJobChangeMapper"> <select id="selectPageVo" resultType="java.util.Map"> select a.*,b.empNumb,b.certificateNumb from t_emp_jobchange a select a.*,b.empNumb,b.certificateNumb,c.allDeptName from t_emp_jobchange a inner join t_emp_baseinfo b on a.empId = b.empId inner join t_dept c on b.deptId = c.DEPT_ID ${ew.customSqlSegment} </select> <select id="selectPageVoBean" resultType="cc.mrbird.febs.server.hr.entity.EmpJobChange"> select a.*,b.empNumb,b.certificateNumb from t_emp_jobchange a select a.*,b.empNumb,b.certificateNumb,c.allDeptName from t_emp_jobchange a inner join t_emp_baseinfo b on a.empId = b.empId inner join t_dept c on b.deptId = c.DEPT_ID ${ew.customSqlSegment} febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java
@@ -1,8 +1,13 @@ package cc.mrbird.febs.server.hr.service.impl; import cc.mrbird.febs.common.core.constant.DicCode; import cc.mrbird.febs.common.core.constant.ModuleCode; import cc.mrbird.febs.common.core.entity.constant.FebsConstant; import cc.mrbird.febs.common.core.entity.system.DicItem; import cc.mrbird.febs.common.core.utils.CastUtil; import cc.mrbird.febs.common.core.utils.SortUtil; import cc.mrbird.febs.common.redis.service.RedisService; import cc.mrbird.febs.server.hr.entity.EmpBaseInfo; import cc.mrbird.febs.server.hr.entity.EmpJobChange; import cc.mrbird.febs.server.hr.feign.IRemoteDeptService; import cc.mrbird.febs.server.hr.mapper.EmpJobChangeMapper; @@ -41,6 +46,7 @@ private final EmpJobChangeMapper empJobchangeMapper; private final IRemoteDeptService remoteDeptService; private final RedisService redisService; private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser()) .map(u -> u.getUserId().toString()) .orElse("1"); @@ -75,7 +81,20 @@ Page<EmpJobChange> page = new Page<>(request.getPageNum(), request.getPageSize()); SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true); queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA)); return this.baseMapper.selectPageVo(page, queryWrapper); IPage<Map<String,Object>> iPage = this.baseMapper.selectPageVo(page, queryWrapper); List<Map<String,Object>> list =iPage.getRecords(); List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class); list.forEach(p->{ String jobChangeTypeName = dicItems.stream() .filter(k -> DicCode.JOB_CHANGE_TYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.get("changeType"))) .findFirst() .map(DicItem::getDicItemName) .orElse("未知"); p.put("changeTypeName", jobChangeTypeName); }); iPage.setRecords(list); return iPage; } @Override
