Your Name před 7 měsíci
rodič
revize
0921a62ed7

+ 7 - 1
src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java

@@ -1681,7 +1681,13 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
             );
             resultMap.put("tyAcceptedInterview", currentAcceptedInterview - yesterdayAcceptedInterview);
         }
-
+        int currentSendInterview = interviewRecordService.count(
+                new QueryWrapper<InterviewRecord>()
+                        .eq("user_id", userId)
+                        .eq("post_push_id", postPushId)
+                        .between("create_time", todayStart, todayEnd)
+        );
+        resultMap.put("sendInterview", currentSendInterview);
         return resultMap;
     }
     }

+ 15 - 5
src/main/java/com/sqx/modules/firstLogin/control/UserFirstRegistController.java

@@ -21,10 +21,8 @@ import org.hibernate.jdbc.Work;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.time.LocalDateTime;import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
+import java.time.LocalDateTime;
+import java.util.*;
 
 
 @RestController
@@ -179,9 +177,21 @@ public class UserFirstRegistController {
         eduService.saveOrUpdate(edu);
         Edu edu1 =eduService.getBaseMapper().selectOne(new QueryWrapper<Edu>().eq("userId",userId).orderByDesc("end_time").last("1"));
         Resumes resumes = resumesService.getOne(new QueryWrapper<Resumes>().eq("user_id",userId));
-        resumes.setResumesEducation(edu1.getDegree());
+        resumes.setResumesEducation(String.valueOf(DEGREE_MIN_RANGE_MAP.get(edu1.getDegree())));
         return Result.success();
     }
+    private static Map<String, Integer> DEGREE_MIN_RANGE_MAP = Collections.emptyMap();
+    static {
+        Map<String, Integer> tempMap = new HashMap<>();
+        tempMap.put("初中及以下", 0);  // 最小范围(最低学历)
+        tempMap.put("高中", 1);
+        tempMap.put("中专/中技", 2);
+        tempMap.put("大专", 3);
+        tempMap.put("本科", 4);
+        tempMap.put("硕士", 5);
+        tempMap.put("博士", 6);
+        DEGREE_MIN_RANGE_MAP = Collections.unmodifiableMap(tempMap);// 最大范围(最高学历)
+    }
     @Login
     @PostMapping("addSkill")
     @ApiOperation("增加技能")

+ 6 - 1
src/main/java/com/sqx/modules/resumes/entity/ResumesListDto.java

@@ -16,7 +16,8 @@ public class ResumesListDto {
         private String intentIndustry;// 技能标签
         private String lastWorkStartTime;//开始时间
         private String lastWorkEndTime;//结束时间
-        private String adv;//工作内容
+        private String adv;//个人优势
+        private String skillName;
 
         // 教育经历信息
         private String school;//毕业学校
@@ -35,5 +36,9 @@ public class ResumesListDto {
         private Integer resumesStatus;//个人现在状态
         private String salaryRange;
         private String expRange;
+        private String eduRange;
+        private Integer minWorkExp;
+        private Integer maxWorkExp;
+
     }
 

+ 21 - 1
src/main/java/com/sqx/modules/resumes/service/impl/ResumesServiceImpl.java

@@ -296,6 +296,24 @@ public class ResumesServiceImpl extends ServiceImpl<ResumesDao, Resumes> impleme
         // 包装为不可修改的Map,防止外部篡改
         SALARY_RANGE_MAP = Collections.unmodifiableMap(tempMap);
     }
+    // 工作经验范围映射(键:经验选项名称,值:int数组[minYears, maxYears])
+    private static Map<String, int[]> WORK_EXPERIENCE_RANGE_MAP = Collections.emptyMap();
+
+    // 静态代码块:初始化工作经验范围映射(按选项顺序定义)
+    static {
+        Map<String, int[]> tempMap = new HashMap<>();
+        // 注意:数组第一个元素是minYears(最小年限),第二个是maxYears(最大年限)
+        tempMap.put("1年以内", new int[]{0, 1});         // 0 ≤ 工作经验 < 1年
+        tempMap.put("1-3年", new int[]{1, 3});          // 1 ≤ 工作经验 < 3年
+        tempMap.put("3-5年", new int[]{3, 5});          // 3 ≤ 工作经验 < 5年
+        tempMap.put("5-10年", new int[]{5, 10});        // 5 ≤ 工作经验 < 10年
+        tempMap.put("10年以上", new int[]{10, Integer.MAX_VALUE}); // 工作经验 ≥ 10年(无上限)
+        tempMap.put("应届生", new int[]{0, 0});          // 0年经验(无工作经验)
+        tempMap.put("在校生", new int[]{0, 0});          // 0年经验(无工作经验)
+
+        // 包装为不可修改的Map,防止外部篡改
+        WORK_EXPERIENCE_RANGE_MAP = Collections.unmodifiableMap(tempMap);
+    }
     private  ResumesListDto getMatch(ResumesListDto resumesListDto){
         if (resumesListDto.getDegree()!=null){
             resumesListDto.setDegree(String.valueOf(DEGREE_MIN_RANGE_MAP.get(resumesListDto.getDegree())));
@@ -306,7 +324,9 @@ public class ResumesServiceImpl extends ServiceImpl<ResumesDao, Resumes> impleme
             resumesListDto.setMaxSalary(range[1]);
         }
         if (resumesListDto.getExpRange()!=null){
-
+            int[] range = WORK_EXPERIENCE_RANGE_MAP.get(resumesListDto.getEduRange());
+            resumesListDto.setMinWorkExp(range[0]);
+            resumesListDto.setMaxWorkExp(range[1]);
         }
 
         return resumesListDto;

+ 6 - 2
src/main/resources/mapper/resumes/ResumesDao.xml

@@ -80,7 +80,7 @@
         intent.intentIndustry AS intentIndustry,
         last_work.start_time AS lastWorkStartTime,
         last_work.end_time AS lastWorkEndTime,
-        last_work.work_content AS workContent,
+        resumes.adv AS adv,
         e.school AS school,
         e.degree AS degree,
         intent.all_expected_positions AS expectedPosition,
@@ -153,8 +153,12 @@
             <if test="resumesListDto.resumesStatus != null">
                 AND resumes.resumes_status = #{resumesListDto.resumesStatus}
             </if>
+            <if test="resumesListDto.userSex !=null">
+                AND u.sex =#{resumesListDto.sex}
+            </if>
+<!--            <if test="resumesListDto."-->
         </where>
-        order by r.update_time desc
+        order by resumes.update_time desc
     </select>
     <select id="selectResumesListByCompany" resultType="com.sqx.modules.resumes.entity.Resumes">
         SELECT