1.修改主页面板报错bug 2.修改面试管理里的分页问题

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
+                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:
                 # 从数据源开关/默认关闭

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: D:/zeroerr/uploadPath
-  #profile: /home/zeroerr_oa/uploadPath
+  profile: /home/zeroerr_oa/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证
@@ -69,15 +69,15 @@ spring:
   # redis 配置
   redis:
     # 地址
-    #host: 192.168.1.189
+    host: 192.168.1.189
-    host: localhost
+    #host: localhost
     # 端口，默认为6379
     port: 6379
     # 数据库索引
     database: 0
     # 密码
-    #password: 123456
+    password: 123456
-    password:
+    #password:
     # 连接超时时间
     timeout: 10s
     lettuce:

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);

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<ResumeFollowRecord> resumeFollowRecordListTopping= resumeFollowRecordService.listByQuery(req,true);
+        List<ResumeFollowRecord> resumeFollowRecordListTopping= resumeFollowRecordService.listByQuery(req);
-        //找出所有非置顶的排序数据
+        return getDataTable(resumeFollowRecordListTopping);
-        List<ResumeFollowRecord> resumeFollowRecordListUnTopping= resumeFollowRecordService.listByQueryUnTopping(req,false);
-
-        // 将非置顶数据追加到置顶数据的列表后面
-        resumeFollowRecordListTopping.addAll(resumeFollowRecordListUnTopping);
-
-        // 最终的排序列表
-        List<ResumeFollowRecord> sortedResumeFollowRecordList = resumeFollowRecordListTopping;
-
-        return getDataTable(sortedResumeFollowRecordList);
     }
 
     @PreAuthorize("@ss.hasAnyPermi('recruit:interview:add')")

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<ResumeFollowRecord> {
 
-    List<ResumeFollowRecord> listByQuery(@Param("req") ResumeFollowRecord req,@Param("topping") Boolean topping);
+    List<ResumeFollowRecord> listByQuery(@Param("req") ResumeFollowRecord req);
 
     List<ResumeFollowRecord> getBySelect(@Param("hrId") Long hrId, @Param("firstDay") LocalDate firstDay,@Param("endDay") LocalDate lastDay);
 
@@ -25,7 +25,7 @@ public interface ResumeFollowRecordMapper extends BaseMapper<ResumeFollowRecord>
 
     List<ResumeFollowRecord> getPostEntryList(@Param("postList") List<Long> postList, @Param("firstDay") LocalDate firstDay, @Param("lastDay")LocalDate lastDay);
 
-    List<ResumeFollowRecord> listByQueryUnTopping(@Param("req")ResumeFollowRecord req, @Param("topping")boolean topping);
+
 }
 
 

zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/ResumeFollowRecordService.java

@@ -13,7 +13,7 @@ import java.util.List;
 */
 public interface ResumeFollowRecordService extends IService<ResumeFollowRecord> {
 
-    List<ResumeFollowRecord> listByQuery(ResumeFollowRecord req,Boolean topping);
+    List<ResumeFollowRecord> listByQuery(ResumeFollowRecord req);
 
     List<ResumeFollowRecord> getBySelect(Long hrId, LocalDate firstDay, LocalDate lastDay);
 
@@ -21,5 +21,5 @@ public interface ResumeFollowRecordService extends IService<ResumeFollowRecord>
 
     List<ResumeFollowRecord> getPostEntryList(List<Long> postList, LocalDate firstDay, LocalDate lastDay);
 
-    List<ResumeFollowRecord> listByQueryUnTopping(ResumeFollowRecord req, boolean topping);
+
 }

zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/impl/ResumeFollowRecordServiceImpl.java

@@ -23,8 +23,8 @@ public class ResumeFollowRecordServiceImpl extends ServiceImpl<ResumeFollowRecor
     private ResumeFollowRecordMapper resumeFollowRecordMapper;
 
     @Override
-    public List<ResumeFollowRecord> listByQuery(ResumeFollowRecord req,Boolean topping) {
+    public List<ResumeFollowRecord> listByQuery(ResumeFollowRecord req) {
-        return resumeFollowRecordMapper.listByQuery(req,topping);
+        return resumeFollowRecordMapper.listByQuery(req);
     }
 
     @Override
@@ -42,10 +42,6 @@ public class ResumeFollowRecordServiceImpl extends ServiceImpl<ResumeFollowRecor
         return resumeFollowRecordMapper.getPostEntryList(postList,firstDay,lastDay);
     }
 
-    @Override
-    public List<ResumeFollowRecord> listByQueryUnTopping(ResumeFollowRecord req, boolean topping) {
-        return resumeFollowRecordMapper.listByQueryUnTopping(req,topping);
-    }
 
 }
 

zeroerr_oa-recruit/src/main/resources/mapper/ResumeFollowRecordMapper.xml

@@ -63,8 +63,8 @@
     <select id="listByQuery" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
-        from resume_follow_record where name is not null
+        from resume_follow_record
-        <if test="topping!=null">and topping =#{topping}</if>
+        where name is not null
         <if test="req.postName!=null">and post_name like concat('%', #{req.postName}, '%')</if>
         <if test="req.name!=null">and name like concat('%', #{req.name}, '%')</if>
         <if test="req.interviewDate!=null">and interview_date = #{req.interviewDate}</if>
@@ -73,7 +73,10 @@
         <if test="req.secondPass!=null and req.secondPass!=''">and second_pass = #{req.secondPass}</if>
         <if test="req.finalPass!=null and req.finalPass!=''">and final_pass = #{req.finalPass}</if>
         <if test="req.isPass!=null and req.isPass!=''">and is_pass = #{req.isPass}</if>
-        order by topping_time desc
+        order by
+        case when topping = b'1' then 0 else 1 end,
+        topping_time desc,
+        receive_date desc
     </select>
 
     <select id="getBySelect" resultMap="BaseResultMap">
@@ -112,19 +115,4 @@
     </select>
 
 
-    <select id="listByQueryUnTopping" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List"/>
-        from resume_follow_record  where name is not null
-        <if test="topping!=null">and topping =#{topping}</if>
-        <if test="req.postName!=null">and post_name like concat('%', #{req.postName}, '%')</if>
-        <if test="req.name!=null">and name like concat('%', #{req.name}, '%')</if>
-        <if test="req.interviewDate!=null">and interview_date =#{req.interviewDate}</if>
-        <if test="req.hrId!=null">and hr_id =#{req.hrId}</if>
-        <if test="req.firstPass!=null and req.firstPass!=''">and first_pass=#{req.firstPass}</if>
-        <if test="req.secondPass!=null and req.secondPass!=''">and second_pass =#{req.secondPass}</if>
-        <if test="req.finalPass!=null and req.finalPass!=''">and final_pass=#{req.finalPass}</if>
-        <if test="req.isPass!=null and req.isPass!=''">and is_pass=#{req.isPass}</if>
-        order by receive_date desc
-    </select>
 </mapper>