From 84ac56b9fca70d36ef8500330bed17a785d0c9a2 Mon Sep 17 00:00:00 2001 From: lw <532810027@qq.com> Date: Tue, 16 Jul 2024 09:08:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E8=81=8C=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E9=87=8C=E7=9A=84=E5=B2=97=E4=BD=8D=E6=98=AF=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E8=80=8C=E9=9D=9E=E6=89=8B=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 4 +-- .../controller/HomePageController.java | 8 +++--- .../controller/RecruitFollowController.java | 8 ++++++ .../controller/RecruitProcessController.java | 18 +++++++------ .../RecruitStructureController.java | 17 ++++++++++++- .../zeroerr/domain/vo/ApprovedResultVO.java | 2 ++ .../cn/zeroerr/mapper/RecruitPostMapper.java | 4 +-- .../zeroerr/service/RecruitPostService.java | 7 ++++-- .../service/impl/RecruitPostServiceImpl.java | 25 ++++++++++++++++--- .../resources/mapper/RecruitPostMapper.xml | 4 +-- .../system/mapper/RecruitStructureMapper.java | 2 +- .../service/RecruitStructureService.java | 4 ++- .../impl/RecruitStructureServiceImpl.java | 4 ++- .../mapper/system/RecruitStructureMapper.xml | 2 +- 14 files changed, 81 insertions(+), 28 deletions(-) diff --git a/zeroerr_oa-admin/src/main/resources/application.yml b/zeroerr_oa-admin/src/main/resources/application.yml index f44ce9a..8af84fa 100644 --- a/zeroerr_oa-admin/src/main/resources/application.yml +++ b/zeroerr_oa-admin/src/main/resources/application.yml @@ -58,9 +58,9 @@ spring: servlet: multipart: # 单个文件大小 - max-file-size: 10MB + max-file-size: 20MB # 设置总上传的文件大小 - max-request-size: 20MB + max-request-size: 40MB # 服务模块 devtools: restart: diff --git a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/HomePageController.java b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/HomePageController.java index 138e932..8e95e60 100644 --- a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/HomePageController.java +++ b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/HomePageController.java @@ -626,10 +626,10 @@ public class HomePageController extends BaseController { announcementNode.setInterviewFirstResult("待定"); } //如果初试有日期，但是未到面，则视为放弃 - else if(resumeFollowRecord.getFirstDate()!=null ){ - if(resumeFollowRecord.getFirstReach().equals("0")|| resumeFollowRecord.getFirstReach().isEmpty()){ - announcementNode.setInterviewFirstResult("放弃"); - } + + } else if(resumeFollowRecord.getFirstDate()!=null &&resumeFollowRecord.getFirstReach()!=null){ + if(resumeFollowRecord.getFirstReach().equals("0")){ + announcementNode.setInterviewFirstResult("放弃"); } } if (resumeFollowRecord.getFinalPass() != null) { diff --git a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/RecruitFollowController.java b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/RecruitFollowController.java index d4ce1c7..76b3200 100644 --- a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/RecruitFollowController.java +++ b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/RecruitFollowController.java @@ -17,6 +17,7 @@ import cn.zeroerr.service.*; import cn.zeroerr.system.service.ISysDeptService; import cn.zeroerr.system.service.ISysUserService; import cn.zeroerr.system.service.RecruitStructureService; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; @@ -261,6 +262,13 @@ public class RecruitFollowController extends BaseController { if (followVO.getOfferCount() == null) followVO.setOfferCount(0L); if (followVO.getEntryCount() == null) followVO.setEntryCount(0L); + //再根据岗位公海里绑定的hr进行重新覆盖写入；因为有可能某岗位被分配给其他人了。 + RecruitPost recruitPost = recruitPostService.getOne(new LambdaQueryWrapper().eq(RecruitPost::getNodeId, followVO.getPostId())); + if(!ObjectUtils.isEmpty(recruitPost)){ + followVO.setHrId(recruitPost.getHrId()); + followVO.setHrName(recruitPost.getHrName()); + } + Optional optionalPostGrade = postGradeList.stream() .filter(postGrade -> Objects.equals(postGrade.getPostId(), followVO.getPostId())) .findFirst(); diff --git a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/RecruitProcessController.java b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/RecruitProcessController.java index 32daf54..5853740 100644 --- a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/RecruitProcessController.java +++ b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/RecruitProcessController.java @@ -412,21 +412,25 @@ public class RecruitProcessController extends BaseController { //查询该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.getTaskId()!=null){ + recruitProcessTaskService.updateBindHR(sysUser.getUserId(), sysUser.getNickName(), req.getTaskId()); + } + recruitPostService.updateBindHR(sysUser.getUserId(), sysUser.getNickName(), req.getPostId()); }else { - recruitProcessTaskService.updateUnBindHR(req.getTaskId()); - recruitPostService.updateUnBindHR(req.getTaskId()); + if(req.getTaskId()!=null){ + recruitProcessTaskService.updateUnBindHR(req.getTaskId()); + } + recruitPostService.updateUnBindHR(req.getPostId()); } return success("成功分配"); } @PreAuthorize("@ss.hasPermi('recruit:postsea:distribution')") - @GetMapping("/mypost/getOne/{taskId}") + @GetMapping("/mypost/getOne/{postId}") @ApiOperation(value = "岗位公海-获取某个岗位的hr分配数据") - public AjaxResult getPostList(@PathVariable("taskId")String taskId) { - return AjaxResult.success(recruitPostService.getOne(new LambdaQueryWrapper().eq(RecruitPost::getTaskId, taskId))); + public AjaxResult getPostList(@PathVariable("postId")Long postId) { + return AjaxResult.success(recruitPostService.getOne(new LambdaQueryWrapper().eq(RecruitPost::getPostId, postId))); } @PreAuthorize("@ss.hasPermi('recruit:mypost:list')") diff --git a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/RecruitStructureController.java b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/RecruitStructureController.java index 2ff41a9..009d16a 100644 --- a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/RecruitStructureController.java +++ b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/RecruitStructureController.java @@ -7,6 +7,8 @@ import cn.zeroerr.common.core.domain.AjaxResult; import cn.zeroerr.common.core.domain.entity.RecruitStructure; import cn.zeroerr.common.enums.BusinessType; import cn.zeroerr.common.utils.StringUtils; +import cn.zeroerr.domain.entity.RecruitPost; +import cn.zeroerr.service.RecruitPostService; import cn.zeroerr.system.service.RecruitStructureService; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import org.apache.commons.lang3.ArrayUtils; @@ -24,6 +26,11 @@ import static cn.zeroerr.common.core.domain.AjaxResult.error; public class RecruitStructureController extends BaseController { @Autowired private RecruitStructureService recruitStructureService; + + @Autowired + private RecruitPostService recruitPostService; + + /** * 新增节点 */ @@ -32,12 +39,20 @@ public class RecruitStructureController extends BaseController { @PostMapping public AjaxResult add(@Validated @RequestBody RecruitStructure node) { + if (!recruitStructureService.checkNodeNameUnique(node)) { return error("新增节点'" + node.getNodeName() + "'失败，节点名称已存在"); } node.setCreateBy(getUsername()); - return toAjax(recruitStructureService.insertNode(node)); + recruitStructureService.insertNode(node); + node.setNodeId(node.getNodeId()); + RecruitStructure deptByNodeId = recruitStructureService.getDeptByNodeId(node.getNodeId()); + //如果是已招聘状态，则自动新增岗位在公海里等待被分配给具体的hr。 + if(node.getPostType().equals(2)){ + recruitPostService.newRecruitPost(node,deptByNodeId.getNodeId(),deptByNodeId.getNodeName()); + } + return AjaxResult.success(); } diff --git a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/domain/vo/ApprovedResultVO.java b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/domain/vo/ApprovedResultVO.java index a6b209b..8d32cc7 100644 --- a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/domain/vo/ApprovedResultVO.java +++ b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/domain/vo/ApprovedResultVO.java @@ -20,5 +20,7 @@ public class ApprovedResultVO { private String remark; @ApiModelProperty("hr的用户id；如果需要打回，则需要选择一个hr进行修改。") private Long userId; + @ApiModelProperty("岗位公海的id，非真正的岗位id") + private String postId; } diff --git a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/mapper/RecruitPostMapper.java b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/mapper/RecruitPostMapper.java index 6523942..448cef3 100644 --- a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/mapper/RecruitPostMapper.java +++ b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/mapper/RecruitPostMapper.java @@ -18,11 +18,11 @@ public interface RecruitPostMapper extends BaseMapper { List listPostSea(@Param("req") RecruitPost req); - void updateBindHR(@Param("userId") Long userId, @Param("nickName") String nickName, @Param("taskId") String taskId); + void updateBindHR(@Param("userId") Long userId, @Param("nickName") String nickName, @Param("postId") String postId); List listMyPost(@Param("userId") Long userId); - void updateUnBindHR(@Param("taskId") String taskId); + void updateUnBindHR(@Param("postId") String postId); } diff --git a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/RecruitPostService.java b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/RecruitPostService.java index 1d1b72b..00c55c0 100644 --- a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/RecruitPostService.java +++ b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/RecruitPostService.java @@ -1,5 +1,6 @@ package cn.zeroerr.service; +import cn.zeroerr.common.core.domain.entity.RecruitStructure; import cn.zeroerr.domain.entity.RecruitPost; import com.baomidou.mybatisplus.extension.service.IService; @@ -14,9 +15,11 @@ public interface RecruitPostService extends IService { List listPostSea(RecruitPost req); - void updateBindHR(Long userId, String nickName, String taskId); + void updateBindHR(Long userId, String nickName, String postId); List listMyPost(Long userId); - void updateUnBindHR(String taskId); + void updateUnBindHR(String postId); + + void newRecruitPost(RecruitStructure node,Long deptId,String deptName); } diff --git a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/impl/RecruitPostServiceImpl.java b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/impl/RecruitPostServiceImpl.java index 86a1d67..a899b37 100644 --- a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/impl/RecruitPostServiceImpl.java +++ b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/impl/RecruitPostServiceImpl.java @@ -1,11 +1,13 @@ package cn.zeroerr.service.impl; +import cn.zeroerr.common.core.domain.entity.RecruitStructure; 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.stereotype.Service; +import java.time.LocalDate; import java.util.List; /** @@ -23,8 +25,8 @@ public class RecruitPostServiceImpl extends ServiceImpl - update recruit_post set hr_id=#{userId} ,hr_name=#{nickName} ,is_allocation=1 where task_id=#{taskId} + update recruit_post set hr_id=#{userId} ,hr_name=#{nickName} ,is_allocation=1 where post_id=#{postId} - update recruit_post set hr_id=null ,hr_name=null,is_allocation=0 where task_id=#{taskId} + update recruit_post set hr_id=null ,hr_name=null,is_allocation=0 where post_id=#{postId} diff --git a/zeroerr_oa-system/src/main/java/cn/zeroerr/system/mapper/RecruitStructureMapper.java b/zeroerr_oa-system/src/main/java/cn/zeroerr/system/mapper/RecruitStructureMapper.java index 4d4582b..fc0dc2f 100644 --- a/zeroerr_oa-system/src/main/java/cn/zeroerr/system/mapper/RecruitStructureMapper.java +++ b/zeroerr_oa-system/src/main/java/cn/zeroerr/system/mapper/RecruitStructureMapper.java @@ -17,7 +17,7 @@ public interface RecruitStructureMapper extends BaseMapper { RecruitStructure selectNodeById(@Param("parentId") Long parentId); - int insertNode(RecruitStructure node); + Long insertNode(RecruitStructure node); List selectNodeList(RecruitStructure node); diff --git a/zeroerr_oa-system/src/main/java/cn/zeroerr/system/service/RecruitStructureService.java b/zeroerr_oa-system/src/main/java/cn/zeroerr/system/service/RecruitStructureService.java index c20c088..ca27721 100644 --- a/zeroerr_oa-system/src/main/java/cn/zeroerr/system/service/RecruitStructureService.java +++ b/zeroerr_oa-system/src/main/java/cn/zeroerr/system/service/RecruitStructureService.java @@ -10,7 +10,7 @@ import java.util.List; public interface RecruitStructureService extends IService { boolean checkNodeNameUnique(RecruitStructure node); - int insertNode(RecruitStructure node); + Long insertNode(RecruitStructure node); List selectNodeList(RecruitStructure node); @@ -51,4 +51,6 @@ public interface RecruitStructureService extends IService { List filterByPostIdList(List uniquePostIdList); String findTopLevelDepartmentNameByNodeId(Long postId); + + } diff --git a/zeroerr_oa-system/src/main/java/cn/zeroerr/system/service/impl/RecruitStructureServiceImpl.java b/zeroerr_oa-system/src/main/java/cn/zeroerr/system/service/impl/RecruitStructureServiceImpl.java index c81812b..2ea14b0 100644 --- a/zeroerr_oa-system/src/main/java/cn/zeroerr/system/service/impl/RecruitStructureServiceImpl.java +++ b/zeroerr_oa-system/src/main/java/cn/zeroerr/system/service/impl/RecruitStructureServiceImpl.java @@ -50,7 +50,7 @@ public class RecruitStructureServiceImpl extends ServiceImpl buildDeptTreeSelect(List depts) { List deptTrees = buildDeptTree(depts); return deptTrees.stream().map(TreeSelect::new).collect(Collectors.toList()); diff --git a/zeroerr_oa-system/src/main/resources/mapper/system/RecruitStructureMapper.xml b/zeroerr_oa-system/src/main/resources/mapper/system/RecruitStructureMapper.xml index a407981..158ec65 100644 --- a/zeroerr_oa-system/src/main/resources/mapper/system/RecruitStructureMapper.xml +++ b/zeroerr_oa-system/src/main/resources/mapper/system/RecruitStructureMapper.xml @@ -68,7 +68,7 @@ where d.node_id = #{parentId} - + insert into recruit_structure( node_id, type,