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 4ab823e..cd429ed 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 @@ -39,6 +39,7 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; @RestController @@ -273,16 +274,24 @@ public class RecruitProcessController extends BaseController { if(req.getResult().equals(ProcessResult.approved.name())){ RecruitProcessTask recruitProcessTask = recruitProcessTaskService.getByTaskId(req.getTaskId()); //新增岗位,未绑定hr - RecruitPost recruitPost = RecruitPost.builder() - .taskId(req.getTaskId()) - .nodeId(recruitProcessTask.getStructurePostId()) - .postName(recruitProcessTask.getPostName()) - .deptId(recruitProcessTask.getDeptId()) - .deptName(recruitProcessTask.getDeptName()) - //默认未分配 - .isAllocation(0) - .createTime(LocalDate.now()) - .build(); + RecruitPost recruitPost = new RecruitPost(); + recruitPost.setNodeId(recruitProcessTask.getStructurePostId()); + recruitPost.setTaskId(req.getTaskId()); + recruitPost.setPostName(recruitProcessTask.getPostName()); + recruitPost.setDeptId(recruitProcessTask.getDeptId()); + recruitPost.setDeptName(recruitProcessTask.getDeptName()); + recruitPost.setIsAllocation(0); + recruitPost.setCreateTime(LocalDate.now()); +// RecruitPost recruitPost = RecruitPost.builder() +// .taskId(req.getTaskId()) +// .nodeId(recruitProcessTask.getStructurePostId()) +// .postName(recruitProcessTask.getPostName()) +// .deptId(recruitProcessTask.getDeptId()) +// .deptName(recruitProcessTask.getDeptName()) +// //默认未分配 +// .isAllocation(0) +// .createTime(LocalDate.now()) +// .build(); recruitPostService.save(recruitPost); if(recruitProcessTask.getStructurePostId()!=null){ //将该审批绑定的组织架构节点给更新成招聘中的状态 @@ -407,8 +416,17 @@ public class RecruitProcessController extends BaseController { @ApiOperation(value = "岗位公海-分页/条件查询获取表单") public TableDataInfo postseaList(RecruitPost req) { startPage(); - //List taskList = recruitProcessTaskService.listPostSea(task); List recruitPostList= recruitPostService.listPostSea(req); + List nodeIds = recruitPostList.stream().map(RecruitPost::getNodeId).collect(Collectors.toList()); + List recruitStructureList=recruitStructureService.getNodeList(nodeIds); + Map> recruitStructureMap = recruitStructureList.stream().collect(Collectors.groupingBy(RecruitStructure::getNodeId)); + recruitPostList.forEach( + recruitPost -> { + if(recruitStructureMap.get(recruitPost.getNodeId()).size()>0){ + recruitPost.setPostType(recruitStructureMap.get(recruitPost.getNodeId()).get(0).getPostType()); + } + } + ); //把taskList的taskId变成字符串 return getDataTable(recruitPostList); } diff --git a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/domain/entity/EntryManage.java b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/domain/entity/EntryManage.java index 28c2c1f..32626f0 100644 --- a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/domain/entity/EntryManage.java +++ b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/domain/entity/EntryManage.java @@ -146,6 +146,18 @@ public class EntryManage implements Serializable { @Excel(name = "岗位等级",dictType = "recruit_post_rank") private String rank; + @TableField(value = "regular_date",updateStrategy = FieldStrategy.IGNORED) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @Excel(name = "转正时间", width = 30, dateFormat = "yyyy-MM-dd") + private LocalDate regularDate; + + @TableField(value = "termination_date",updateStrategy = FieldStrategy.IGNORED) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @Excel(name = "离职时间", width = 30, dateFormat = "yyyy-MM-dd") + private LocalDate terminationDate; + @TableField(exist = false) private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/domain/entity/PostGrade.java b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/domain/entity/PostGrade.java index 1dcdfe9..a68b94c 100644 --- a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/domain/entity/PostGrade.java +++ b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/domain/entity/PostGrade.java @@ -116,6 +116,9 @@ public class PostGrade implements Serializable { @Excel(name = "备注") private String remark; + @TableField(exist = false) + private Integer postType; + @TableField(exist = false) private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/domain/entity/RecruitPost.java b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/domain/entity/RecruitPost.java index c26d516..da5b35c 100644 --- a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/domain/entity/RecruitPost.java +++ b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/domain/entity/RecruitPost.java @@ -18,7 +18,6 @@ import lombok.Data; */ @TableName(value ="recruit_post") @Data -@Builder public class RecruitPost implements Serializable { /** * @@ -86,6 +85,9 @@ public class RecruitPost implements Serializable { @TableField(value = "is_allocation") private Integer isAllocation; + @TableField(exist = false) + private Integer postType; + @TableField(exist = false) private static final long serialVersionUID = 1L; } \ No newline at end of file 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 a899b37..20826bd 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 @@ -41,15 +41,22 @@ public class RecruitPostServiceImpl extends ServiceImpl + + @@ -28,7 +30,7 @@ post_id,post_name, user_name,hr_id,hr_name, final_pass_date,join_date,actual_join_date, - entry_fail_reason,is_entry,file,dossier,rank + entry_fail_reason,is_entry,file,dossier,rank,regular_date,termination_date + + +