From 74ec00efe4c2c813c91e7699d2765280fbc75462 Mon Sep 17 00:00:00 2001 From: lw <532810027@qq.com> Date: Thu, 27 Jun 2024 09:56:09 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=BB=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E5=92=8C=E4=BB=BB=E5=8A=A1=E8=B7=9F=E8=B8=AA=E9=87=8C?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=EF=BC=8C=E4=BD=BF?= =?UTF-8?q?=E5=BE=97=E6=95=B0=E6=8D=AE=E4=B8=80=E8=87=B4=20=202.=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=85=A5=E8=81=8C=E7=AE=A1=E7=90=86=EF=BC=8C=E4=BD=BF?= =?UTF-8?q?=E5=BE=97=E6=89=80=E6=9C=89=E4=BA=BA=E9=83=BD=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E7=9C=8B=E5=88=B0=E5=85=A5=E8=81=8Clist=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E5=8C=BA=E5=88=86=E8=A7=92=E8=89=B2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-druid.yml | 14 +++++----- .../src/main/resources/application.yml | 12 ++++----- .../controller/EntryManageController.java | 26 +++++++++---------- .../controller/HomePageController.java | 4 +-- .../controller/RecruitFollowController.java | 23 +++++++++------- .../cn/zeroerr/domain/dto/PostDetailDTO.java | 1 + .../mapper/ResumeFollowRecordMapper.xml | 4 +-- 7 files changed, 44 insertions(+), 40 deletions(-) diff --git a/zeroerr_oa-admin/src/main/resources/application-druid.yml b/zeroerr_oa-admin/src/main/resources/application-druid.yml index 11f640a..386e1f3 100644 --- a/zeroerr_oa-admin/src/main/resources/application-druid.yml +++ b/zeroerr_oa-admin/src/main/resources/application-druid.yml @@ -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: # 从数据源开关/默认关闭 diff --git a/zeroerr_oa-admin/src/main/resources/application.yml b/zeroerr_oa-admin/src/main/resources/application.yml index a886da0..7f2ca50 100644 --- a/zeroerr_oa-admin/src/main/resources/application.yml +++ b/zeroerr_oa-admin/src/main/resources/application.yml @@ -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: diff --git a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/EntryManageController.java b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/EntryManageController.java index f31bf9f..49191a6 100644 --- a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/EntryManageController.java +++ b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/EntryManageController.java @@ -77,19 +77,19 @@ public class EntryManageController extends BaseController { @GetMapping("/list") @ApiOperation(value = "入职管理的记录列表") public TableDataInfo listEntryManage(EntryManage req) { - boolean isHr = false; - List sysRoles = iSysRoleService.rolesByUserId(getUserId()); - if (!CollectionUtils.isEmpty(sysRoles)) { - for (SysRole sysRole : sysRoles) { - //如果角色是hr - if (sysRole.getRoleKey().equals("hr") || sysRole.getRoleKey().equals("hrleader")) { - isHr = true; - } - } - } - if (isHr) { - req.setHrId(getUserId()); - } +// boolean isHr = false; +// List sysRoles = iSysRoleService.rolesByUserId(getUserId()); +// if (!CollectionUtils.isEmpty(sysRoles)) { +// for (SysRole sysRole : sysRoles) { +// //如果角色是hr +// if (sysRole.getRoleKey().equals("hr") || sysRole.getRoleKey().equals("hrleader")) { +// isHr = true; +// } +// } +// } +// if (isHr) { +// req.setHrId(getUserId()); +// } startPage(); List entryManageList = entryManageService.listBySelect(req); return getDataTable(entryManageList); 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 ea9fa72..5b67af8 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 @@ -223,7 +223,7 @@ public class HomePageController extends BaseController { //封装该岗位浏览简历数 if(!CollectionUtils.isEmpty(resumeHandleRecordListByPostId)){ postDetailDTO.setPostLookResumeCounts( resumeHandleRecordListByPostId.stream() - .mapToInt(ResumeHandleRecord::getGreetNum) + .mapToInt(ResumeHandleRecord::getSeenNum) .sum()); }else { postDetailDTO.setPostLookResumeCounts(0); @@ -263,7 +263,7 @@ public class HomePageController extends BaseController { //封装到面数 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 { postDetailDTO.setPostArriveCounts(0L); } 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 557d780..43bd8fe 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 @@ -184,18 +184,18 @@ public class RecruitFollowController extends BaseController { followVO.setLookResumeCount(listByPostId.stream() .mapToInt(ResumeHandleRecord::getGreetNum) .sum()); - //封装人力资源通过简历数 - followVO.setPassResumeCount(listByPostId.stream() - .mapToInt(ResumeHandleRecord::getQualifiedNum) - .sum()); +// //封装人力资源通过简历数 +// followVO.setPassResumeCount(listByPostId.stream() +// .mapToInt(ResumeHandleRecord::getQualifiedNum) +// .sum()); //封装约面人数 followVO.setInviteInterviewCount(listByPostId.stream() - .mapToInt(ResumeHandleRecord::getQualifiedNum) - .sum()); - //封装接受邀约人数 - followVO.setAcceptInviteCount(listByPostId.stream() .mapToInt(ResumeHandleRecord::getReceiveInviteNum) .sum()); + //封装接受邀约人数 +// followVO.setAcceptInviteCount(listByPostId.stream() +// .mapToInt(ResumeHandleRecord::getReceiveInviteNum) +// .sum()); followVOList.add(followVO); } } @@ -214,6 +214,9 @@ public class RecruitFollowController extends BaseController { //如果存在，则插入数据 if(result.isPresent()){ FollowVO followVO = result.get(); + //封装合格简历数 + followVO.setPassResumeCount(resumeFollowRecordList.size()); + //设置初试人数 followVO.setFirstInterviewCount(resumeFollowRecords.stream() .filter( record -> record.getFirstReach() != null && "1".equals(record.getFirstReach())) @@ -239,8 +242,8 @@ public class RecruitFollowController extends BaseController { .filter(record -> record.getActualJoinDate() != null) .count()); //封装到面率(一面人数/接受邀约人数) - if(followVO.getAcceptInviteCount()!=null&&followVO.getAcceptInviteCount()!=0){ - BigDecimal arrivePercentage = new BigDecimal(followVO.getFirstInterviewCount()).divide(new BigDecimal(followVO.getAcceptInviteCount()), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100)); + if(followVO.getInviteInterviewCount()!=null&&followVO.getInviteInterviewCount()!=0){ + BigDecimal arrivePercentage = new BigDecimal(followVO.getFirstInterviewCount()).divide(new BigDecimal(followVO.getInviteInterviewCount()), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100)); followVO.setArriveRate(arrivePercentage.doubleValue()); }else { followVO.setArriveRate(0d); diff --git a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/domain/dto/PostDetailDTO.java b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/domain/dto/PostDetailDTO.java index 7de9fb5..1f75962 100644 --- a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/domain/dto/PostDetailDTO.java +++ b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/domain/dto/PostDetailDTO.java @@ -16,4 +16,5 @@ public class PostDetailDTO { private Long postDownLoadCounts; private Integer postInviteCounts; private Long postArriveCounts; + private Double qualificationRate; } diff --git a/zeroerr_oa-recruit/src/main/resources/mapper/ResumeFollowRecordMapper.xml b/zeroerr_oa-recruit/src/main/resources/mapper/ResumeFollowRecordMapper.xml index ab8a023..63ec3a5 100644 --- a/zeroerr_oa-recruit/src/main/resources/mapper/ResumeFollowRecordMapper.xml +++ b/zeroerr_oa-recruit/src/main/resources/mapper/ResumeFollowRecordMapper.xml @@ -84,8 +84,8 @@ select from resume_follow_record - where create_date =]]> #{firstDay} - and create_date #{endDay} + where receive_date =]]> #{firstDay} + and receive_date #{endDay} and hr_id=#{hrId}