1.修改岗位公海页面,使得可以查看所有的分配/未分配岗位 2.动态分配hr
This commit is contained in:
parent
67fb03e958
commit
067bafbd55
|
@ -5,14 +5,14 @@ spring:
|
|||
driverClassName: com.mysql.cj.jdbc.Driver
|
||||
druid:
|
||||
# 主库数据源
|
||||
master:
|
||||
url: jdbc:mysql://192.168.1.165:3306/zeoa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
username: zeoa
|
||||
password: dHahLWNYB7tD2Mia
|
||||
# master:
|
||||
# url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
# username: root
|
||||
# password: zero
|
||||
# url: jdbc:mysql://192.168.1.165:3306/zeoa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
# username: zeoa
|
||||
# password: dHahLWNYB7tD2Mia
|
||||
master:
|
||||
url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
username: root
|
||||
password: zero
|
||||
# 从库数据源
|
||||
slave:
|
||||
# 从数据源开关/默认关闭
|
||||
|
|
|
@ -7,8 +7,8 @@ ruoyi:
|
|||
# 版权年份
|
||||
copyrightYear: 2024
|
||||
# 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath)
|
||||
#profile: D:/zeroerr/uploadPath
|
||||
profile: /home/zeroerr_oa/uploadPath
|
||||
profile: D:/zeroerr/uploadPath
|
||||
#profile: /home/zeroerr_oa/uploadPath
|
||||
# 获取ip地址开关
|
||||
addressEnabled: false
|
||||
# 验证码类型 math 数字计算 char 字符验证
|
||||
|
@ -69,15 +69,15 @@ spring:
|
|||
# redis 配置
|
||||
redis:
|
||||
# 地址
|
||||
host: 192.168.1.189
|
||||
#host: localhost
|
||||
#host: 192.168.1.189
|
||||
host: localhost
|
||||
# 端口,默认为6379
|
||||
port: 6379
|
||||
# 数据库索引
|
||||
database: 0
|
||||
# 密码
|
||||
password: 123456
|
||||
#password:
|
||||
#password: 123456
|
||||
password:
|
||||
# 连接超时时间
|
||||
timeout: 10s
|
||||
lettuce:
|
||||
|
|
|
@ -2,7 +2,6 @@ package cn.zeroerr.controller;
|
|||
|
||||
import cn.zeroerr.common.annotation.Log;
|
||||
import cn.zeroerr.common.config.RuoYiConfig;
|
||||
import cn.zeroerr.common.constant.Constants;
|
||||
import cn.zeroerr.common.core.controller.BaseController;
|
||||
import cn.zeroerr.common.core.domain.AjaxResult;
|
||||
import cn.zeroerr.common.core.domain.entity.RecruitStructure;
|
||||
|
@ -14,37 +13,30 @@ import cn.zeroerr.common.core.page.TableDataInfo;
|
|||
import cn.zeroerr.common.enums.BusinessType;
|
||||
import cn.zeroerr.common.utils.StringUtils;
|
||||
import cn.zeroerr.common.utils.file.FileUploadUtils;
|
||||
import cn.zeroerr.common.utils.file.FileUtils;
|
||||
import cn.zeroerr.common.utils.file.MimeTypeUtils;
|
||||
import cn.zeroerr.common.utils.poi.ExcelUtil;
|
||||
import cn.zeroerr.domain.dto.ToppingDTO;
|
||||
import cn.zeroerr.domain.entity.InterviewTag;
|
||||
import cn.zeroerr.domain.entity.PostPlanFollow;
|
||||
import cn.zeroerr.domain.entity.RecruitPost;
|
||||
import cn.zeroerr.domain.entity.ResumeFollowRecord;
|
||||
import cn.zeroerr.domain.vo.InterViewTagVO;
|
||||
import cn.zeroerr.domain.vo.UserVO;
|
||||
import cn.zeroerr.service.InterviewTagService;
|
||||
import cn.zeroerr.service.RecruitPostService;
|
||||
import cn.zeroerr.service.ResumeFollowRecordService;
|
||||
import cn.zeroerr.system.mapper.RecruitStructureMapper;
|
||||
import cn.zeroerr.system.service.ISysDictDataService;
|
||||
import cn.zeroerr.system.service.ISysRoleService;
|
||||
import cn.zeroerr.system.service.ISysUserService;
|
||||
import cn.zeroerr.system.service.RecruitStructureService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
|
|
|
@ -279,7 +279,9 @@ public class RecruitProcessController extends BaseController {
|
|||
.postName(recruitProcessTask.getPostName())
|
||||
.deptId(recruitProcessTask.getDeptId())
|
||||
.deptName(recruitProcessTask.getDeptName())
|
||||
.createDate(LocalDate.now())
|
||||
//默认未分配
|
||||
.isAllocation(0)
|
||||
.createTime(LocalDate.now())
|
||||
.build();
|
||||
recruitPostService.save(recruitPost);
|
||||
if(recruitProcessTask.getStructurePostId()!=null){
|
||||
|
@ -393,11 +395,12 @@ public class RecruitProcessController extends BaseController {
|
|||
@PreAuthorize("@ss.hasPermi('recruit:postsea:list')")
|
||||
@GetMapping("/postsea/list")
|
||||
@ApiOperation(value = "岗位公海-分页/条件查询获取表单")
|
||||
public TableDataInfo postseaList(RecruitProcessTask task) {
|
||||
public TableDataInfo postseaList(RecruitPost req) {
|
||||
startPage();
|
||||
List<RecruitProcessTask> taskList = recruitProcessTaskService.listPostSea(task);
|
||||
//List<RecruitProcessTask> taskList = recruitProcessTaskService.listPostSea(task);
|
||||
List<RecruitPost> recruitPostList= recruitPostService.listPostSea(req);
|
||||
//把taskList的taskId变成字符串
|
||||
return getDataTable(taskList);
|
||||
return getDataTable(recruitPostList);
|
||||
}
|
||||
|
||||
|
||||
|
@ -405,14 +408,26 @@ public class RecruitProcessController extends BaseController {
|
|||
@PutMapping("/postsea/distribution")
|
||||
@ApiOperation(value = "岗位公海-hr主管分配岗位给具体hr")
|
||||
public AjaxResult distribution(@Validated @RequestBody ApprovedResultVO req) {
|
||||
//查询该hr的信息
|
||||
SysUser sysUser = iSysUserService.selectUserById(req.getUserId());
|
||||
//更新岗位绑定该hr负责
|
||||
recruitProcessTaskService.updateBindHR(sysUser.getUserId(), sysUser.getNickName(), req.getTaskId());
|
||||
recruitPostService.updateBindHR(sysUser.getUserId(), sysUser.getNickName(), req.getTaskId());
|
||||
if(req.getUserId()!=null){
|
||||
//查询该hr的信息
|
||||
SysUser sysUser = iSysUserService.selectUserById(req.getUserId());
|
||||
//更新岗位绑定该hr负责
|
||||
recruitProcessTaskService.updateBindHR(sysUser.getUserId(), sysUser.getNickName(), req.getTaskId());
|
||||
recruitPostService.updateBindHR(sysUser.getUserId(), sysUser.getNickName(), req.getTaskId());
|
||||
}else {
|
||||
recruitProcessTaskService.updateUnBindHR(req.getTaskId());
|
||||
recruitPostService.updateUnBindHR(req.getTaskId());
|
||||
}
|
||||
|
||||
return success("成功分配");
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('recruit:mypost:list')")
|
||||
@GetMapping("/mypost/getOne/{taskId}")
|
||||
@ApiOperation(value = "岗位公海-获取某个岗位的hr分配数据")
|
||||
public AjaxResult getPostList(@PathVariable("taskId")String taskId) {
|
||||
return AjaxResult.success(recruitPostService.getOne(new LambdaQueryWrapper<RecruitPost>().eq(RecruitPost::getTaskId, taskId)));
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('recruit:mypost:list')")
|
||||
@GetMapping("/mypost/list")
|
||||
|
|
|
@ -6,11 +6,11 @@ import com.baomidou.mybatisplus.annotation.TableId;
|
|||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Date;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
/**
|
||||
* 审批通过要招娉的岗位表
|
||||
|
@ -23,7 +23,7 @@ public class RecruitPost implements Serializable {
|
|||
/**
|
||||
*
|
||||
*/
|
||||
@TableId(value = "post_id",type = IdType.AUTO)
|
||||
@TableId(value = "post_id", type = IdType.AUTO)
|
||||
private Long postId;
|
||||
|
||||
/**
|
||||
|
@ -45,7 +45,13 @@ public class RecruitPost implements Serializable {
|
|||
private String postName;
|
||||
|
||||
/**
|
||||
* 岗位分配时间(岗位开始招聘时间)
|
||||
* 绑定的审批单据id
|
||||
*/
|
||||
@TableField(value = "task_id")
|
||||
private String taskId;
|
||||
|
||||
/**
|
||||
* 组织架构岗位节点id
|
||||
*/
|
||||
@TableField(value = "node_id")
|
||||
private Long nodeId;
|
||||
|
@ -63,15 +69,22 @@ public class RecruitPost implements Serializable {
|
|||
private String deptName;
|
||||
|
||||
/**
|
||||
* 绑定的审批单据id
|
||||
* 岗位分配时间(岗位开始招聘时间)
|
||||
*/
|
||||
@TableField(value = "task_id")
|
||||
private String taskId;
|
||||
@TableField(value = "create_time")
|
||||
private LocalDate createTime;
|
||||
|
||||
@TableField(value = "create_date")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
private LocalDate createDate;
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
@TableField(value = "update_time")
|
||||
private LocalDateTime updateTime;
|
||||
|
||||
/**
|
||||
* 是否已被分配(0:未分配 ;1:已分配)
|
||||
*/
|
||||
@TableField(value = "is_allocation")
|
||||
private Integer isAllocation;
|
||||
|
||||
@TableField(exist = false)
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
|
|
@ -10,15 +10,19 @@ import java.util.List;
|
|||
/**
|
||||
* @author Ze-java
|
||||
* @description 针对表【recruit_post(审批通过要招娉的岗位表)】的数据库操作Mapper
|
||||
* @createDate 2024-05-22 15:38:33
|
||||
* @createDate 2024-07-04 18:15:51
|
||||
* @Entity cn.zeroerr.domain.entity.RecruitPost
|
||||
*/
|
||||
@Repository
|
||||
public interface RecruitPostMapper extends BaseMapper<RecruitPost> {
|
||||
|
||||
List<RecruitPost> listMyPost(@Param("userId") Long userId);
|
||||
List<RecruitPost> listPostSea(@Param("req") RecruitPost req);
|
||||
|
||||
void updateBindHR(@Param("userId") Long userId, @Param("nickName") String nickName, @Param("taskId") String taskId);
|
||||
|
||||
List<RecruitPost> listMyPost(@Param("userId") Long userId);
|
||||
|
||||
void updateUnBindHR(@Param("taskId") String taskId);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -42,6 +42,8 @@ public interface RecruitProcessTaskMapper extends BaseMapper<RecruitProcessTask>
|
|||
List<RecruitProcessTask> getMyPostList(@Param("userId") Long userId, @Param("status")String status);
|
||||
|
||||
void updateReapply(@Param("taskId") String taskId);
|
||||
|
||||
void updateUnBindHR(@Param("taskId") String taskId);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -8,11 +8,15 @@ import java.util.List;
|
|||
/**
|
||||
* @author Ze-java
|
||||
* @description 针对表【recruit_post(审批通过要招娉的岗位表)】的数据库操作Service
|
||||
* @createDate 2024-05-22 15:38:33
|
||||
* @createDate 2024-07-04 18:15:51
|
||||
*/
|
||||
public interface RecruitPostService extends IService<RecruitPost> {
|
||||
|
||||
List<RecruitPost> listMyPost(Long userId);
|
||||
List<RecruitPost> listPostSea(RecruitPost req);
|
||||
|
||||
void updateBindHR(Long userId, String nickName, String taskId);
|
||||
|
||||
List<RecruitPost> listMyPost(Long userId);
|
||||
|
||||
void updateUnBindHR(String taskId);
|
||||
}
|
||||
|
|
|
@ -42,4 +42,6 @@ public interface RecruitProcessTaskService extends IService<RecruitProcessTask>
|
|||
|
||||
|
||||
void updateReapply(String taskId);
|
||||
|
||||
void updateUnBindHR(String taskId);
|
||||
}
|
||||
|
|
|
@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|||
import cn.zeroerr.domain.entity.RecruitPost;
|
||||
import cn.zeroerr.service.RecruitPostService;
|
||||
import cn.zeroerr.mapper.RecruitPostMapper;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
@ -12,23 +11,30 @@ import java.util.List;
|
|||
/**
|
||||
* @author Ze-java
|
||||
* @description 针对表【recruit_post(审批通过要招娉的岗位表)】的数据库操作Service实现
|
||||
* @createDate 2024-05-22 15:38:33
|
||||
* @createDate 2024-07-04 18:15:51
|
||||
*/
|
||||
@Service
|
||||
public class RecruitPostServiceImpl extends ServiceImpl<RecruitPostMapper, RecruitPost>
|
||||
implements RecruitPostService{
|
||||
|
||||
@Autowired
|
||||
private RecruitPostMapper recruitPostMapper;
|
||||
|
||||
@Override
|
||||
public List<RecruitPost> listMyPost(Long userId) {
|
||||
return recruitPostMapper.listMyPost(userId);
|
||||
public List<RecruitPost> listPostSea(RecruitPost req) {
|
||||
return this.baseMapper.listPostSea(req);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateBindHR(Long userId, String nickName, String taskId) {
|
||||
recruitPostMapper.updateBindHR(userId,nickName,taskId);
|
||||
this.baseMapper.updateBindHR(userId,nickName,taskId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<RecruitPost> listMyPost(Long userId) {
|
||||
return this.baseMapper.listMyPost(userId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateUnBindHR(String taskId) {
|
||||
this.baseMapper.updateUnBindHR(taskId);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -141,6 +141,11 @@ public class RecruitProcessTaskServiceImpl extends ServiceImpl<RecruitProcessTas
|
|||
recruitProcessTaskMapper.updateReapply(taskId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateUnBindHR(String taskId) {
|
||||
recruitProcessTaskMapper.updateUnBindHR(taskId);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 处理流程节点
|
||||
|
|
|
@ -5,26 +5,47 @@
|
|||
<mapper namespace="cn.zeroerr.mapper.RecruitPostMapper">
|
||||
|
||||
<resultMap id="BaseResultMap" type="cn.zeroerr.domain.entity.RecruitPost">
|
||||
<id property="postId" column="post_id" />
|
||||
<result property="hrId" column="hr_id" />
|
||||
<id property="postId" column="post_id" jdbcType="BIGINT"/>
|
||||
<result property="hrId" column="hr_id" jdbcType="BIGINT"/>
|
||||
<result property="hrName" column="hr_name" jdbcType="VARCHAR"/>
|
||||
<result property="postName" column="post_name" jdbcType="VARCHAR"/>
|
||||
<result property="nodeId" column="node_id" />
|
||||
<result property="taskId" column="task_id" jdbcType="VARCHAR"/>
|
||||
<result property="deptId" column="dept_id" />
|
||||
<result property="nodeId" column="node_id" jdbcType="VARCHAR"/>
|
||||
<result property="deptId" column="dept_id" jdbcType="BIGINT"/>
|
||||
<result property="deptName" column="dept_name" jdbcType="VARCHAR"/>
|
||||
<result property="createDate" column="create_date" />
|
||||
<result property="createTime" column="create_time" jdbcType="DATE"/>
|
||||
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
|
||||
<result property="isAllocation" column="is_allocation" jdbcType="TINYINT"/>
|
||||
</resultMap>
|
||||
|
||||
<sql id="Base_Column_List">
|
||||
post_id,hr_id,hr_name,
|
||||
post_name,node_id,task_id,dept_id,dept_name,create_date
|
||||
post_name,task_id,node_id,
|
||||
dept_id,dept_name,create_time,
|
||||
update_time,is_allocation
|
||||
</sql>
|
||||
|
||||
<select id="listMyPost" parameterType="long" resultMap="BaseResultMap">
|
||||
select <include refid="Base_Column_List"/> from recruit_post where hr_id=#{userId}
|
||||
<select id="listPostSea" resultMap="BaseResultMap">
|
||||
select <include refid="Base_Column_List"/>
|
||||
from recruit_post
|
||||
where post_name is not null
|
||||
<if test="req.hrName!=null and req.hrName != ''">and hr_name like concat('%', #{req.hrName}, '%')</if>
|
||||
<if test="req.postName!=null and req.postName != ''">and post_name like concat('%', #{req.postName}, '%')</if>
|
||||
<if test="req.isAllocation!=null">and is_allocation = #{req.isAllocation}</if>
|
||||
<if test="req.deptId!=null">and dept_id = #{req.deptId}</if>
|
||||
order by create_time desc, is_allocation asc
|
||||
</select>
|
||||
|
||||
|
||||
<update id="updateBindHR">
|
||||
update recruit_post set hr_id=#{userId} ,hr_name=#{nickName} where task_id=#{taskId}
|
||||
update recruit_post set hr_id=#{userId} ,hr_name=#{nickName} ,is_allocation=1 where task_id=#{taskId}
|
||||
</update>
|
||||
|
||||
<select id="listMyPost" resultMap="BaseResultMap">
|
||||
select <include refid="Base_Column_List"/> from recruit_post where hr_id =#{userId}
|
||||
</select>
|
||||
|
||||
<update id="updateUnBindHR">
|
||||
update recruit_post set hr_id=null ,hr_name=null,is_allocation=0 where task_id=#{taskId}
|
||||
</update>
|
||||
</mapper>
|
||||
|
|
|
@ -262,5 +262,8 @@
|
|||
update recruit_process_task set status='reapply' where task_id=#{taskId}
|
||||
</update>
|
||||
|
||||
<update id="updateUnBindHR">
|
||||
update recruit_process_task set hr_id=null ,hr_name=null where task_id=#{taskId}
|
||||
</update>
|
||||
|
||||
</mapper>
|
||||
|
|
Loading…
Reference in New Issue