|
|
@@ -1,5 +1,7 @@
|
|
|
package com.sqx.modules.resumes.service.impl;
|
|
|
|
|
|
+import cn.hutool.core.collection.CollUtil;
|
|
|
+import cn.hutool.json.JSONUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
@@ -16,7 +18,13 @@ 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.firstLogin.entity.ResumesDto;
|
|
|
+import com.sqx.modules.firstLogin.entity.*;
|
|
|
+import com.sqx.modules.firstLogin.service.EduService;
|
|
|
+import com.sqx.modules.firstLogin.service.SkillService;
|
|
|
+import com.sqx.modules.firstLogin.service.WorkExpDetailService;
|
|
|
+import com.sqx.modules.firstLogin.service.WorkExpService;
|
|
|
+import com.sqx.modules.intention.entity.Intention;
|
|
|
+import com.sqx.modules.intention.service.IntentionService;
|
|
|
import com.sqx.modules.message.entity.MessageInfo;
|
|
|
import com.sqx.modules.message.service.MessageService;
|
|
|
import com.sqx.modules.resumes.dao.ResumesDao;
|
|
|
@@ -222,6 +230,21 @@ public class ResumesServiceImpl extends ServiceImpl<ResumesDao, Resumes> impleme
|
|
|
return Result.success();
|
|
|
}
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private EduService eduService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private SkillService skillService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private IntentionService intentionService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private WorkExpService workExpService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private WorkExpDetailService workExpDetailService;
|
|
|
+
|
|
|
@Override
|
|
|
public Result selectResumesList(Integer page, Integer limit, String startTime, String endTime, Resumes resumes) {
|
|
|
IPage<Resumes> resumesPage = baseMapper.selectResumesList(new Page<>(page, limit), startTime, endTime, resumes);
|
|
|
@@ -309,6 +332,27 @@ public class ResumesServiceImpl extends ServiceImpl<ResumesDao, Resumes> impleme
|
|
|
resumes.setAvatar(userEntity.getAvatar());
|
|
|
resumes.setUserName(userEntity.getUserName());
|
|
|
}
|
|
|
+
|
|
|
+ if(true){
|
|
|
+ List<Edu> eduList = eduService.list(new QueryWrapper<Edu>().eq("user_id", resumes.getUserId()).eq("is_use", 1));
|
|
|
+ List<Skill> skillList = skillService.list(new QueryWrapper<Skill>().eq("user_id", resumes.getUserId()).eq("is_use", 1));
|
|
|
+ List<Intention> intentionList = intentionService.list(new QueryWrapper<Intention>().eq("user_id", resumes.getUserId()));
|
|
|
+ List<WorkExp> workExpList = workExpService.list(new QueryWrapper<WorkExp>().eq("user_id", resumes.getUserId()).eq("is_use", 1));
|
|
|
+ if(CollUtil.isNotEmpty(workExpList)){
|
|
|
+ for (WorkExp workExp : workExpList) {
|
|
|
+ List<WorkExpDetail> workExpDetailList = workExpDetailService.list(new QueryWrapper<WorkExpDetail>().eq("work_exp_id", workExp.getWorkExpId()));
|
|
|
+ workExp.setWorkExpDetailList(workExpDetailList);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ resumes.setEduList(eduList);
|
|
|
+ resumes.setSkillList(skillList);
|
|
|
+ resumes.setIntentionList(intentionList);
|
|
|
+ resumes.setWorkExpList(workExpList);
|
|
|
+ /*System.out.println("+++++++++++++++++++++++++++++++++");
|
|
|
+ System.out.println("---------------------------------");*/
|
|
|
+ }
|
|
|
+
|
|
|
return resumes;
|
|
|
}
|
|
|
|