招聘搜索，个人中心

src/main/java/com/sqx/modules/chat/controller/app/AppChatController.java

@@ -151,13 +151,16 @@ public class AppChatController {
     @GetMapping("/chatUser")
     @ApiOperation("获取和自己聊过天的列表")
     public Page<ResumesListDto> chatUser(@RequestAttribute("userId")Long userId, Integer limit, Integer page){
-        List<ChatContent> list = chatContentService.getBaseMapper().selectList(new QueryWrapper<ChatContent>().eq("user_id",userId).orderByDesc("create_time"));
+        List<ChatContent> list = chatContentService.getBaseMapper().selectList(new QueryWrapper<ChatContent>().eq("user_id",userId).orderByDesc("create_time").last("limit 1"));
+
 
         Set<ResumesListDto> tempSet = new LinkedHashSet<>();
         for(ChatContent chatContent:list){
             ResumesListDto resumesListDto =new ResumesListDto();
             resumesListDto.setResumesId(chatContent.getResumesId());
-           tempSet.addAll(resumesDao.selectResumesListHr(resumesListDto));
+            List<ResumesListDto> resumesListDto1 = resumesDao.selectResumesListHr(resumesListDto);
+            resumesListDto1.forEach(resumesListDto2 -> resumesListDto2.setLastTime(chatContent.getCreateTime()));
+           tempSet.addAll(resumesListDto1);
         }
         List<ResumesListDto> list1 = new ArrayList<>(tempSet);
         Integer currentPage = (page == null || page < 1) ? 1 : page;

src/main/java/com/sqx/modules/interviewRecord/controller/InterviewRecordController.java

@@ -69,7 +69,12 @@ public class InterviewRecordController {
     @ApiOperation("添加或修改面试记录")
     @PostMapping("saveInterview")
     public Result saveInterview(@RequestAttribute("userId")Long userId,@RequestBody InterviewRecord interviewRecord) {
-        interviewRecord.setUserId(userId);
+        UserEntity userEntity = userService.getById(userId);
+        if(userEntity.getUserType() == 1){
+            interviewRecord.setInterviewerId(Math.toIntExact(userId));
+        }else {
+            interviewRecord.setUserId(userId);
+        }
         return recordService.saveInterview(interviewRecord);
     }
 

src/main/java/com/sqx/modules/interviewRecord/entity/InterviewRecord.java

@@ -116,9 +116,13 @@ public class InterviewRecord implements Serializable {
     private String  interviewResultMsg;
     private Integer interviewResultType;
     private String  interviewRecordType;
+    private String  interviewRecordMsg;
     private Integer interviewProcesses;
     private Integer sign;
     private String  signTime;
+    private String  reason;
+    private String  quiteMsg;
+    private String  quiteType;
     /**
      * 详细地址
      */

src/main/java/com/sqx/modules/interviewRecord/service/impl/InterviewRecordServiceImpl.java

@@ -237,7 +237,7 @@ public class InterviewRecordServiceImpl extends ServiceImpl<InterviewRecordDao,
         InterviewRecord record = baseMapper.selectById(recordId);
         record.setCompany(companyService.getById(record.getCompanyId()));
         record.setPostPush(postPushService.getById(record.getPostPushId()));
-        record.setUserEntity(userService.getById(record.getUserId()));
+        record.setUserEntity(userService.getById(record.getInterviewerId()));
         record.setHr(hrService.getByUserId(String.valueOf(record.getUserId())));
         Resumes resumes = resumesService.selectResumesByUserId(Long.valueOf(record.getInterviewerId()));
         record.setResumesId(resumes.getResumesId());

src/main/java/com/sqx/modules/resumes/entity/ResumesListDto.java

@@ -1,6 +1,7 @@
 package com.sqx.modules.resumes.entity;
 
 import lombok.Data;
+import org.joda.time.DateTime;
 
 @Data
 public class ResumesListDto {
@@ -16,6 +17,8 @@ public class ResumesListDto {
         private String intentIndustry;// 技能标签
         private String lastWorkStartTime;//开始时间
         private String lastWorkEndTime;//结束时间
+        private String lastWorkPosition;
+        private String lastWorkContent;
         private String adv;//个人优势
         private String skillName;
 
@@ -39,6 +42,9 @@ public class ResumesListDto {
         private String eduRange;
         private Integer minWorkExp;
         private Integer maxWorkExp;
+        private Integer minAge;
+        private Integer maxAge;
+        private String lastTime;
 
     }
 

src/main/java/com/sqx/modules/resumes/service/impl/ResumesServiceImpl.java

@@ -316,7 +316,7 @@ public class ResumesServiceImpl extends ServiceImpl<ResumesDao, Resumes> impleme
     }
     private  ResumesListDto getMatch(ResumesListDto resumesListDto){
         if (resumesListDto.getDegree()!=null){
-            resumesListDto.setDegree(String.valueOf(DEGREE_MIN_RANGE_MAP.get(resumesListDto.getDegree())));
+            resumesListDto.setDegree(String.valueOf(DEGREE_MIN_RANGE_MAP.get(resumesListDto.getEduRange())));
         }
         if(resumesListDto.getSalaryRange()!=null){
             int[] range = SALARY_RANGE_MAP.get(resumesListDto.getSalaryRange());
@@ -324,7 +324,7 @@ 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());
+            int[] range = WORK_EXPERIENCE_RANGE_MAP.get(resumesListDto.getExpRange());
             resumesListDto.setMinWorkExp(range[0]);
             resumesListDto.setMaxWorkExp(range[1]);
         }

src/main/resources/mapper/resumes/ResumesDao.xml

@@ -80,6 +80,8 @@
         intent.intentIndustry AS intentIndustry,
         last_work.start_time AS lastWorkStartTime,
         last_work.end_time AS lastWorkEndTime,
+        last_work.position AS LastWorkPosition,
+        last_work.work_content AS lastWorkConTent,
         resumes.adv AS adv,
         e.school AS school,
         e.degree AS degree,
@@ -156,7 +158,23 @@
             <if test="resumesListDto.userSex !=null">
                 AND u.sex =#{resumesListDto.sex}
             </if>
-<!--            <if test="resumesListDto."-->
+            <if test="resumesListDto.eduRange != null and resumesListDto.eduRange != ''">
+                AND r.resumes_education &gt;= #{resumesListDto.degree}
+            </if>
+            <if test="resumesListDto.expRange != null and resumesListDto.expRange != ''">
+                AND resumes.resumes_work_experience &gt;= #{resumesListDto.minWorkExp}
+                AND resumes.resumes_work_experience &lt;= #{resumesListDto.maxWorkExp}
+            </if>
+            <if test="resumesListDto.salaryRange != null and resumesListDto.salaryRange !=''">
+                AND intent.min_salary &lt; #{resumesListDto.maxSalary}
+                AND intent.max_salary &gt; #{resumesListDto.minSalary}
+            </if>
+            <if test="resumesListDto.minAge != null and resumesListDto.maxAge !=null">
+                AND u.userAge Between #{resumesListDto.minAge} and #{resumesListDto.maxAge}
+            </if>
+            <if test="resumesListDto.skillName !=null and resumesListDto.skillName!=''">
+                AND s.skill_name like concat('%',#{resumesListDto.skillName},'%')
+            </if>
         </where>
         order by resumes.update_time desc
     </select>