liaowei/SpringBoot-Hr
liaowei
/
SpringBoot-Hr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.修改主页面板和任务跟踪里的数据统计，使得数据一致 2.修改入职管理，使得所有人都可以看到入职list，不区分角色。

This commit is contained in:
lw 2024-06-27 09:56:09 +08:00
parent f0ffb2cf5b
commit 74ec00efe4
7 changed files with 44 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
zeroerr_oa-admin/src/main/resources/application-druid.yml
View File

@ -5,14 +5,14 @@ spring:
driverClassName: com.mysql.cj.jdbc.Driver driverClassName: com.mysql.cj.jdbc.Driver
druid: 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: master:
url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 url: jdbc:mysql://192.168.1.165:3306/zeoa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root username: zeoa
password: zero 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: slave:
# 从数据源开关/默认关闭 # 从数据源开关/默认关闭

12
zeroerr_oa-admin/src/main/resources/application.yml
View File

@ -7,8 +7,8 @@ ruoyi:
# 版权年份 # 版权年份
copyrightYear: 2024 copyrightYear: 2024
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
profile: D:/zeroerr/uploadPath #profile: D:/zeroerr/uploadPath
#profile: /home/zeroerr_oa/uploadPath profile: /home/zeroerr_oa/uploadPath
# 获取ip地址开关 # 获取ip地址开关
addressEnabled: false addressEnabled: false
# 验证码类型 math 数字计算 char 字符验证 # 验证码类型 math 数字计算 char 字符验证
@ -69,15 +69,15 @@ spring:
# redis 配置 # redis 配置
redis: redis:
# 地址 # 地址
#host: 192.168.1.189 host: 192.168.1.189
host: localhost #host: localhost
# 端口，默认为6379 # 端口，默认为6379
port: 6379 port: 6379
# 数据库索引 # 数据库索引
database: 0 database: 0
# 密码 # 密码
#password: 123456 password: 123456
password: #password:
# 连接超时时间 # 连接超时时间
timeout: 10s timeout: 10s
lettuce: lettuce:

26
zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/EntryManageController.java
View File

@ -77,19 +77,19 @@ public class EntryManageController extends BaseController {
@GetMapping("/list") @GetMapping("/list")
@ApiOperation(value = "入职管理的记录列表") @ApiOperation(value = "入职管理的记录列表")
public TableDataInfo listEntryManage(EntryManage req) { public TableDataInfo listEntryManage(EntryManage req) {
boolean isHr = false; // boolean isHr = false;
List<SysRole> sysRoles = iSysRoleService.rolesByUserId(getUserId()); // List<SysRole> sysRoles = iSysRoleService.rolesByUserId(getUserId());
if (!CollectionUtils.isEmpty(sysRoles)) { // if (!CollectionUtils.isEmpty(sysRoles)) {
for (SysRole sysRole : sysRoles) { // for (SysRole sysRole : sysRoles) {
//如果角色是hr // //如果角色是hr
if (sysRole.getRoleKey().equals("hr") || sysRole.getRoleKey().equals("hrleader")) { // if (sysRole.getRoleKey().equals("hr") || sysRole.getRoleKey().equals("hrleader")) {
isHr = true; // isHr = true;
} // }
} // }
} // }
if (isHr) { // if (isHr) {
req.setHrId(getUserId()); // req.setHrId(getUserId());
} // }
startPage(); startPage();
List<EntryManage> entryManageList = entryManageService.listBySelect(req); List<EntryManage> entryManageList = entryManageService.listBySelect(req);
return getDataTable(entryManageList); return getDataTable(entryManageList);

4
zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/HomePageController.java
View File

@ -223,7 +223,7 @@ public class HomePageController extends BaseController {
//封装该岗位浏览简历数 //封装该岗位浏览简历数
if(!CollectionUtils.isEmpty(resumeHandleRecordListByPostId)){ if(!CollectionUtils.isEmpty(resumeHandleRecordListByPostId)){
postDetailDTO.setPostLookResumeCounts( resumeHandleRecordListByPostId.stream() postDetailDTO.setPostLookResumeCounts( resumeHandleRecordListByPostId.stream()
.mapToInt(ResumeHandleRecord::getGreetNum) .mapToInt(ResumeHandleRecord::getSeenNum)
.sum()); .sum());
}else { }else {
postDetailDTO.setPostLookResumeCounts(0); postDetailDTO.setPostLookResumeCounts(0);
@ -263,7 +263,7 @@ public class HomePageController extends BaseController {
//封装到面数 //封装到面数
if(!CollectionUtils.isEmpty(resumeFollowRecordListByPostId)){ if(!CollectionUtils.isEmpty(resumeFollowRecordListByPostId)){
postDetailDTO.setPostArriveCounts(resumeFollowRecordListByPostId.stream().filter(record -> Objects.nonNull(record.getFinalReach()) && "1".equals(record.getFirstReach())).count()); postDetailDTO.setPostArriveCounts(resumeFollowRecordListByPostId.stream().filter(record -> Objects.nonNull(record.getFirstReach()) && "1".equals(record.getFirstReach())).count());
}else { }else {
postDetailDTO.setPostArriveCounts(0L); postDetailDTO.setPostArriveCounts(0L);
} }

23
zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/RecruitFollowController.java
View File

@ -184,18 +184,18 @@ public class RecruitFollowController extends BaseController {
followVO.setLookResumeCount(listByPostId.stream() followVO.setLookResumeCount(listByPostId.stream()
.mapToInt(ResumeHandleRecord::getGreetNum) .mapToInt(ResumeHandleRecord::getGreetNum)
.sum()); .sum());
//封装人力资源通过简历数 // //封装人力资源通过简历数
followVO.setPassResumeCount(listByPostId.stream() // followVO.setPassResumeCount(listByPostId.stream()
.mapToInt(ResumeHandleRecord::getQualifiedNum) // .mapToInt(ResumeHandleRecord::getQualifiedNum)
.sum()); // .sum());
//封装约面人数 //封装约面人数
followVO.setInviteInterviewCount(listByPostId.stream() followVO.setInviteInterviewCount(listByPostId.stream()
.mapToInt(ResumeHandleRecord::getQualifiedNum)
.sum());
//封装接受邀约人数
followVO.setAcceptInviteCount(listByPostId.stream()
.mapToInt(ResumeHandleRecord::getReceiveInviteNum) .mapToInt(ResumeHandleRecord::getReceiveInviteNum)
.sum()); .sum());
//封装接受邀约人数
// followVO.setAcceptInviteCount(listByPostId.stream()
// .mapToInt(ResumeHandleRecord::getReceiveInviteNum)
// .sum());
followVOList.add(followVO); followVOList.add(followVO);
} }
} }
@ -214,6 +214,9 @@ public class RecruitFollowController extends BaseController {
//如果存在，则插入数据 //如果存在，则插入数据
if(result.isPresent()){ if(result.isPresent()){
FollowVO followVO = result.get(); FollowVO followVO = result.get();
//封装合格简历数
followVO.setPassResumeCount(resumeFollowRecordList.size());
//设置初试人数 //设置初试人数
followVO.setFirstInterviewCount(resumeFollowRecords.stream() followVO.setFirstInterviewCount(resumeFollowRecords.stream()
.filter( record -> record.getFirstReach() != null && "1".equals(record.getFirstReach())) .filter( record -> record.getFirstReach() != null && "1".equals(record.getFirstReach()))
@ -239,8 +242,8 @@ public class RecruitFollowController extends BaseController {
.filter(record -> record.getActualJoinDate() != null) .filter(record -> record.getActualJoinDate() != null)
.count()); .count());
//封装到面率(一面人数/接受邀约人数) //封装到面率(一面人数/接受邀约人数)
if(followVO.getAcceptInviteCount()!=null&&followVO.getAcceptInviteCount()!=0){ if(followVO.getInviteInterviewCount()!=null&&followVO.getInviteInterviewCount()!=0){
BigDecimal arrivePercentage = new BigDecimal(followVO.getFirstInterviewCount()).divide(new BigDecimal(followVO.getAcceptInviteCount()), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100)); BigDecimal arrivePercentage = new BigDecimal(followVO.getFirstInterviewCount()).divide(new BigDecimal(followVO.getInviteInterviewCount()), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
followVO.setArriveRate(arrivePercentage.doubleValue()); followVO.setArriveRate(arrivePercentage.doubleValue());
}else { }else {
followVO.setArriveRate(0d); followVO.setArriveRate(0d);

1
zeroerr_oa-recruit/src/main/java/cn/zeroerr/domain/dto/PostDetailDTO.java
View File

@ -16,4 +16,5 @@ public class PostDetailDTO {
private Long postDownLoadCounts; private Long postDownLoadCounts;
private Integer postInviteCounts; private Integer postInviteCounts;
private Long postArriveCounts; private Long postArriveCounts;
private Double qualificationRate;
} }

4
zeroerr_oa-recruit/src/main/resources/mapper/ResumeFollowRecordMapper.xml
View File

@ -84,8 +84,8 @@
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from resume_follow_record from resume_follow_record
where create_date <![CDATA[>=]]> #{firstDay} where receive_date <![CDATA[>=]]> #{firstDay}
and create_date <![CDATA[<=]]> #{endDay} and receive_date <![CDATA[<=]]> #{endDay}
<if test="hrId!=null">and hr_id=#{hrId}</if> <if test="hrId!=null">and hr_id=#{hrId}</if>
</select> </select>