招聘端统计

src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java

@@ -1151,18 +1151,27 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
         HashMap<String, Object> map = new HashMap<>();
         UserEntity userEntity = baseMapper.selectById(userId);
         QueryWrapper<UserBrowse> wrapper = new QueryWrapper<UserBrowse>().eq("user_id", userId);
+        QueryWrapper<MyCollection> queryWrapper =new QueryWrapper<MyCollection>().eq("user_id",userId);
+        QueryWrapper<SendRecord> queryWrapper1 =new QueryWrapper<>();
+        QueryWrapper<InterviewRecord>queryWrapper2 =new QueryWrapper<>();
         //个人
         if (userEntity.getUserType() == 1) {
             wrapper.eq("browse_type", 1);
+            queryWrapper.eq("type",1);
+            queryWrapper1.eq("user_id",userId);
+            queryWrapper2.eq("interviewer_id",userId);
             //企业
         } else {
             wrapper.eq("browse_type", 2);
+            queryWrapper.eq("type",2);
+            queryWrapper1.eq("company_user_id",userId);
+            queryWrapper2.eq("user_id",userId);
         }
         int browseCount = userBrowseService.count(wrapper);
-        int collectionCount = collectionService.count(new QueryWrapper<MyCollection>().eq("user_id", userId));
-        int deliveryCount = sendRecordService.count(new QueryWrapper<SendRecord>().eq("user_id", userId));
+        int collectionCount = collectionService.count(queryWrapper);
+        int deliveryCount = sendRecordService.count(queryWrapper1);
         int chatCount = chatConversationService.count(new QueryWrapper<ChatConversation>().eq("user_id",userId));
-        int interviewCount = interviewRecordService.count(new QueryWrapper<InterviewRecord>().eq("interviewer_id",userId));
+        int interviewCount = interviewRecordService.count(queryWrapper2);
         //浏览记录
         map.put("browseCount", browseCount);
         //收藏记录

src/main/java/com/sqx/modules/app/vo/ResumesBrowseVo.java

@@ -2,6 +2,7 @@ package com.sqx.modules.app.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.sqx.modules.resumes.entity.Resumes;
+import com.sqx.modules.resumes.entity.ResumesListDto;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -32,5 +33,5 @@ public class ResumesBrowseVo extends Resumes implements Serializable {
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime bUpdateTime;
-
+    private ResumesListDto resumesListDto;
 }

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

@@ -1,22 +1,25 @@
 package com.sqx.modules.chat.controller.app;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sqx.common.utils.Result;
 import com.sqx.modules.app.annotation.Login;
+import com.sqx.modules.chat.entity.ChatContent;
 import com.sqx.modules.chat.entity.ChatConversation;
 import com.sqx.modules.chat.service.ChatContentService;
 import com.sqx.modules.chat.service.ChatConversationService;
 import com.sqx.modules.common.service.CommonInfoService;
 import com.sqx.modules.message.entity.MessageInfo;
 import com.sqx.modules.message.service.MessageService;
+import com.sqx.modules.resumes.dao.ResumesDao;
+import com.sqx.modules.resumes.entity.ResumesListDto;
 import com.sqx.modules.utils.TLSSigAPIv2;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 @RestController
 @Api(value = "聊天", tags = {"聊天"})
@@ -31,6 +34,8 @@ public class AppChatController {
     private MessageService messageService;
     @Autowired
     private CommonInfoService commonInfoService;
+    @Autowired
+    private ResumesDao resumesDao;
 
     @Login
     @GetMapping("/selectChatConversationPage")
@@ -139,6 +144,24 @@ public class AppChatController {
         return chatContentService.updateChatContent(chatContentId, videoStatus, voiceLength);
     }
 
-
+    @Login
+    @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"));
+
+        Set<ResumesListDto> tempSet = new LinkedHashSet<>();
+        for(ChatContent chatContent:list){
+            ResumesListDto resumesListDto =new ResumesListDto();
+            resumesListDto.setResumesId(chatContent.getResumesId());
+           tempSet.addAll(resumesDao.selectResumesListHr(resumesListDto));
+        }
+        List<ResumesListDto> list1 = new ArrayList<>(tempSet);
+        Integer currentPage = (page == null || page < 1) ? 1 : page;
+        Integer pageSize = (limit == null || limit < 1) ? 10 : limit;
+        Page<ResumesListDto> page1 =new Page<>(currentPage,pageSize);
+        page1.setRecords(list1);
+        return page1;
+    }
 
 }

src/main/java/com/sqx/modules/chat/entity/ChatContent.java

@@ -1,13 +1,16 @@
 package com.sqx.modules.chat.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
+import com.sqx.modules.resumes.entity.ResumesListDto;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 聊天内容对象 chat_content
@@ -63,5 +66,7 @@ public class ChatContent {
     private Long resumesId;
 
     private Integer userType;
+    @TableField(exist = false)
+    private List<ResumesListDto> list;
 
 }

src/main/java/com/sqx/modules/chats/controller/app/AppChatsController.java

@@ -1,17 +1,27 @@
 package com.sqx.modules.chats.controller.app;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sqx.modules.app.annotation.Login;
+import com.sqx.modules.chat.entity.ChatContent;
+import com.sqx.modules.chat.service.ChatContentService;
 import com.sqx.modules.chats.entity.Chats;
 import com.sqx.modules.chats.service.ChatsContentService;
 import com.sqx.modules.chats.service.ChatsService;
 import com.sqx.modules.chats.utils.Result;
+import com.sqx.modules.resumes.dao.ResumesDao;
+import com.sqx.modules.resumes.entity.ResumesListDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @RestController
 @Api(value="聊天会话",tags={"聊天会话"})
 @RequestMapping(value = "/app/chats")

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

@@ -4,7 +4,9 @@ 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.app.entity.UserBrowse;
 import com.sqx.modules.app.entity.UserEntity;
+import com.sqx.modules.app.service.UserBrowseService;
 import com.sqx.modules.app.service.UserService;
 import com.sqx.modules.firstLogin.dto.WorkExpDto;
 import com.sqx.modules.firstLogin.entity.*;
@@ -46,6 +48,8 @@ public class UserFirstRegistController {
     private IntentionService intentionService;
     @Autowired
     private WorkExpDetailService workExpDetailService;
+    @Autowired
+    private UserBrowseService userBrowseService;
 
 
     @Login
@@ -82,6 +86,29 @@ public class UserFirstRegistController {
         return Result.success().put("data",resumesDto);
     }
     @Login
+    @GetMapping
+    @ApiOperation("获取简历详情")
+    public Result getResumesByResumesId(@RequestAttribute("userId")Long userId, Long resumesId){
+        ResumesDto resumesDto =new ResumesDto();
+        Resumes resumes = resumesService.getById(resumesId);
+        String userId1 = String.valueOf(resumes.getUserId());
+        resumesDto.setUserEntity(userService.getById(userId1));
+        resumesDto.setResumeList( resumes);
+        resumesDto.setEduList(eduService.selectEdu(Integer.valueOf(userId1)));
+        resumesDto.setIntentions(intentionService.getIntention(Long.valueOf(userId1)));
+        resumesDto.setWorkExps(workExpService.selectWorkExpOnly(Long.valueOf(userId1)));
+        resumesDto.setWorkExpList(workExpService.selectWorkExp(Integer.valueOf(userId1)));
+        resumesDto.setSkills(skillService.selectSkill(Integer.valueOf(userId1)));
+        resumesDto.setWorkExpTimes(workExpService.getWorkTime(Long.valueOf(userId1)));
+        UserBrowse userBrowse =new UserBrowse();
+        userBrowse.setUserId(userId);
+        userBrowse.setResumesId(resumesId);
+        userBrowse.setBrowseType(2);
+        userBrowse.setUpdateTime(LocalDateTime.now());
+        userBrowseService.save(userBrowse);
+        return Result.success().put("data",resumesDto);
+    }
+    @Login
     @GetMapping ("getWorkExpDetailOne")
     @ApiOperation("获取简历信息")
     public Result getWorkExpDetailOne(Long workExpId) {
@@ -125,6 +152,9 @@ public class UserFirstRegistController {
         List<WorkExpDetail> workExpDetails = workExp.getWorkExpDetails();
         workExpDetails.forEach(workExpDetail -> workExpDetail.setWorkExpId(workExp1.getWorkExpId()));
         workExpDetails.forEach(workExpDetail ->workExpDetailService.saveOrUpdate(workExpDetail));
+        Resumes resumes = resumesService.getOne(new QueryWrapper<Resumes>().eq("user_id",userId));
+        int times = workExpService.getWorkTime(userId);
+        resumes.setResumesWorkExperience(String.valueOf(times));
         return Result.success();
     }
     @Login
@@ -134,6 +164,9 @@ public class UserFirstRegistController {
         edu.setUserId(userId);
         edu.setIsUse(1);
         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());
         return Result.success();
     }
     @Login

src/main/java/com/sqx/modules/myCollection/controller/AdminMyCollectionController.java

@@ -36,9 +36,9 @@ public class AdminMyCollectionController {
     @Login
     @GetMapping(value = "getCompanyCollectionList")
     @ApiOperation("企业获取我的收藏列表")
-    public Result getCompanyCollectionList(Integer page, Integer limit, MyCollection collection, Resumes resumes) {
+    public Result getCompanyCollectionList(@RequestAttribute("userId")Long userId, Integer page, Integer limit, MyCollection collection, Resumes resumes) {
         collection.setType(2);
-        return Result.success().put("data", collectionService.getCompanyCollectionList(page, limit, collection, resumes));
+        return Result.success().put("data", collectionService.getCompanyCollectionList(page, limit, collection, resumes,userId));
     }
 
     @Login

src/main/java/com/sqx/modules/myCollection/controller/MyCollectionController.java

@@ -50,7 +50,7 @@ public class MyCollectionController {
     public Result getCompanyCollectionList(Integer page, Integer limit, @RequestAttribute("userId") Long userId, MyCollection collection, Resumes resumes) {
         collection.setUserId(userId);
         collection.setType(2);
-        return Result.success().put("data", collectionService.getCompanyCollectionList(page, limit, collection, resumes));
+        return Result.success().put("data", collectionService.getCompanyCollectionList(page, limit, collection, resumes,userId));
     }
 
     @Login

src/main/java/com/sqx/modules/myCollection/dao/MyCollectionDao.java

@@ -1,5 +1,6 @@
 package com.sqx.modules.myCollection.dao;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sqx.modules.app.vo.ResumesBrowseVo;
@@ -25,4 +26,6 @@ public interface MyCollectionDao extends BaseMapper<MyCollection> {
     IPage<UserPostPushBrowseVo> getMyCollectionList(@Param("pages") Page<UserPostPushBrowseVo> pages, @Param("collection") MyCollection collection, @Param("postPush") PostPush postPush, @Param("industry") String[] industry, @Param("education") String[] education, @Param("experience") String[] experience, @Param("companyPeople") String[] companyPeople, @Param("salaryRange") String[] salaryRange);
 
     IPage<ResumesBrowseVo> getCompanyCollectionList(@Param("pages") Page<ResumesBrowseVo> pages, @Param("collection") MyCollection collection, @Param("resumes") Resumes resumes, @Param("resumesCompensation") String[] resumesCompensation, @Param("resumesEducation") String[] resumesEducation, @Param("resumesWorkExperience") String[] resumesWorkExperience, @Param("industryName") String[] industryName);
+
+    IPage<ResumesBrowseVo> selectPage(Page<ResumesBrowseVo> pages, QueryWrapper<MyCollection> queryWrapper);
 }

src/main/java/com/sqx/modules/myCollection/entity/MyCollection.java

@@ -7,10 +7,12 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.sqx.modules.app.entity.UserEntity;
 import com.sqx.modules.resumes.entity.Company;
 import com.sqx.modules.resumes.entity.PostPush;
+import com.sqx.modules.resumes.entity.ResumesListDto;
 import lombok.Data;
 
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -48,6 +50,8 @@ public class MyCollection implements Serializable {
      * 简历id
      */
     private Integer resumesId;
+    @TableField(exist = false)
+    private List<ResumesListDto> resumesListDto;
 
     /**
      * 创建时间

src/main/java/com/sqx/modules/myCollection/service/MyCollectionService.java

@@ -25,5 +25,5 @@ public interface MyCollectionService extends IService<MyCollection> {
 
     IPage<MyCollection> getMyCollectionList(Integer page, Integer limit, MyCollection collection);
 
-    IPage<ResumesBrowseVo> getCompanyCollectionList(Integer page, Integer limit, MyCollection collection, Resumes resumes);
+    IPage<MyCollection> getCompanyCollectionList(Integer page, Integer limit, MyCollection collection, Resumes resumes,Long userId);
 }

src/main/java/com/sqx/modules/myCollection/service/impl/MyCollectionServiceImpl.java

@@ -11,9 +11,11 @@ import com.sqx.modules.myCollection.entity.MyCollection;
 import com.sqx.modules.myCollection.dao.MyCollectionDao;
 import com.sqx.modules.myCollection.service.MyCollectionService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sqx.modules.resumes.dao.ResumesDao;
 import com.sqx.modules.resumes.entity.PostPush;
 import com.sqx.modules.resumes.entity.Resumes;
 import com.sqx.modules.resumes.entity.ResumesDetails;
+import com.sqx.modules.resumes.entity.ResumesListDto;
 import com.sqx.modules.resumes.service.CompanyService;
 import com.sqx.modules.resumes.service.PostPushService;
 import com.sqx.modules.resumes.service.ResumesDetailsService;
@@ -40,6 +42,10 @@ public class MyCollectionServiceImpl extends ServiceImpl<MyCollectionDao, MyColl
     private PostPushService postPushService;
     @Autowired
     private ResumesDetailsService resumesDetailsService;
+    @Autowired
+    private MyCollectionService myCollectionService;
+    @Autowired
+    private ResumesDao resumesDao;
 
     @Override
     public Result saveCollection(MyCollection collection) {
@@ -78,8 +84,8 @@ public class MyCollectionServiceImpl extends ServiceImpl<MyCollectionDao, MyColl
     }
 
     @Override
-    public IPage<ResumesBrowseVo> getCompanyCollectionList(Integer page, Integer limit, MyCollection collection, Resumes resumes) {
-        Page<ResumesBrowseVo> pages;
+    public IPage<MyCollection> getCompanyCollectionList(Integer page, Integer limit, MyCollection collection, Resumes resumes, Long userId) {
+        Page<MyCollection> pages;
         if (page != null && limit != null) {
             pages = new Page<>(page, limit);
         } else {
@@ -87,16 +93,24 @@ public class MyCollectionServiceImpl extends ServiceImpl<MyCollectionDao, MyColl
             pages.setSize(-1);
         }
 
-        String[] resumesCompensation = StringUtils.isNotBlank(resumes.getResumesCompensation()) ? resumes.getResumesCompensation().split(",") : null;
-        String[] resumesEducation = StringUtils.isNotBlank(resumes.getResumesEducation()) ? resumes.getResumesEducation().split(",") : null;
-        String[] resumesWorkExperience = StringUtils.isNotBlank(resumes.getResumesWorkExperience()) ? resumes.getResumesWorkExperience().split(",") : null;
-        String[] industryName = StringUtils.isNotBlank(resumes.getIndustryName()) ? resumes.getIndustryName().split(",") : null;
-
-
-        IPage<ResumesBrowseVo> companyCollectionList = baseMapper.getCompanyCollectionList(pages, collection, resumes, resumesCompensation, resumesEducation, resumesWorkExperience, industryName);
-        for (ResumesBrowseVo record : companyCollectionList.getRecords()) {
-            record.setResumesCompanyList(resumesDetailsService.list(new QueryWrapper<ResumesDetails>().eq("resumes_id", record.getResumesId()).eq("resumes_classify", 1)));
-
+//        String[] resumesCompensation = StringUtils.isNotBlank(resumes.getResumesCompensation()) ? resumes.getResumesCompensation().split(",") : null;
+//        String[] resumesEducation = StringUtils.isNotBlank(resumes.getResumesEducation()) ? resumes.getResumesEducation().split(",") : null;
+//        String[] resumesWorkExperience = StringUtils.isNotBlank(resumes.getResumesWorkExperience()) ? resumes.getResumesWorkExperience().split(",") : null;
+//        String[] industryName = StringUtils.isNotBlank(resumes.getIndustryName()) ? resumes.getIndustryName().split(",") : null;
+
+
+//        IPage<ResumesBrowseVo> companyCollectionList = baseMapper.getCompanyCollectionList(pages, collection, resumes, resumesCompensation, resumesEducation, resumesWorkExperience, industryName);
+//        for (ResumesBrowseVo record : companyCollectionList.getRecords()) {
+//            record.setResumesCompanyList(resumesDetailsService.list(new QueryWrapper<ResumesDetails>().eq("resumes_id", record.getResumesId()).eq("resumes_classify", 1)));
+//
+//        }
+        QueryWrapper<MyCollection> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user_id",userId).eq("type",2);
+        IPage<MyCollection> companyCollectionList =myCollectionService.getBaseMapper().selectPage(pages,queryWrapper);
+        for (MyCollection c : companyCollectionList.getRecords()){
+            ResumesListDto resumesListDto = new ResumesListDto();
+            resumesListDto.setResumesId(Long.valueOf(c.getResumesId()));
+            c.setResumesListDto(resumesDao.selectResumesListHr(resumesListDto));
         }
         return companyCollectionList;
     }

src/main/java/com/sqx/modules/resumes/controller/app/AppCompanyController.java

@@ -57,6 +57,9 @@ public class AppCompanyController {
         QueryWrapper<Company> queryWrapper =new QueryWrapper<>();
         queryWrapper.eq("user_id",userId).orderByDesc("update_time").last("limit 1 ");
         Company company = companyService.getBaseMapper().selectOne(queryWrapper);
+        if (company==null){
+            return Result.error("未进入公司");
+        }
             if(company.getStatus()==1){
             company.setMessage("审核中");
             return Result.success().put("data",company);

src/main/java/com/sqx/modules/resumes/dao/PostPushDao.java

@@ -23,7 +23,7 @@ public interface PostPushDao extends BaseMapper<PostPush> {
     int insertPostPush(PostPush postPush);
 
 
-    IPage<PostPush> getPostPushList(@Param("page") Page<PostPush> page, @Param("lng") Double lng, @Param("lat") Double lat, @Param("postPush") PostPush postPush, @Param("industry") String[] industry, @Param("education") String[] education, @Param("experience") String[] experience, @Param("companyPeople") String[] companyPeople, @Param("salaryRange") String[] salaryRange, @Param("screen") Integer screen,@Param("isDue")Integer isDue);
+    IPage<PostPush> getPostPushList(@Param("page") Page<PostPush> page, @Param("lng") Double lng, @Param("lat") Double lat, @Param("postPush") PostPush postPush, @Param("industry") String[] industry, @Param("education") String[] education, @Param("experience") String[] experience, @Param("companyPeople") String[] companyPeople, @Param("salaryRange") String[] salaryRange, @Param("screen") Integer screen, @Param("isDue") Integer isDue);
 
     IPage<PostDetails> selectPostList(Page<PostPush> page, Integer ruleClassifyId, String address, Long userId);
 

src/main/java/com/sqx/modules/resumes/dao/ResumesDao.java

@@ -3,7 +3,6 @@ package com.sqx.modules.resumes.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sqx.modules.firstLogin.entity.ResumesDto;
 import com.sqx.modules.resumes.entity.Resumes;
 import com.sqx.modules.resumes.entity.ResumesListDto;
 import org.apache.ibatis.annotations.Mapper;
@@ -29,7 +28,7 @@ public interface ResumesDao extends BaseMapper<Resumes> {
 
     Resumes selectResumesByResumesId(@Param("userId") Long userId, @Param("resumesId") Long resumesId);
 
-    Page<ResumesListDto> selectResumesListHr(Page<ResumesListDto> pages,ResumesListDto resumesDto);
+    List<ResumesListDto> selectResumesListHr(@Param("resumesListDto")ResumesListDto resumesListDto);
 
     IPage<ResumesListDto> selectPage(Page<ResumesListDto> pages, Page<ResumesListDto> resumesListDtoPage);
 }

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

@@ -6,6 +6,9 @@ import lombok.Data;
 public class ResumesListDto {
         // 用户基本信息
         private String userName;
+        private Integer userAge;
+        private Integer userSex;
+        private String  userAvatar;
 
         // 工作经历信息
         private String workType;

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

@@ -165,63 +165,69 @@ public class PostPushServiceImpl extends ServiceImpl<PostPushDao, PostPush> impl
 
     @Override
     public Result savePostPush(PostPush postPush, Long userId) {
+        postPush.setUpdateTime(String.valueOf(LocalDateTime.now()));
         QueryWrapper<CompanyUser> queryWrapper =new QueryWrapper<>();
         queryWrapper.eq("user_id",userId).eq("is_use",1);
         CompanyUser companyUser = companyUserService.getOne(queryWrapper);
         if (companyUser == null) {//初次注册
-            postPush.setStatus(6);
+            postPush.setStatus(1);
+            postPush.setCreateTime(LocalDateTime.now());
+            postPush.setUpdateTime(String.valueOf(LocalDateTime.now()));
             postPushService.saveOrUpdate(postPush);
-            return Result.success("招聘信息已暂存，等待公司认证后再次发布");
+            return Result.success("招聘信息已暂存，等待公司认证后再次发布").put("data",postPush.getPostPushId());
         } else {
             Company company = companyService.getById(companyUser.getCompanyId());
             if (company.getStatus() != 2) {
-                return Result.error("公司信息不完整或未通过审核");
+                return Result.error("公司信息不完整或未通过审核").put("data",postPush.getPostPushId());
             } else {//公司存在判断是更改还是发布新的
                 if (postPush.getPostPushId() != null) {//更改
                     PostPush push = baseMapper.selectById(postPush.getPostPushId());
-                    if (push.getStatus() != 2 && push.getStatus() != 3 && push.getStatus() != 5) {
-                        return Result.error("当前状态不能修改,请先取消");
-                    }
-                    if (push.getStatus() == 5) {
-                        return Result.error("当前招聘信息已过期");
-                    } else {
+//                    if (push.getStatus() != 2 && push.getStatus() != 3 && push.getStatus() != 5) {
+//                        return Result.error("当前状态不能修改,请先取消").put("data",postPush.getPostPushId());
+//                    }
+//                    if (push.getStatus() == 5) {
+//                        return Result.error("当前招聘信息已过期").put("data",postPush.getPostPushId());
+//                    } else {
                         postPush.setCompanyId(companyUser.getCompanyId());
                         postPush.setStatus(1);
+                        postPush.setUpdateTime(String.valueOf(LocalDateTime.now()));
                         baseMapper.updateById(postPush);
-                        return Result.success("更新岗位信息中，请等待审核");
-                    }
+                        return Result.success("更新岗位信息中，请等待审核").put("data",postPush.getPostPushId());
+
                 } else {//新发布,发布岗位相同,不能发布
                     UserEntity userEntity = userService.getById(userId);
                     postPush.setUserId(String.valueOf(userId));
                     postPush.setCompanyId(company.getCompanyId());
+                    postPush.setCreateTime(LocalDateTime.now());
+                    postPush.setUpdateTime(String.valueOf(LocalDateTime.now()));
                     postPush.setStatus(1);
                     QueryWrapper<PostPush> queryWrapperClassify = new QueryWrapper<>();
                     queryWrapperClassify.eq("rule_classify_id", postPush.getRuleClassifyId()).eq("user_id", userId).notIn("status", 3, 4);
                     PayDetails payDetails = payDetailsService.getOne(new QueryWrapper<PayDetails>().eq("order_id", postPush.getOrderId()));
                     Integer count = baseMapper.selectCount(queryWrapperClassify);
                     if (count > 0) {
-                        return Result.error("相同岗位只能发布一条招聘信息");
+                        return Result.error("相同岗位只能发布一条招聘信息").put("data",postPush.getPostPushId());
                     } else {//发布岗位不同
                         if (userEntity.getIsUserVip() == 0) {//发布者是不是vip
                             if (payDetails == null || payDetails.getState() != 1) {
-                                return Result.error("请完成订单支付");
+                                return Result.error("请完成订单支付").put("data",postPush.getPostPushId());
                             } else {
-                                baseMapper.insert(postPush);
-                                return Result.success("新发布的岗位正在审核中请等待");
+                                postPushService.saveOrUpdate(postPush);
+                                return Result.success("新发布的岗位正在审核中请等待").put("data",postPush.getPostPushId());
                             }
                         } else {//发布者是vip
                             if (userEntity.getVipPostTimes() == 0) {//没有免费次数
                                 if (payDetails == null || payDetails.getState() != 1) {
-                                    return Result.error("请完成订单支付");
+                                    return Result.error("请完成订单支付").put("data",postPush.getPostPushId());
                                 } else {
-                                    baseMapper.insert(postPush);
-                                    return Result.success("新发布的岗位正在审核中请等待");
+                                    postPushService.saveOrUpdate(postPush);
+                                    return Result.success("新发布的岗位正在审核中请等待").put("data",postPush.getPostPushId());
                                 }
                             } else {//有免费次数
                                 userEntity.setVipPostTimes(userEntity.getVipPostTimes() - 1);
                                 userService.updateById(userEntity);
-                                baseMapper.insert(postPush);
-                                return Result.success("新发布的岗位正在审核中请等待");
+                                postPushService.saveOrUpdate(postPush);
+                                return Result.success("新发布的岗位正在审核中请等待").put("data",postPush.getPostPushId());
                             }
                         }
                     }

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

@@ -242,7 +242,7 @@ public class ResumesServiceImpl extends ServiceImpl<ResumesDao, Resumes> impleme
             pages = new Page<>();
             pages.setSize(-1);
         }
-    IPage<ResumesListDto> resumesPage = baseMapper.selectResumesListHr(pages,resumesDto) ;
+    List<ResumesListDto> resumesPage = baseMapper.selectResumesListHr(resumesDto) ;
     return Result.success().put("data",resumesPage);
 }
 

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

@@ -71,6 +71,9 @@
     <select id="selectResumesListHr" resultType="com.sqx.modules.resumes.entity.ResumesListDto">
         SELECT
         u.user_name AS userName,
+        u.avatar AS userAvatar,
+        u.sex As userSex,
+        u.age AS userAge,
         last_work.type AS workType,
         last_work.company_name AS companyName,
         last_work.skills AS skills,
@@ -121,7 +124,16 @@
         FROM intention
         WHERE is_default = 1
         GROUP BY user_id
-        ) intent ON u.user_id = intent.user_id;
+        ) intent ON u.user_id = intent.user_id
+    <where>
+<!--        <if test="resumesDto.expectedCity!=null or resumesDto.city==''">-->
+<!--            AND FIND_IN_SET(#{resumesDto.expectedCity}, expectedCity) > 0-->
+<!--        </if>-->
+        <if test="resumesListDto.resumesId !=null or resumesListDto.resumesId==''">
+             resumes.resumes_id = #{resumesListDto.resumesId}
+        </if>
+
+    </where>
     </select>
     <select id="selectResumesListByCompany" resultType="com.sqx.modules.resumes.entity.Resumes">
         SELECT