From 014086c888c0105aba590e3f47e3e5a6de64ef17 Mon Sep 17 00:00:00 2001 From: lw <532810027@qq.com> Date: Fri, 5 Jul 2024 16:40:23 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E5=B2=97=E4=BD=8D=E8=AF=84?= =?UTF-8?q?=E7=BA=A7=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/domain/entity/RecruitStructure.java | 12 +++ .../RecruitPostGradeController.java | 76 +++++++++++++++++-- .../cn/zeroerr/domain/entity/PostGrade.java | 2 +- .../cn/zeroerr/mapper/PostGradeMapper.java | 4 + .../cn/zeroerr/service/PostGradeService.java | 3 + .../service/impl/PostGradeServiceImpl.java | 6 ++ .../main/resources/mapper/PostGradeMapper.xml | 18 ++++- .../mapper/system/RecruitStructureMapper.xml | 5 +- 8 files changed, 117 insertions(+), 9 deletions(-) diff --git a/zeroerr_oa-common/src/main/java/cn/zeroerr/common/core/domain/entity/RecruitStructure.java b/zeroerr_oa-common/src/main/java/cn/zeroerr/common/core/domain/entity/RecruitStructure.java index 06c22e8..25308fc 100644 --- a/zeroerr_oa-common/src/main/java/cn/zeroerr/common/core/domain/entity/RecruitStructure.java +++ b/zeroerr_oa-common/src/main/java/cn/zeroerr/common/core/domain/entity/RecruitStructure.java @@ -9,6 +9,7 @@ import javax.validation.constraints.Email; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; +import java.time.LocalDate; import java.util.ArrayList; import java.util.List; @@ -65,6 +66,17 @@ public class RecruitStructure extends BaseEntity private String taskId; + private LocalDate postCompleteDate; + + public LocalDate getPostCompleteDate() { + return postCompleteDate; + } + + public void setPostCompleteDate(LocalDate postCompleteDate) { + this.postCompleteDate = postCompleteDate; + } + + public Integer getPostType() { return postType; } diff --git a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/RecruitPostGradeController.java b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/RecruitPostGradeController.java index 04cf5ef..5255322 100644 --- a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/RecruitPostGradeController.java +++ b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/RecruitPostGradeController.java @@ -4,9 +4,15 @@ import cn.zeroerr.common.core.controller.BaseController; import cn.zeroerr.common.core.domain.AjaxResult; import cn.zeroerr.common.core.domain.entity.RecruitStructure; import cn.zeroerr.common.core.domain.entity.SysUser; +import cn.zeroerr.common.core.page.TableDataInfo; import cn.zeroerr.domain.entity.PostGrade; +import cn.zeroerr.domain.entity.RecruitProcessTask; import cn.zeroerr.domain.entity.ResumeFollowRecord; import cn.zeroerr.service.PostGradeService; +import cn.zeroerr.service.RecruitProcessTaskService; +import cn.zeroerr.system.service.ISysUserService; +import cn.zeroerr.system.service.RecruitStructureService; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -15,6 +21,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.time.LocalDate; +import java.util.List; @RestController @RequestMapping("/recruit/postGrade") @@ -24,12 +31,69 @@ public class RecruitPostGradeController extends BaseController { @Autowired private PostGradeService postGradeService; + @Autowired + private RecruitProcessTaskService recruitProcessTaskService; -// @PreAuthorize("@ss.hasAnyPermi('recruit:grade:add')") -// @PostMapping("/add") -// @ApiOperation(value = "增加《面试管理》简历跟进记录") -// public AjaxResult addPostGrade(@Validated @RequestBody PostGrade req) { -// -// } + @Autowired + private RecruitStructureService recruitStructureService; + @Autowired + private ISysUserService iSysUserService; + + + @PreAuthorize("@ss.hasAnyPermi('recruit:grade:add')") + @PostMapping("/add") + @ApiOperation(value = "增加某月份的岗位评级") + public AjaxResult addPostGrade(@Validated @RequestBody PostGrade req) { + //封装该hr的信息 + req.setHrId(getUserId()); + req.setHrName(iSysUserService.selectUserById(getUserId()).getNickName()); +// //封装部门信息 +// RecruitStructure deptByNodeId = recruitStructureService.getDeptByNodeId(req.getPostId()); +// req.setDeptId(deptByNodeId.getNodeId()); +// req.setDeptName(deptByNodeId.getNodeName()); + //封装创建日期 + req.setCreateDate(LocalDate.now()); + + //找到对应的单据id + RecruitStructure post = recruitStructureService.getByNodeId(req.getPostId()); + if(post.getTaskId()!=null){ + RecruitProcessTask byTaskId = recruitProcessTaskService.getByTaskId(post.getTaskId()); + if(!ObjectUtils.isEmpty(byTaskId)){ + req.setApplyDate(byTaskId.getApplyDate()); + req.setPostCount(byTaskId.getPostCount()); + } + } + return toAjax(postGradeService.save(req)); + } + + @PreAuthorize("@ss.hasAnyPermi('recruit:grade:edit')") + @PutMapping("/edit") + @ApiOperation(value = "修改某月份的岗位评级") + public AjaxResult editPostGrade(@Validated @RequestBody PostGrade req) { + return toAjax(postGradeService.updateById(req)); + } + + @PreAuthorize("@ss.hasAnyPermi('recruit:grade:list')") + @GetMapping("/list") + @ApiOperation(value = "展示某月份的岗位评级") + public TableDataInfo listPostGrade(PostGrade req) { + startPage(); + List postGradeList=postGradeService.listBySelect(req); + return getDataTable(postGradeList); + } + + @PreAuthorize("@ss.hasAnyPermi('recruit:grade:delete')") + @DeleteMapping("/delete/{gradeId}") + @ApiOperation(value = "删除某月份的岗位评级") + public AjaxResult deletePostGrade(@PathVariable("gradeId")Long gradeId) { + return toAjax(postGradeService.removeById(gradeId)); + } + + @PreAuthorize("@ss.hasAnyPermi('recruit:grade:edit')") + @GetMapping("/get/{gradeId}") + @ApiOperation(value = "获取某一个某月份的岗位评级") + public AjaxResult getOnePostGrade(@PathVariable("gradeId")Long gradeId) { + return AjaxResult.success(postGradeService.getById(gradeId)); + } } 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 45d137e..53e3be2 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 @@ -51,7 +51,7 @@ public class PostGrade implements Serializable { * 0：A ；1：B；2：C */ @TableField(value = "grade") - private Integer grade; + private String grade; /** * hr的id diff --git a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/mapper/PostGradeMapper.java b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/mapper/PostGradeMapper.java index 33507a9..bffadd6 100644 --- a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/mapper/PostGradeMapper.java +++ b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/mapper/PostGradeMapper.java @@ -2,6 +2,9 @@ package cn.zeroerr.mapper; import cn.zeroerr.domain.entity.PostGrade; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @author Ze-java @@ -11,6 +14,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface PostGradeMapper extends BaseMapper { + List listBySelect(@Param("req") PostGrade req); } diff --git a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/PostGradeService.java b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/PostGradeService.java index 020f864..eee5dd7 100644 --- a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/PostGradeService.java +++ b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/PostGradeService.java @@ -3,6 +3,8 @@ package cn.zeroerr.service; import cn.zeroerr.domain.entity.PostGrade; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** * @author Ze-java * @description 针对表【post_grade】的数据库操作Service @@ -10,4 +12,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface PostGradeService extends IService { + List listBySelect(PostGrade req); } diff --git a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/impl/PostGradeServiceImpl.java b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/impl/PostGradeServiceImpl.java index 7b35422..4784a0a 100644 --- a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/impl/PostGradeServiceImpl.java +++ b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/impl/PostGradeServiceImpl.java @@ -6,6 +6,8 @@ import cn.zeroerr.service.PostGradeService; import cn.zeroerr.mapper.PostGradeMapper; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author Ze-java * @description 针对表【post_grade】的数据库操作Service实现 @@ -15,6 +17,10 @@ import org.springframework.stereotype.Service; public class PostGradeServiceImpl extends ServiceImpl implements PostGradeService{ + @Override + public List listBySelect(PostGrade req) { + return this.baseMapper.listBySelect(req); + } } diff --git a/zeroerr_oa-recruit/src/main/resources/mapper/PostGradeMapper.xml b/zeroerr_oa-recruit/src/main/resources/mapper/PostGradeMapper.xml index 0ca1e14..4dcbcce 100644 --- a/zeroerr_oa-recruit/src/main/resources/mapper/PostGradeMapper.xml +++ b/zeroerr_oa-recruit/src/main/resources/mapper/PostGradeMapper.xml @@ -10,7 +10,7 @@ - + @@ -29,4 +29,20 @@ dept_name,month,create_date, update_date,cycle,remark + + + + 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 bb29161..442a021 100644 --- a/zeroerr_oa-system/src/main/resources/mapper/system/RecruitStructureMapper.xml +++ b/zeroerr_oa-system/src/main/resources/mapper/system/RecruitStructureMapper.xml @@ -21,6 +21,7 @@ + @@ -38,7 +39,8 @@ d.create_time, d.type, d.post_type, - d.task_id + d.task_id, + d.post_complete_date from recruit_structure d @@ -60,6 +62,7 @@ d.type, d.post_type, d.task_id, + d.post_complete_date (select node_name from recruit_structure where node_id = d.parent_id) parent_name from recruit_structure d where d.node_id = #{parentId}