From d4ecc12b72b7e35e5804af94d191c907baeed643 Mon Sep 17 00:00:00 2001 From: lw <532810027@qq.com> Date: Tue, 18 Jun 2024 15:42:18 +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=E6=8A=A5=E9=94=99bug=202.=E4=BF=AE=E6=94=B9=E9=9D=A2?= =?UTF-8?q?=E8=AF=95=E7=AE=A1=E7=90=86=E9=87=8C=E7=9A=84=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= 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/HomePageController.java | 4 +-- .../RecruitInterviewController.java | 15 ++------ .../mapper/ResumeFollowRecordMapper.java | 4 +-- .../service/ResumeFollowRecordService.java | 4 +-- .../impl/ResumeFollowRecordServiceImpl.java | 8 ++--- .../mapper/ResumeFollowRecordMapper.xml | 36 +++++++------------ 8 files changed, 36 insertions(+), 61 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/HomePageController.java b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/HomePageController.java index a8c3409..e9ae512 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 @@ -119,14 +119,14 @@ public class HomePageController extends BaseController { //保存该岗位的名字 postNameList.add(postPlanFollow.getPostName()); //根据岗位id找到该岗位在筛选时间内 面试(终试)人数 - if (!CollectionUtils.isEmpty(postInterviewMap)) { + if (!CollectionUtils.isEmpty(postInterviewMap.get(postPlanFollow.getPostId()))) { postInterviewCounts.add(postInterviewMap.get(postPlanFollow.getPostId()).size()); } else { postInterviewCounts.add(0); } //根据岗位id找到该岗位在筛选时间内 入职人数 - if (!CollectionUtils.isEmpty(postEntryMap)) { + if (!CollectionUtils.isEmpty(postEntryMap.get(postPlanFollow.getPostId()))) { postEntryCounts.add(postEntryMap.get(postPlanFollow.getPostId()).size()); } else { postEntryCounts.add(0); diff --git a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/RecruitInterviewController.java b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/RecruitInterviewController.java index a5f6ef5..28a5ed8 100644 --- a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/RecruitInterviewController.java +++ b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/RecruitInterviewController.java @@ -81,7 +81,6 @@ public class RecruitInterviewController extends BaseController { @GetMapping("/interview/list") @ApiOperation(value = "获取《面试管理》简历跟进记录列表") public TableDataInfo getResumeRecordList(ResumeFollowRecord req){ - startPage(); //获取操作人的角色,如果是hr或者hr其他角色，则只显示自己的信息 //根据用户id获取所有的该审批人的角色ids boolean isHr = false; @@ -97,18 +96,10 @@ public class RecruitInterviewController extends BaseController { if(isHr){ req.setHrId(getUserId()); } + startPage(); //找出所有置顶后的排序数据 - List resumeFollowRecordListTopping= resumeFollowRecordService.listByQuery(req,true); - //找出所有非置顶的排序数据 - List resumeFollowRecordListUnTopping= resumeFollowRecordService.listByQueryUnTopping(req,false); - - // 将非置顶数据追加到置顶数据的列表后面 - resumeFollowRecordListTopping.addAll(resumeFollowRecordListUnTopping); - - // 最终的排序列表 - List sortedResumeFollowRecordList = resumeFollowRecordListTopping; - - return getDataTable(sortedResumeFollowRecordList); + List resumeFollowRecordListTopping= resumeFollowRecordService.listByQuery(req); + return getDataTable(resumeFollowRecordListTopping); } @PreAuthorize("@ss.hasAnyPermi('recruit:interview:add')") diff --git a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/mapper/ResumeFollowRecordMapper.java b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/mapper/ResumeFollowRecordMapper.java index a23e3cd..0511111 100644 --- a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/mapper/ResumeFollowRecordMapper.java +++ b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/mapper/ResumeFollowRecordMapper.java @@ -17,7 +17,7 @@ import java.util.List; @Repository public interface ResumeFollowRecordMapper extends BaseMapper { - List listByQuery(@Param("req") ResumeFollowRecord req,@Param("topping") Boolean topping); + List listByQuery(@Param("req") ResumeFollowRecord req); List getBySelect(@Param("hrId") Long hrId, @Param("firstDay") LocalDate firstDay,@Param("endDay") LocalDate lastDay); @@ -25,7 +25,7 @@ public interface ResumeFollowRecordMapper extends BaseMapper List getPostEntryList(@Param("postList") List postList, @Param("firstDay") LocalDate firstDay, @Param("lastDay")LocalDate lastDay); - List listByQueryUnTopping(@Param("req")ResumeFollowRecord req, @Param("topping")boolean topping); + } diff --git a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/ResumeFollowRecordService.java b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/ResumeFollowRecordService.java index ff53225..a756cd3 100644 --- a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/ResumeFollowRecordService.java +++ b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/ResumeFollowRecordService.java @@ -13,7 +13,7 @@ import java.util.List; */ public interface ResumeFollowRecordService extends IService { - List listByQuery(ResumeFollowRecord req,Boolean topping); + List listByQuery(ResumeFollowRecord req); List getBySelect(Long hrId, LocalDate firstDay, LocalDate lastDay); @@ -21,5 +21,5 @@ public interface ResumeFollowRecordService extends IService List getPostEntryList(List postList, LocalDate firstDay, LocalDate lastDay); - List listByQueryUnTopping(ResumeFollowRecord req, boolean topping); + } diff --git a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/impl/ResumeFollowRecordServiceImpl.java b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/impl/ResumeFollowRecordServiceImpl.java index b614a21..c279138 100644 --- a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/impl/ResumeFollowRecordServiceImpl.java +++ b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/impl/ResumeFollowRecordServiceImpl.java @@ -23,8 +23,8 @@ public class ResumeFollowRecordServiceImpl extends ServiceImpl listByQuery(ResumeFollowRecord req,Boolean topping) { - return resumeFollowRecordMapper.listByQuery(req,topping); + public List listByQuery(ResumeFollowRecord req) { + return resumeFollowRecordMapper.listByQuery(req); } @Override @@ -42,10 +42,6 @@ public class ResumeFollowRecordServiceImpl extends ServiceImpl listByQueryUnTopping(ResumeFollowRecord req, boolean topping) { - return resumeFollowRecordMapper.listByQueryUnTopping(req,topping); - } } diff --git a/zeroerr_oa-recruit/src/main/resources/mapper/ResumeFollowRecordMapper.xml b/zeroerr_oa-recruit/src/main/resources/mapper/ResumeFollowRecordMapper.xml index 69af77e..4fdffbd 100644 --- a/zeroerr_oa-recruit/src/main/resources/mapper/ResumeFollowRecordMapper.xml +++ b/zeroerr_oa-recruit/src/main/resources/mapper/ResumeFollowRecordMapper.xml @@ -63,17 +63,20 @@ -