|
|
@@ -2,6 +2,7 @@ package com.zjugis.business.flow.recruit.service.impl;
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.collection.CollectionUtil;
|
|
|
+import cn.hutool.core.util.StrUtil;
|
|
|
import com.alibaba.fastjson2.JSON;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
@@ -27,6 +28,8 @@ import com.zjugis.framework.web.core.util.WebFrameworkUtils;
|
|
|
import com.zjugis.framework.workflow.model.IFlowInstance;
|
|
|
import com.zjugis.framework.workflow.rpc.remote.WorkflowClient;
|
|
|
import com.zjugis.framework.workflow.utils.Select;
|
|
|
+import com.zjugis.module.adm.api.staff.StaffApi;
|
|
|
+import com.zjugis.module.adm.api.staff.dto.StaffRecordsDTO;
|
|
|
import com.zjugis.module.system.api.dict.DictDataApi;
|
|
|
import com.zjugis.module.system.api.user.AdminUserApi;
|
|
|
import com.zjugis.module.system.api.user.dto.AdminUserRespDTO;
|
|
|
@@ -37,6 +40,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
import javax.annotation.Resource;
|
|
|
import java.time.LocalDateTime;
|
|
|
import java.util.*;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
import static com.zjugis.business.enums.ErrorCodeConstants.RECRUIT_DEMAND_NOT_EXISTS;
|
|
|
import static com.zjugis.framework.common.exception.util.ServiceExceptionUtil.exception;
|
|
|
@@ -55,6 +59,8 @@ public class RecruitDemandServiceImpl implements RecruitDemandService {
|
|
|
@Resource
|
|
|
private WorkflowClient workflowClient;
|
|
|
@Resource
|
|
|
+ private StaffApi staffApi;
|
|
|
+ @Resource
|
|
|
private AdminUserApi adminUserApi;
|
|
|
@Resource
|
|
|
private RecruitDAO recruitDAO;
|
|
|
@@ -206,7 +212,20 @@ public class RecruitDemandServiceImpl implements RecruitDemandService {
|
|
|
res = RecruitConvert.INSTANCE.convert01(entity);
|
|
|
List<RecruitDetailDO> list = recruitDetailService.getDetailListById(entity.getId());
|
|
|
if (CollectionUtil.isNotEmpty(list)) {
|
|
|
+
|
|
|
+ //根据替补人员id查询替补人员名称
|
|
|
+ List<String> changers = list.stream().map(RecruitDetailDO::getChanger).filter(StrUtil::isNotEmpty).collect(Collectors.toList());
|
|
|
+ if (CollectionUtil.isNotEmpty(changers)) {
|
|
|
+ Map<String, StaffRecordsDTO> map = staffApi.getUserMap(changers);
|
|
|
+ list.forEach(v -> {
|
|
|
+ if (StrUtil.isNotEmpty(v.getChanger()) && map.get(v.getChanger()) != null) {
|
|
|
+ v.setChanger(map.get(v.getChanger()).getNickname());
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
res.setDetail(RecruitConvert.INSTANCE.convertList01(list));
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
jzh