招聘

src/main/java/com/sqx/modules/firstLogin/control/HrController.java

@@ -1,14 +1,12 @@
 package com.sqx.modules.firstLogin.control;
 
 import com.sqx.common.utils.Result;
+import com.sqx.modules.app.annotation.Login;
 import com.sqx.modules.firstLogin.entity.HrEntity;
 import com.sqx.modules.firstLogin.service.HrService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/app/HrFirst" )
@@ -16,20 +14,11 @@ public class HrController {
 
 @Autowired
 private  HrService hrService;
-
+    @Login
     @PostMapping("addHr")
     @ApiOperation("hr设置名片信息")
-    public Result addHr (Integer userId , String hrImg , String hrName){
-        HrEntity hr = new HrEntity();
+    public Result addHr (@RequestAttribute Integer userId, @RequestBody HrEntity hr){
         hr.setUserId(userId);
-        hr.setHrImg(hrImg);
-        hr.setHrName(hrName);
-        hrService.save(hr);
-        return  Result.success();
-    }
-    @PostMapping("updateHr")
-    @ApiOperation("hr设置名片信息")
-    public Result updateHr (@RequestBody  HrEntity hr){
         hrService.saveOrUpdate(hr);
         return  Result.success();
     }

src/main/java/com/sqx/modules/firstLogin/control/UserFirstRegistController.java

@@ -1,22 +1,27 @@
 package com.sqx.modules.firstLogin.control;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sqx.common.utils.Result;
 import com.sqx.modules.app.annotation.Login;
-import com.sqx.modules.firstLogin.entity.Department;
-import com.sqx.modules.firstLogin.entity.Edu;
-import com.sqx.modules.firstLogin.entity.PostSkill;
-import com.sqx.modules.firstLogin.entity.WorkExp;
-import com.sqx.modules.firstLogin.service.DepartmentService;
-import com.sqx.modules.firstLogin.service.EduService;
-import com.sqx.modules.firstLogin.service.WorkExpService;
-import com.sqx.modules.firstLogin.service.PostSkillService;
+import com.sqx.modules.app.entity.UserEntity;
+import com.sqx.modules.app.service.UserService;
+import com.sqx.modules.firstLogin.dto.WorkExpDto;
+import com.sqx.modules.firstLogin.entity.*;
+import com.sqx.modules.firstLogin.service.*;
+import com.sqx.modules.intention.service.IntentionService;
 import com.sqx.modules.resumes.entity.Resumes;
 import com.sqx.modules.resumes.service.ResumesService;
 import io.swagger.annotations.ApiOperation;
+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.List;
+
+
 @RestController
 @RequestMapping("/app/userFirst" )
 public class UserFirstRegistController {
@@ -30,24 +35,64 @@ public class UserFirstRegistController {
     private PostSkillService postSkillService;
     @Autowired
     private EduService eduService;
+    @Autowired
+    private UserService userService;
+    @Autowired
+    private SkillService skillService;
+    @Autowired
+    private IntentionService intentionService;
+    @Autowired
+    private WorkExpDetailService workExpDetailService;
 
 
     @Login
-    @PostMapping("regist")
+    @PostMapping ("regist")
     @ApiOperation("初次加载信息")
-    public void userFirstRegist(Long userId, String minWage, String maxWages, String city, Integer ifExp) {
-        Resumes resumes1 = resumesService.selectResumesByUserId(userId);
-        resumes1.setCity(city);
-        resumes1.setIfExp(ifExp);
-        resumes1.setMinWage(minWage);
-        resumes1.setMaxWage(maxWages);
-        resumesService.updateById(resumes1);
+    public Result userFirstRegist(@RequestAttribute("userId") Long userId,@RequestBody Resumes resumes) {
+        Resumes oldResumes = resumesService.selectResumesByUserId(userId);
+        if (oldResumes != null) {
+            QueryWrapper<Resumes> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("resumes_id",oldResumes.getResumesId());
+            resumes.setStatus(0);
+            resumes.setUpdateTime(String.valueOf(LocalDateTime.now()));
+            resumesService.update(resumes,queryWrapper);
+        }else{
+            resumes.setUserId(userId);
+            resumes.setStatus(0);
+            resumesService.save(resumes);
+        }
+        return  Result.success();
     }
+    @Login
+    @GetMapping ("getUserResumes")
+    @ApiOperation("获取简历信息")
+    public Result getUserResumes(@RequestAttribute Long userId) {
+        ResumesDto resumesDto = new ResumesDto();
+        resumesDto.setUserEntity(userService.getById(userId));
+        resumesDto.setResumeList( resumesService.selectResumesByUserId(userId));
+        resumesDto.setEduList(eduService.selectEdu(Math.toIntExact(userId)));
+        resumesDto.setIntentions(intentionService.getIntention(userId));
+        resumesDto.setWorkExpList(workExpService.selectWorkExp(Math.toIntExact(userId)));
+        resumesDto.setSkills(skillService.selectSkill(Math.toIntExact(userId)));
+        return Result.success().put("data",resumesDto);
+    }
+    @Login
+    @PostMapping("savemsg")
+    @ApiOperation("更改基础信息")
+    public  Result savemsg(@RequestAttribute("userId")Long userId, @RequestBody UserEntity userEntity,@RequestBody Resumes resumes){
+        userEntity.setUserId(userId);
+        userEntity.setUpdateTime(String.valueOf(LocalDateTime.now()));
+        Resumes oldresumes =resumesService.selectResumesByUserId(userId);
+        resumes.setUserId(oldresumes.getUserId());
+        resumes.setUpdateTime(String.valueOf(LocalDateTime.now()));
+        resumesService.updateById(resumes);
+        return  Result.success();
+    }
+
 
     @PostMapping("getDepartment")
     @ApiOperation("获取工作部门列表")
     public Result getDepartment(Department department) {
-
         return Result.success().put("data", departmentService.getDepartmentList(department));
     }
 
@@ -57,69 +102,59 @@ public class UserFirstRegistController {
         return Result.success().put("data", postSkillService.getPostSkill(postSkill));
     }
 
-    @PostMapping("workExp")
-    @ApiOperation("工作经验")
-    public Result workExp(@RequestBody  WorkExp workExp) {
-        workExpService.save(workExp);
+    @Login
+    @PostMapping("addWorkExp")
+    @ApiOperation("新增或修改工作经验")
+    public  Result addWorkExp(@RequestAttribute("userId") Long userId, @RequestBody WorkExpDto workExp){
+        WorkExp workExp1 = workExp.getWorkExp();
+        // 存入数据库
+        workExp1.setUserId(userId);
+        workExp1.setIsUse(1);
+        workExpService.saveOrUpdate(workExp1);
+        List<WorkExpDetail> workExpDetails = workExp.getWorkExpDetails();
+        workExpDetails.forEach(workExpDetail -> workExpDetail.setWorkExpId(workExp1.getWorkExpId()));
+        workExpDetails.forEach(workExpDetail ->workExpDetailService.saveOrUpdate(workExpDetail));
         return Result.success();
     }
-
-    @PostMapping("registe")
-    @ApiOperation("补充详细信息")
-    public void registe(Resumes resumes) {
-        Resumes resumes1 = resumesService.selectResumesByUserId(resumes.getUserId());
-        resumes1.setPicture(resumes.getPicture());
-        resumes1.setResumesName(resumes.getResumesName());
-        resumes1.setResumesSex(resumes.getResumesSex());
-        resumes1.setResumesPhone(resumes.getResumesPhone());
-        resumes1.setBirthday(resumes.getBirthday());
-        resumes1.setResumesStatus(resumes.getResumesStatus());
-        resumes1.setAdv(resumes.getAdv());
-        resumesService.updateById(resumes1);
-    }
-
+    @Login
     @PostMapping("addEdu")
-    @ApiOperation("增加学历")
-    public Result addEdu(@RequestBody  Edu edu) {
-        eduService.save(edu);
+    @ApiOperation("增加或修改学历")
+    public Result addEdu(@RequestAttribute("userId") Long userId,@RequestBody  Edu edu) {
+        edu.setUserId(userId);
+        edu.setIsUse(1);
+        eduService.saveOrUpdate(edu);
         return Result.success();
-
     }
-
+    @Login
+    @PostMapping("addSkill")
+    @ApiOperation("增加技能")
+    public Result addSkill(@RequestAttribute("userId") Long userId,@RequestBody List<Skill> skills) {
+        skills.forEach(skill -> skill.setUserId(userId));
+        // 设置isUse为1
+        skills.forEach(skill -> skill.setIsUse(1));
+        // 批量保存或更新
+        skillService.saveOrUpdateBatch(skills);
+        return Result.success();
+    }
+    @Login
     @GetMapping("selectEdu")
     @ApiOperation("查找学历")
-    public Result selectEdu(Integer userId) {
-        QueryWrapper<Edu> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("user_id", userId).eq("is_use",1);
-        queryWrapper.orderByAsc("start_time");
-        return Result.success().put("data", eduService.getBaseMapper().selectList(queryWrapper));
+    public Result selectEdu(Long eduId) {
+        return Result.success().put("data", eduService.getById(eduId));
     }
-
+    @Login
     @GetMapping("selectWorkExp")
     @ApiOperation("查找工作经历")
-    public Result selectWorkExp(Integer userId) {
-        QueryWrapper<WorkExp> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("user_id", userId).eq("is_use",1);
-        queryWrapper.orderByAsc("work_start_time");
-        return Result.success().put("data", workExpService.getBaseMapper().selectList(queryWrapper));
+    public Result selectWorkExp(Integer workExpId) {
+        return Result.success().put("data", workExpService.selectWorkExpOne(workExpId));
     }
-
-    @PostMapping("updateWorkExp")
-    @ApiOperation("更新工作经历")
-    public Result updateWorkExp(@RequestBody WorkExp workExp) {
-
-        workExpService.updateById(workExp);
-        return Result.success();
-    }
-
-    @PostMapping("updateEdu")
-    @ApiOperation("更新教育经历")
-    public Result updateEdu(@RequestBody Edu edu) {
-
-        eduService.updateById(edu);
-        return Result.success();
+    @Login
+    @GetMapping("selectSkill")
+    @ApiOperation("查找技能")
+    public Result selectSkill(@RequestAttribute("userId") Integer userId) {
+        return Result.success().put("data", skillService.selectSkill(userId));
     }
-
+    @Login
     @PostMapping("deleteWorkExp")
     @ApiOperation("删除工作经历")
     public Result deleteExp(Integer workExpId) {
@@ -128,7 +163,7 @@ public class UserFirstRegistController {
         workExpService.saveOrUpdate(workExp);
         return Result.success();
     }
-
+    @Login
     @PostMapping("deleteEdu")
     @ApiOperation("删除教育经历")
     public Result deleteEdu( Integer eduId) {
@@ -136,6 +171,28 @@ public class UserFirstRegistController {
         edu.setIsUse(0);
         eduService.saveOrUpdate(edu);
         return Result.success();
+    }
+    @Login
+    @PostMapping("deleteSkill")
+    @ApiOperation("删除技能")
+    public Result deleteSkill(@RequestBody List<Skill> skills) {
+        skills.forEach(skill -> skill.setIsUse(0));
+        skillService.updateBatchById(skills);
+        return Result.success();
+    }
+    @Login
+    @PostMapping("updateSkill")
+    @ApiOperation("更新技能")
+    public Result deleteSkill(@RequestBody List<Skill> skills,@RequestAttribute("userId")Integer userId) {
+        List<Skill> oldSkills = skillService.selectSkill(userId);
+        oldSkills.forEach(skill -> skill.setIsUse(0));
+        skillService.updateBatchById(oldSkills);
+        skills.forEach(skill -> skill.setUserId(Long.valueOf(userId)));
+        // 设置isUse为1
+        skills.forEach(skill -> skill.setIsUse(1));
+        // 批量保存或更新
+        skillService.saveOrUpdateBatch(skills);
+        return Result.success();
 
     }
 }

src/main/java/com/sqx/modules/firstLogin/dao/SkillDao.java

@@ -0,0 +1,9 @@
+package com.sqx.modules.firstLogin.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sqx.modules.firstLogin.entity.Skill;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SkillDao extends BaseMapper<Skill> {
+}

src/main/java/com/sqx/modules/firstLogin/dao/WorkExpDao.java

@@ -4,7 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sqx.modules.firstLogin.entity.WorkExp;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 
 @Mapper
 public interface WorkExpDao extends BaseMapper<WorkExp> {
+    List<Object> selectWorkExpList(Integer userId);
+
+    List<Object> selectWorkExpOne(Integer workExpId);
 }

src/main/java/com/sqx/modules/firstLogin/dao/WorkExpDetailDao.java

@@ -0,0 +1,9 @@
+package com.sqx.modules.firstLogin.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sqx.modules.firstLogin.entity.WorkExpDetail;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface WorkExpDetailDao extends BaseMapper<WorkExpDetail> {
+}

src/main/java/com/sqx/modules/firstLogin/dto/WorkExpDto.java

@@ -0,0 +1,13 @@
+package com.sqx.modules.firstLogin.dto;
+
+import com.sqx.modules.firstLogin.entity.WorkExp;
+import com.sqx.modules.firstLogin.entity.WorkExpDetail;
+import lombok.Data;
+
+import java.util.List;
+@Data
+public class WorkExpDto {
+
+        private WorkExp workExp;
+        private List<WorkExpDetail> workExpDetails;  // List字段
+}

src/main/java/com/sqx/modules/firstLogin/entity/Edu.java

@@ -16,7 +16,7 @@ public class Edu implements Serializable {
     // 学校名称
     private String school;
     // 用户id
-    private Integer userId;
+    private Long userId;
     // 专业
     private String profession;
     // 起始时间

src/main/java/com/sqx/modules/firstLogin/entity/ResumesDto.java

@@ -0,0 +1,25 @@
+package com.sqx.modules.firstLogin.entity;
+
+import com.sqx.modules.app.entity.UserEntity;
+import com.sqx.modules.intention.entity.Intention;
+import com.sqx.modules.resumes.entity.Resumes;
+import lombok.Data;
+import java.util.List;
+@Data // lombok注解，自动生成getter、setter
+public class ResumesDto {
+    // 简历列表（假设Resume是简历实体类）
+    private Resumes resumeList;
+    // 教育经历列表（假设Education是教育经历实体类）
+    private List<Edu> eduList;
+    // 工作经历列表（假设WorkExperience是工作经历实体类）
+    private List<Object> workExpList;
+
+    private UserEntity userEntity;
+
+    private List<Intention> intentions;
+
+    private List<Skill> skills;
+
+    public void getResumeList(Resumes resumes) {
+    }
+}

src/main/java/com/sqx/modules/firstLogin/entity/Skill.java

@@ -0,0 +1,19 @@
+package com.sqx.modules.firstLogin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@TableName("skill")
+public class Skill implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @TableId(value = "skill_id", type = IdType.AUTO)
+    private Long skillId;
+    private Long userId;
+    private String skillName;
+    private  Integer isUse;
+}

src/main/java/com/sqx/modules/firstLogin/entity/WorkExp.java

@@ -5,7 +5,10 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import javax.persistence.Column;
 import java.io.Serializable;
+import java.util.List;
+
 @Data
 @TableName("work_exp")
 public class WorkExp implements Serializable {
@@ -15,49 +18,33 @@ public class WorkExp implements Serializable {
      * 工作经验id
      */
     @TableId(value = "work_exp_id", type = IdType.AUTO)
+    @Column(name = "work_exp_id")
     private Integer workExpId;
+
     /**
-     * 工作经验种类 0.跨境电商经验 1.国内电贸 2.外贸 3. 其他
-     */
-    private  Integer type;
-    /**
-     * 历史工作部门
-     */
-private  String department;
-    /**
-     * 历史工作技能
-     */
-private  String postSkill;
-    /**
-     * 历史工作资质
-     */
-private  Integer postLevel;
-    /**
-     * 历史工作内容
-     */
-private  String workContent;
-    /**
-     * 历史工作业绩
-     */
-private  String workAchieve;
-    /**
-     * 历史工作开始时间
-     */
-private String workStartTime;
-    /**
-     * 历史工作结束时间
+     * 类型（JSON数组存储，例如：["0","1"]）
+     * 0: 跨境电商 1: 国内电商 2: 外贸 3: 其他
      */
-    private String workEndTime;
+    private String type; // JSON类型在Java中通常用String存储，也可根据需求映射为自定义对象
+
     /**
-     * 历史工作岗位id
+     * 启用状态
+     * 0: 停用 1: 使用
      */
-private  String industry;
+    @Column(name = "is_use")
+    private Integer isUse;
+
     /**
      * 用户id
      */
-private  Integer userId;
+    @Column(name = "user_id")
+    private Long userId;
 
-    private  Integer isUse;
+    /**
+     * 公司名称
+     */
+    @Column(name = "company_name", length = 255)
+    private String companyName;
 
 
 }

src/main/java/com/sqx/modules/firstLogin/entity/WorkExpDetail.java

@@ -0,0 +1,25 @@
+package com.sqx.modules.firstLogin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import javax.persistence.Column;
+import java.util.List;
+
+@Data
+public class WorkExpDetail {
+    @TableId(value = "work_exp_detail_id", type = IdType.AUTO)
+    private  Integer workExpDetailId;
+    private  Integer workExpId;
+    private String skills;         // 技能数组
+    private String position;             // 职位名称
+    private Integer positionId;          // 职位ID（若数值较大，可改为Long）
+    private String workContent;          // 工作内容
+    private Integer departmentId;        // 部门ID（若数值较大，可改为Long）
+    private String positionLevel;        // 职位级别（初级/中级/高级等）
+    private String startTime; // 任职时间数组（格式：yyyy-MM-dd）
+    private String endTime;
+    private String department;     // 部门索引
+    private String workPerformance;
+}

src/main/java/com/sqx/modules/firstLogin/service/EduService.java

@@ -3,5 +3,8 @@ package com.sqx.modules.firstLogin.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.sqx.modules.firstLogin.entity.Edu;
 
+import java.util.List;
+
 public interface EduService extends IService<Edu> {
+    List<Edu> selectEdu(Integer userId);
 }

src/main/java/com/sqx/modules/firstLogin/service/SkillService.java

@@ -0,0 +1,10 @@
+package com.sqx.modules.firstLogin.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.sqx.modules.firstLogin.entity.Skill;
+
+import java.util.List;
+
+public interface SkillService extends IService<Skill> {
+    List<Skill> selectSkill(Integer userId) ;
+}

src/main/java/com/sqx/modules/firstLogin/service/WorkExpDetailService.java

@@ -0,0 +1,7 @@
+package com.sqx.modules.firstLogin.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.sqx.modules.firstLogin.entity.WorkExpDetail;
+
+public interface WorkExpDetailService extends IService<WorkExpDetail> {
+}

src/main/java/com/sqx/modules/firstLogin/service/WorkExpService.java

@@ -3,5 +3,10 @@ package com.sqx.modules.firstLogin.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.sqx.modules.firstLogin.entity.WorkExp;
 
+import java.util.List;
+
 public interface WorkExpService extends IService<WorkExp> {
+    List<Object> selectWorkExp(Integer userId);
+
+    List<Object> selectWorkExpOne(Integer workExpId);
 }

src/main/java/com/sqx/modules/firstLogin/service/impl/EduServiceImpl.java

@@ -1,11 +1,22 @@
 package com.sqx.modules.firstLogin.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sqx.modules.firstLogin.dao.EduDao;
 import com.sqx.modules.firstLogin.entity.Edu;
 import com.sqx.modules.firstLogin.service.EduService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class EduServiceImpl extends ServiceImpl<EduDao, Edu> implements EduService {
+    @Override
+    public List<Edu> selectEdu( Integer userId) {
+        QueryWrapper<Edu> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user_id", userId).eq("is_use",1);
+        queryWrapper.orderByAsc("start_time");
+        return baseMapper.selectList(queryWrapper);
+
+    }
 }

src/main/java/com/sqx/modules/firstLogin/service/impl/SkillServiceImpl.java

@@ -0,0 +1,21 @@
+package com.sqx.modules.firstLogin.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sqx.modules.firstLogin.dao.SkillDao;
+import com.sqx.modules.firstLogin.entity.Skill;
+import com.sqx.modules.firstLogin.service.SkillService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class SkillServiceImpl extends ServiceImpl<SkillDao, Skill> implements SkillService {
+    @Override
+    public List<Skill> selectSkill(Integer userId) {
+        QueryWrapper<Skill> queryWrapper =new QueryWrapper<>();
+        queryWrapper.eq("user_id",userId).eq("is_use",1);
+        return  baseMapper.selectList(queryWrapper);
+    }
+}

src/main/java/com/sqx/modules/firstLogin/service/impl/WorkExpDetailServiceImpl.java

@@ -0,0 +1,11 @@
+package com.sqx.modules.firstLogin.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sqx.modules.firstLogin.dao.WorkExpDetailDao;
+import com.sqx.modules.firstLogin.entity.WorkExpDetail;
+import com.sqx.modules.firstLogin.service.WorkExpDetailService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class WorkExpDetailServiceImpl extends ServiceImpl<WorkExpDetailDao,WorkExpDetail> implements WorkExpDetailService {
+}

src/main/java/com/sqx/modules/firstLogin/service/impl/WorkExpServiceImpl.java

@@ -6,6 +6,25 @@ import com.sqx.modules.firstLogin.entity.WorkExp;
 import com.sqx.modules.firstLogin.service.WorkExpService;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
+import java.util.List;
+
 @Service
 public class WorkExpServiceImpl extends ServiceImpl<WorkExpDao, WorkExp>implements WorkExpService {
+
+    private final WorkExpDao workExpDao;
+
+    public WorkExpServiceImpl(WorkExpDao workExpDao) {
+        this.workExpDao = workExpDao;
+    }
+
+    @Override
+    public List<Object> selectWorkExp(Integer userId) {
+        return workExpDao.selectWorkExpList(userId);
+    }
+
+    @Override
+    public List<Object> selectWorkExpOne(Integer workExpId) {
+        return workExpDao.selectWorkExpOne(workExpId);
+    }
 }

src/main/java/com/sqx/modules/intention/controller/AppIntentionController.java

@@ -1,6 +1,7 @@
 package com.sqx.modules.intention.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.sqx.common.utils.Result;
 import com.sqx.modules.app.annotation.Login;
 import com.sqx.modules.intention.entity.Intention;
@@ -10,6 +11,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 前端控制器
@@ -29,24 +32,33 @@ public class AppIntentionController {
     @Login
     @ApiOperation("添加求职意向")
     @PostMapping(value = "saveUpdate")
-    public Result saveUpdate(@RequestAttribute("userId") Long userId, Intention Intention) {
+    public Result saveUpdate(@RequestAttribute("userId") Long userId, @RequestBody Intention Intention) {
         Intention.setUserId(userId);
+        Intention.setClassifyOneId(0L);
+        Intention.setClassifyTwoId(0L);
+        Intention.setCreateTime(LocalDateTime.now());
+        Intention.setIndustryId(201L);
+        Intention.setIndustryOneId(200L);
+        Intention.setIsDefault(1);
         return intentionService.saveUpdate(Intention);
     }
 
     @Login
     @ApiOperation("获取求职意向列表")
     @GetMapping(value = "getIntentionList")
-    public Result getIntentionList(@RequestAttribute("userId") Long userId, Integer page, Integer limit, Intention intention) {
-        intention.setUserId(userId);
-        return Result.success().put("data", intentionService.getIntentionList(page, limit, intention));
+    public Result getIntentionList(@RequestAttribute("userId") Long userId) {
+        QueryWrapper<Intention> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user_id",userId).eq("is_default",1);
+        return Result.success().put("data", intentionService.getBaseMapper().selectList(queryWrapper));
     }
 
     @Login
     @ApiOperation("获取求职意向信息")
     @GetMapping(value = "getIntentionInfo")
     public Result getIntentionInfo(Long intentionId) {
-        return Result.success().put("data", intentionService.getById(intentionId));
+        QueryWrapper<Intention> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("intention_id",intentionId);
+        return Result.success().put("data", intentionService.getOne(queryWrapper));
 
 
     }

src/main/java/com/sqx/modules/intention/service/IntentionService.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.sqx.common.utils.Result;
 import com.sqx.modules.intention.entity.Intention;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -18,4 +20,6 @@ public interface IntentionService extends IService<Intention> {
     Result saveUpdate(Intention Intention);
 
     IPage<Intention> getIntentionList(Integer page, Integer limit, Intention intention);
+
+    List<Intention> getIntention(Long userId);
 }

src/main/java/com/sqx/modules/intention/service/impl/IntentionServiceImpl.java

@@ -19,6 +19,8 @@ import org.springframework.stereotype.Service;
 import weixin.popular.bean.datacube.article.Usershare;
 
 import java.time.LocalDateTime;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * <p>
@@ -39,32 +41,75 @@ public class IntentionServiceImpl extends ServiceImpl<IntentionDao, Intention> i
 
     @Override
     public Result saveUpdate(Intention intention) {
-        if (intention.getIsDefault() == 1) {
-            Intention updateIntention = new Intention();
-            updateIntention.setIsDefault(0);
-            baseMapper.update(updateIntention, new QueryWrapper<Intention>().eq("user_id", intention.getUserId()));
-        }
-        QueryWrapper<Intention> wrapper = new QueryWrapper<Intention>().eq("user_id", intention.getUserId());
-        if (intention.getIntentionId() != null) {
-            wrapper.ne("intention_id", intention.getIntentionId());
+        // 1. 处理默认意向：全局最多3条is_default=1的数据
+        boolean isSetDefault = intention.getIsDefault() == 1;
+        if (isSetDefault) {
+            // 查询当前数据库中is_default=1的总数
+            int currentDefaultCount = baseMapper.selectCount(new QueryWrapper<Intention>().eq("is_default", 1));
+
+            // 判断是否需要校验（新增默认 或 修改非默认→默认）
+            boolean needCheck = false;
+            if (intention.getIntentionId() == null) {
+                // 新增操作：设置为默认会使总数+1，需校验
+                needCheck = true;
+            } else {
+                // 修改操作：查询原记录的is_default值
+                Intention oldIntention = baseMapper.selectById(intention.getIntentionId());
+                if (oldIntention != null && oldIntention.getIsDefault() == 0) {
+                    // 原记录不是默认，现在改为默认，总数+1，需校验
+                    needCheck = true;
+                }
+            }
+
+            // 校验：若需要检查且当前总数已≥3，禁止操作
+            if (needCheck && currentDefaultCount >= 3) {
+                return Result.error("系统最多只能有3条默认求职意向");
+            }
         }
-        int count = baseMapper.selectCount(wrapper);
-        UserEntity userEntity = userService.getById(intention.getUserId());
-        int maxCount = Integer.parseInt(commonInfoService.findOne(325).getValue());
-        if (count > maxCount) {
-            return Result.error("求职意向最多添加" + maxCount + "个");
+
+        // 2. 校验用户的意向总数限制（原有逻辑：每个用户最多maxCount个意向）
+        QueryWrapper<Intention> countWrapper = new QueryWrapper<Intention>()
+                .eq("user_id", intention.getUserId())
+                .ne(intention.getIntentionId() != null, "intention_id", intention.getIntentionId());
+        int userIntentionCount = baseMapper.selectCount(countWrapper);
+        int maxUserCount = Integer.parseInt(commonInfoService.findOne(325).getValue()); // 每个用户的最大意向数
+        if (userIntentionCount >= maxUserCount) {
+            return Result.error("当前用户求职意向最多添加" + maxUserCount + "个");
         }
+
+        // 3. 区分新增/修改操作
         if (intention.getIntentionId() != null) {
+            // 修改操作
             return Result.upStatus(baseMapper.updateById(intention));
         } else {
+            // 新增操作：补充基础信息
+            UserEntity userEntity = userService.getById(intention.getUserId());
+            if (userEntity == null) {
+                return Result.error("用户不存在");
+            }
             intention.setCreateTime(LocalDateTime.now());
             intention.setUserName(userEntity.getUserName());
+
+            // 补充三级分类信息
             RuleClassify ruleClassify = classifyService.getById(intention.getRuleClassifyId());
-            RuleClassify twoClassify = classifyService.getOne(new QueryWrapper<RuleClassify>().eq("rule_classify_id", ruleClassify.getParentId()));
-            RuleClassify oneClassify = classifyService.getOne(new QueryWrapper<RuleClassify>().eq("rule_classify_id", twoClassify.getParentId()));
+            if (ruleClassify == null) {
+                return Result.error("三级分类不存在");
+            }
+            RuleClassify twoClassify = classifyService.getOne(new QueryWrapper<RuleClassify>()
+                    .eq("rule_classify_id", ruleClassify.getParentId()));
+            if (twoClassify == null) {
+                return Result.error("二级分类不存在");
+            }
+            RuleClassify oneClassify = classifyService.getOne(new QueryWrapper<RuleClassify>()
+                    .eq("rule_classify_id", twoClassify.getParentId()));
+            if (oneClassify == null) {
+                return Result.error("一级分类不存在");
+            }
             intention.setRuleClassifyId(ruleClassify.getRuleClassifyId());
             intention.setClassifyTwoId(twoClassify.getRuleClassifyId());
             intention.setClassifyOneId(oneClassify.getRuleClassifyId());
+
+            // 执行插入
             return Result.upStatus(baseMapper.insert(intention));
         }
     }
@@ -80,4 +125,11 @@ public class IntentionServiceImpl extends ServiceImpl<IntentionDao, Intention> i
         }
         return baseMapper.selectPage(pages, new QueryWrapper<>(intention).orderByDesc("create_time"));
     }
+
+    @Override
+    public List<Intention> getIntention(Long userId) {
+        QueryWrapper<Intention>queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user_id",userId).eq("is_default",1);
+        return baseMapper.selectList(queryWrapper);
+    }
 }

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

@@ -33,6 +33,9 @@ public class InterviewRecordController {
     private UserService userService;
     @Autowired
     private CompanyService companyService;
+    @Autowired
+    private InterviewRecordService interviewRecordService;
+
     @Login
     @ApiOperation("获取面试记录列表")
     @GetMapping("interviewList")
@@ -72,5 +75,22 @@ public class InterviewRecordController {
     public Result isSendView(Long postPushId,Long userId) {
         return recordService.isSendView(postPushId,userId);
     }
+
+    @Login
+    @PostMapping("新增面试邀请")
+    @ApiOperation("addInterview")
+    public  Result addInterview(@RequestAttribute("userId")Long userId,@RequestBody InterviewRecord interviewRecord){
+        interviewRecord.setUserId(userId);
+        interviewRecordService.saveOrUpdate(interviewRecord);
+        return  Result.success();
+    }
+
+    @Login
+    @GetMapping("用户搜索面试列表")
+    @ApiOperation("selectInterviewListOfUser")
+    public  Result selectInterviewList(@RequestAttribute("userId")Long userId){
+        return Result.success().put("data",interviewRecordService.selectInterviewList(userId));
+    }
+
 }
 

src/main/java/com/sqx/modules/interviewRecord/dao/InterviewRecordDao.java

@@ -19,4 +19,6 @@ import java.util.List;
 public interface InterviewRecordDao extends BaseMapper<InterviewRecord> {
 
     List<InterviewRecord> getRecordList(@Param("hour") Integer hour);
+
+    List<Object> selectInterviewList(Long userId);
 }

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

@@ -103,6 +103,19 @@ public class InterviewRecord implements Serializable {
      */
     private Integer isSendHour;
 
+    private Integer postId;
+    private Integer type;
+    private String address;
+    private String  detailTime;
+    private Integer onlineType;
+    private String  onlineMsg;
+    private String  hrPhone;
+    private Integer interviewerId;
+    private String  interviewResultMsg;
+    private Integer interviewResultType;
+    private String  interviewRecordType;
+    private String  interviewRecordMsg;
+
     /**
      * 详细地址
      */

src/main/java/com/sqx/modules/interviewRecord/service/InterviewRecordService.java

@@ -28,4 +28,6 @@ public interface InterviewRecordService extends IService<InterviewRecord> {
     InterviewRecord getInterviewInfo(Long recordId);
 
     Result isSendView(Long postPushId, Long userId);
+
+    List<Object> selectInterviewList(Long userId);
 }

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

@@ -31,6 +31,7 @@ import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -265,4 +266,9 @@ public class InterviewRecordServiceImpl extends ServiceImpl<InterviewRecordDao,
             return Result.success().put("data", true);
         }
     }
+
+    @Override
+    public List<Object> selectInterviewList(Long userId) {
+        return baseMapper.selectInterviewList(userId);
+    }
 }

src/main/java/com/sqx/modules/post/controller/PostController.java

@@ -1,7 +1,9 @@
 package com.sqx.modules.post.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.sqx.common.utils.Result;
 
+import com.sqx.modules.app.annotation.Login;
 import com.sqx.modules.post.entity.PostEntity;
 import com.sqx.modules.post.service.PostService;
 import com.sqx.modules.post.service.ViewPostService;
@@ -24,17 +26,18 @@ public class PostController {
     public Result getPostListOfUser() {
         return Result.success().put("data", postService.getPostListOfUser());
     }
-
-    @GetMapping("getPostListOne")
+    @Login
+    @GetMapping("getPostListOnly")
     @ApiOperation("获取岗位详细信息")
-    public Result getPostListOne(Integer postId,Integer userId) {
+    public Result getPostListOne(Integer postId,@RequestAttribute("userId") Long userId) {
         viewPostService.addViewPost(postId,userId);
         return Result.success().put("data", postService.getPostListOne(postId));
     }
-
+    @Login
     @PostMapping("addPost")
     @ApiOperation("增加岗位")
-    public void addPost(@RequestBody PostEntity postEntity) {
+    public void addPost(@RequestAttribute("userId") Long userId,@RequestBody PostEntity postEntity) {
+        postEntity.setUserId(userId);
         postService.saveOrUpdate(postEntity);
 
     }
@@ -49,8 +52,8 @@ public class PostController {
 
     @GetMapping("findPost")
     @ApiOperation("查找岗位列表")
-    public Result findPost(String address, String wage, String exp, String companyPeople, String key) {
-        return Result.success().put("data", postService.findPost(address, wage, exp, companyPeople, key));
+    public Result findPost(String address, Integer wage, Integer edu, Integer companyPeople, String key) {
+        return Result.success().put("data", postService.findPost(address, wage, edu, companyPeople, key));
     }
     @PostMapping("changePost")
     @ApiOperation("更改岗位状态岗位列表")
@@ -59,4 +62,13 @@ public class PostController {
         postService.saveOrUpdate(postEntity);
         return  Result.success();
     }
+    @Login
+    @GetMapping("getMyPost")
+    @ApiOperation("获取我发布的岗位详细信息")
+    public Result getPostListOne(@RequestAttribute("userId") Integer userId) {
+        QueryWrapper<PostEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user_id",userId);
+        return Result.success().put("data", postService.getBaseMapper().selectList(queryWrapper));
+    }
+
 }

src/main/java/com/sqx/modules/post/controller/ViewPostController.java

@@ -7,10 +7,9 @@ import com.sqx.modules.post.entity.ViewPost;
 import com.sqx.modules.post.service.ViewPostService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
 
 @RestController
 @RequestMapping("/app/viewPost")
@@ -20,20 +19,23 @@ public class ViewPostController {
     @Login
     @GetMapping("getViewPost")
     @ApiOperation("获取查看的岗位列表")
-    public Result getViewPost(Integer userId){
+    public Result getViewPost(@RequestAttribute("userId") Long userId){
 
         return  Result.success().put("data",viewPostService.getViewPostList(userId));
 
     }
+
+    @Login
     @GetMapping("getCollectPost")
     @ApiOperation("获取收藏的岗位列表")
-    public Result getCollectPost(Integer userId) {
+    public Result getCollectPost(@RequestAttribute("userId") Long userId) {
 
         return  Result.success().put("data",viewPostService.getCollectPost(userId));
     }
+    @Login
     @PostMapping("collectPost")
     @ApiOperation("是否收藏岗位")
-    public Result  collectPost(Integer userId,Integer postId,Integer isCollect){
+    public Result  collectPost(@RequestAttribute("userId") Integer userId,Integer postId,Integer isCollect){
         QueryWrapper<ViewPost> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("user_id",userId).eq("post_id",postId);
         ViewPost viewPost = viewPostService.getOne(queryWrapper);
@@ -41,4 +43,23 @@ public class ViewPostController {
         viewPostService.saveOrUpdate(viewPost);
         return  Result.success();
     }
+
+    @Login
+    @PostMapping("pushPost")
+    @ApiOperation("投送简历")
+    public Result pushPost(@RequestAttribute("userId")  Long userId, String postId) {
+        QueryWrapper<ViewPost> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user_id", userId).eq("post_id", postId);
+        ViewPost viewPost = viewPostService.getOne(queryWrapper);
+        viewPost.setIsPush(1);
+        viewPost.setCreatTime(String.valueOf(LocalDateTime.now()));
+        viewPostService.saveOrUpdate(viewPost);
+        return Result.success();
+    }
+    @Login
+    @GetMapping("gerPushost")
+    @ApiOperation("获取收藏的岗位列表")
+    public Result getPushPost(@RequestAttribute("userId") Long userId) {
+        return  Result.success().put("data",viewPostService.getPushPost(userId));
+    }
 }

src/main/java/com/sqx/modules/post/dao/ViewPostDao.java

@@ -5,5 +5,5 @@ import com.sqx.modules.post.entity.ViewPost;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-public interface ViewPostDao extends BaseMapper<ViewPost> {
+public interface ViewPostDao extends BaseMapper<ViewPost> { ;
 }

src/main/java/com/sqx/modules/post/entity/PostEntity.java

@@ -43,7 +43,7 @@ public class PostEntity implements Serializable {
     /**
      * 薪资范围
      */
-    private String wage;
+    private Integer wage;
     /**
      * 福利tag
      */
@@ -67,7 +67,7 @@ public class PostEntity implements Serializable {
     /**
      * 招聘发布人Id
      */
-    private Integer userId;
+    private Long userId;
 
     /**
      * 招聘公司id
@@ -87,4 +87,5 @@ public class PostEntity implements Serializable {
      * 更新时间
      */
     private String updateTime;
+    private  Integer wageTime;
 }

src/main/java/com/sqx/modules/post/entity/ViewPost.java

@@ -12,7 +12,7 @@ public class ViewPost implements Serializable {
     private Integer viewPostId;
 
     /** 用户id */
-    private Integer userId;
+    private Long userId;
 
     /** 查看简历id */
     private Integer postId;
@@ -22,4 +22,6 @@ public class ViewPost implements Serializable {
 
     /** 创建时间 */
     private String creatTime;
+
+    private  Integer isPush;
 }

src/main/java/com/sqx/modules/post/mapper/PostMapper.java

@@ -13,9 +13,11 @@ public interface PostMapper extends BaseMapper<PostEntity> {
 
     List<Object> selectPostOne(Integer postId);
 
-    List<Object> findPost(String address, String wage, String exp, String companyPeople, String key);
+    List<Object> findPost(String address, Integer wage, Integer exp, Integer companyPeople, String key);
 
-    List<Object> getViewPostList(Integer userId);
+    List<Object> getViewPostList(Long userId);
 
-    List<Object> getCollectPostList(Integer userId);
+    List<Object> getCollectPostList(Long userId);
+
+    List<Object> getPushPost(Long userId);
 }

src/main/java/com/sqx/modules/post/service/PostService.java

@@ -11,5 +11,5 @@ public interface PostService extends IService<PostEntity>  {
 
     List<Object> getPostListOne(Integer postId);
 
-    List<Object> findPost(String address, String wage, String exp, String companyPeople, String key);
+    List<Object> findPost(String address, Integer wage, Integer edu, Integer companyPeople, String key);
 }

src/main/java/com/sqx/modules/post/service/ViewPostService.java

@@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.sqx.modules.post.entity.ViewPost;
 
 public interface ViewPostService extends IService<ViewPost> {
-    void addViewPost(Integer postId, Integer userId);
+    void addViewPost(Integer postId, Long userId);
 
-    Object getViewPostList(Integer userId);
+    Object getViewPostList(Long userId);
 
-    Object getCollectPost(Integer userId);
+    Object getCollectPost(Long userId);
+
+    Object getPushPost(Long userId);
 }

src/main/java/com/sqx/modules/post/service/impl/PostServiceImpl.java

@@ -29,7 +29,7 @@ public class PostServiceImpl extends ServiceImpl<PostDao, PostEntity> implements
     }
 
     @Override
-    public List<Object> findPost(String address, String wage, String exp, String companyPeople, String key) {
-        return  postMapper.findPost(address,wage,exp,companyPeople,key);
+    public List<Object> findPost(String address, Integer wage, Integer edu, Integer companyPeople, String key) {
+        return  postMapper.findPost(address,wage,edu,companyPeople,key);
     }
 }

src/main/java/com/sqx/modules/post/service/impl/ViewPostServiceImpl.java

@@ -18,7 +18,7 @@ public class ViewPostServiceImpl  extends ServiceImpl<ViewPostDao,ViewPost> impl
     }
 
     @Override
-    public void addViewPost(Integer postId, Integer userId) {
+    public void addViewPost(Integer postId, Long userId) {
         QueryWrapper<ViewPost> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("user_id",userId).eq("post_id",postId);
         if (getBaseMapper().selectOne(queryWrapper) == null ){
@@ -33,12 +33,17 @@ public class ViewPostServiceImpl  extends ServiceImpl<ViewPostDao,ViewPost> impl
     }
 
     @Override
-    public Object getViewPostList(Integer userId) {
+    public Object getViewPostList(Long userId) {
         return postMapper.getViewPostList(userId);
     }
 
     @Override
-    public Object getCollectPost(Integer userId) {
+    public Object getCollectPost(Long userId) {
         return postMapper.getCollectPostList(userId);
     }
+
+    @Override
+    public Object getPushPost(Long userId) {
+        return postMapper.getPushPost(userId);
+    }
 }

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

@@ -209,14 +209,6 @@ public class Resumes implements Serializable {
 
     @TableField(exist = false)
     private String avatar;
-    /**
-     * 最低期望薪资
-     */
-    private  String minWage;
-    /**
-     * 最高期望薪资
-     */
-    private  String maxWage;
     /**
      * 是否有跨境工作经验
      */
@@ -224,7 +216,7 @@ public class Resumes implements Serializable {
     /**
      * 生日
      */
-    private DateTime birthday;
+    private String birthday;
     /**
      * 个人优势
      */

src/main/resources/mapper/interviewRecord/InterviewRecord.xml

@@ -8,4 +8,14 @@
         where TIMESTAMPDIFF(HOUR,NOW(), i.interview_date_time) + 1 = #{hour} and status = 2
         order by i.create_time desc
     </select>
+    <select id="selectInterviewList">
+        select i.interview_record_id,i.interview_date_time, c.company_logo ,c.company_name ,p.rule_classify_name, p.wage ,i.`status`
+        from `interview_record` i
+        left join tb_user u on i.interviewer_id = u.user_id
+        left join post p on i.post_id = p.post_id
+        left join company c on p.company_id = c.company_id
+        where i.interviewer_id = #{userId}
+        order by  interview_date_time
+    </select>
+
 </mapper>

src/main/resources/mapper/post/PostDetailVO.xml

@@ -14,6 +14,7 @@
         p.wage AS wage,
         p.address AS address,
         p.if_due AS ifDue,
+        p.wage_time AS wageTime,
         c.company_id AS companyId,
         c.company_name AS companyName,
         c.company_people as companyPeople,
@@ -36,6 +37,7 @@
             p.rule_classify_name AS ruleClassifyName,
             p.post_im_tag AS postImTag,
             p.post_describe AS postDescribe,
+            p.wage_time AS wageTime,
         p.exp AS exp,
         p.edu AS edu,
         p.wage AS wage,
@@ -66,6 +68,7 @@
             p.wage AS wage,
             p.address AS address,
             p.if_due AS ifDue,
+            p.wage_time AS wageTime,
             c.company_id AS companyId,
             c.company_name AS companyName,
             c.company_people as companyPeople,
@@ -92,8 +95,8 @@
         <if test="wage!=null and wage!=0">
             and p.wage=#{wage}
         </if>
-        <if test="exp!=null and exp!=0">
-            and p.exp=#{exp}
+        <if test="edu!=null and edu!=0">
+            and p.edu &lt;= #{edu}
         </if>
         <if test="companyPeople!=null and companyPeople!=0">
             and c.company_people=#{companyPeople}
@@ -107,6 +110,7 @@
             p.wage AS wage,
             p.address AS address,
             p.if_due AS ifDue,
+            p.wage_time AS wageTime,
             c.company_id AS companyId,
             c.company_name AS companyName,
             c.company_people as companyPeople,
@@ -123,33 +127,67 @@
         WHERE
             p.status = 1
         and v.user_id = #{userId}
+        ORDER BY v.creat_time desc;
+
 
     </select>
     <select id="getCollectPostList" resultType="com.sqx.modules.post.dto.SelectAllDto">
         SELECT
             p.post_id AS postId,
             p.rule_classify_name AS ruleClassifyName,
-            p.post_im_tag AS postImTag,
-            p.wage AS wage,
-            p.address AS address,
+             p.post_im_tag AS postImTag,
+             p.wage AS wage,
+             p.address AS address,
             p.if_due AS ifDue,
-            c.company_id AS companyId,
-            c.company_name AS companyName,
+            p.wage_time AS wageTime,
+             c.company_id AS companyId,
             c.company_people as companyPeople,
-            h.hr_img AS hrImg,
-            h.hr_name AS hrName
-        FROM
+             h.hr_img AS hrImg,
+             h.hr_name AS hrName
+         FROM
             view_post v
                 LEFT JOIN
             post p on v.post_id = p.post_id
                 LEFT JOIN
-            company c ON p.company_id = c.company_id
+                company c ON p.company_id = c.company_id
                 LEFT JOIN
             hr h  ON  p.user_id = h.user_id
-        WHERE
+         WHERE
             p.status = 1
           and v.is_collect = 1
-          and v.user_id = #{userId}
+           and v.user_id = #{userId}
+            ORDER BY v.creat_time desc;
+
 
     </select>
+
+<select id="getPushPost" resultType="com.sqx.modules.post.dto.SelectAllDto">
+SELECT
+    p.post_id AS postId,
+    p.rule_classify_name AS ruleClassifyName,
+    p.post_im_tag AS postImTag,
+    p.wage AS wage,
+    p.address AS address,
+    p.if_due AS ifDue,
+    p.wage_time AS wageTime,
+    c.company_id AS companyId,
+    c.company_name AS companyName,
+    c.company_people as companyPeople,
+    h.hr_img AS hrImg,
+    h.hr_name AS hrName
+FROM
+    view_post v
+        LEFT JOIN
+    post p on v.post_id = p.post_id
+        LEFT JOIN
+    company c ON p.company_id = c.company_id
+        LEFT JOIN
+    hr h  ON  p.user_id = h.user_id
+WHERE
+    p.status = 1
+  and v.is_push = 1
+  and v.user_id = #{userId}
+ORDER BY v.creat_time desc;
+
+</select>
 </mapper>

src/main/resources/mapper/workExp/workExp.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sqx.modules.firstLogin.dao.WorkExpDao">
+   <select id="selectWorkExpList" resultType="com.sqx.modules.firstLogin.dto.WorkExpDto">
+    select *
+    from work_exp w
+    left join work_exp_detail d on w.work_exp_id = d.work_exp_id
+    where w.user_id = #{userId}
+    and w.is_use = 1
+    </select>
+    <select id="selectWorkExpOne" resultType="com.sqx.modules.firstLogin.dto.WorkExpDto">
+        select *
+        from work_exp w
+                 left join work_exp_detail d on w.work_exp_id = d.work_exp_id
+        where w.work_exp_id = #{workExpId}
+          and w.is_use = 1
+    </select>
+</mapper>