From b782793e25ce56331f8994f2681e94bd423f2c31 Mon Sep 17 00:00:00 2001 From: chenshaohua <635616957@qq.com> Date: Tue, 14 Jul 2026 13:00:57 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=B7=A5=E4=BD=9C=E7=BB=8F?= =?UTF-8?q?=E5=8E=86=E5=92=8C=E6=95=99=E8=82=B2=E7=BB=8F=E5=8E=86=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E7=B1=BB=E4=BD=8D=E7=BD=AE=EF=BC=8C=E6=96=B9=E4=BE=BF?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E7=94=A8=E6=88=B7=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=B7=B1=E7=9A=84=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=202.=E4=BF=AE=E6=94=B9es=E6=8C=89=E7=85=A7=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E6=88=96=E8=80=85=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2=E7=9A=84?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/AppUserEducationController.java | 2 +- .../app/AppUserTrainController.java | 2 +- .../cms/CmsAppUserEducationController.java | 2 +- .../cms/CmsAppUserTrainController.java | 2 +- .../cms/mapper/AppUserEducationMapper.java | 4 +- .../ruoyi/cms/mapper/AppUserTrainMapper.java | 4 +- .../cms/service/IAppUserEducationService.java | 2 +- .../cms/service/IAppUserTrainService.java | 2 +- .../impl/AppUserEducationServiceImpl.java | 2 +- .../cms/service/impl/AppUserServiceImpl.java | 50 +++++++++++++++++++ .../service/impl/AppUserTrainServiceImpl.java | 2 +- .../cms/service/impl/ESJobSearchImpl.java | 44 +++++++++------- .../mapper/app/AppUserEducationMapper.xml | 18 +++++++ .../mapper/app/AppUserTrainMapper.xml | 17 +++++++ .../core/domain/entity}/AppUserEducation.java | 2 +- .../core/domain/entity}/AppUserTrain.java | 4 +- .../core/domain/model/RegisterBody.java | 6 +++ 17 files changed, 134 insertions(+), 31 deletions(-) rename {ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain => ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity}/AppUserEducation.java (97%) rename {ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain => ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity}/AppUserTrain.java (92%) diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserEducationController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserEducationController.java index 5a0e302..24c81e5 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserEducationController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserEducationController.java @@ -1,6 +1,6 @@ package com.ruoyi.cms.controller.app; -import com.ruoyi.cms.domain.AppUserEducation; +import com.ruoyi.common.core.domain.entity.AppUserEducation; import com.ruoyi.cms.service.IAppUserEducationService; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserTrainController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserTrainController.java index 022027b..9b88338 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserTrainController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserTrainController.java @@ -1,6 +1,6 @@ package com.ruoyi.cms.controller.app; -import com.ruoyi.cms.domain.AppUserTrain; +import com.ruoyi.common.core.domain.entity.AppUserTrain; import com.ruoyi.cms.service.IAppUserTrainService; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserEducationController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserEducationController.java index aab07c4..0e4cab4 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserEducationController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserEducationController.java @@ -1,6 +1,6 @@ package com.ruoyi.cms.controller.cms; -import com.ruoyi.cms.domain.AppUserEducation; +import com.ruoyi.common.core.domain.entity.AppUserEducation; import com.ruoyi.cms.service.IAppUserEducationService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserTrainController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserTrainController.java index a5437c6..0fb63ad 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserTrainController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserTrainController.java @@ -1,6 +1,6 @@ package com.ruoyi.cms.controller.cms; -import com.ruoyi.cms.domain.AppUserTrain; +import com.ruoyi.common.core.domain.entity.AppUserTrain; import com.ruoyi.cms.service.IAppUserTrainService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppUserEducationMapper.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppUserEducationMapper.java index 1608884..6da44ff 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppUserEducationMapper.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppUserEducationMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.cms.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cms.domain.AppUserEducation; +import com.ruoyi.common.core.domain.entity.AppUserEducation; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -18,4 +18,6 @@ public interface AppUserEducationMapper extends BaseMapper * 根据用户ID查询全部学历（APP简历使用） */ List selectEducationListByUserId(@Param("userId") Long userId); + + void batchInsert(@Param("appUserEducations") List appUserEducations); } \ No newline at end of file diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppUserTrainMapper.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppUserTrainMapper.java index 83a2319..019f261 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppUserTrainMapper.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppUserTrainMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.cms.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cms.domain.AppUserTrain; +import com.ruoyi.common.core.domain.entity.AppUserTrain; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -19,4 +19,6 @@ public interface AppUserTrainMapper extends BaseMapper * 根据用户ID查询全部培训记录 */ List selectTrainListByUserId(@Param("userId") Long userId); + + void batchInsert(@Param("appUserTrains") List appUserTrains); } \ No newline at end of file diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserEducationService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserEducationService.java index b25ed44..cc38cd7 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserEducationService.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserEducationService.java @@ -1,6 +1,6 @@ package com.ruoyi.cms.service; -import com.ruoyi.cms.domain.AppUserEducation; +import com.ruoyi.common.core.domain.entity.AppUserEducation; import java.util.List; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserTrainService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserTrainService.java index 3d1b761..6e354be 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserTrainService.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserTrainService.java @@ -1,6 +1,6 @@ package com.ruoyi.cms.service; -import com.ruoyi.cms.domain.AppUserTrain; +import com.ruoyi.common.core.domain.entity.AppUserTrain; import java.util.List; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserEducationServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserEducationServiceImpl.java index 0538e86..a8b5781 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserEducationServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserEducationServiceImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.cms.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.cms.domain.AppUserEducation; +import com.ruoyi.common.core.domain.entity.AppUserEducation; import com.ruoyi.cms.mapper.AppUserEducationMapper; import com.ruoyi.cms.service.IAppUserEducationService; import org.springframework.stereotype.Service; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java index a86411d..0e48494 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java @@ -7,6 +7,8 @@ import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.ruoyi.common.core.domain.entity.AppUserEducation; +import com.ruoyi.common.core.domain.entity.AppUserTrain; import com.ruoyi.cms.util.http.HttpClientUtils; import com.ruoyi.cms.util.http.JsonUtil; import com.ruoyi.common.constant.CacheConstants; @@ -55,6 +57,12 @@ public class AppUserServiceImpl extends ServiceImpl imple private FileMapper fileMapper; @Autowired private HttpClientUtils httpClientUtils; + //教育经历 + @Autowired + private AppUserEducationMapper appUserEducationMapper; + //培训经历 + @Autowired + private AppUserTrainMapper appUserTrainMapper; //互联网修改个人信息 @Value("${lc_web_auth.editUserInfoUrl}") @@ -587,6 +595,12 @@ public class AppUserServiceImpl extends ServiceImpl imple //修改技能 List skillList=registerBody.getAppSkillsList(); editSkill(skillList,userId); + //修改教育信息 + List educations=registerBody.getAppUserEducations(); + editAppUserEducation(educations,userId); + //修改培训信息 + List trains=registerBody.getAppUserTrains(); + editAppUserTrain(trains,userId); //修改用户信息 AppUser appUser=registerBody.getAppUser(); if(appUser!=null&&appUser.getUserId()!=null){ @@ -630,6 +644,42 @@ public class AppUserServiceImpl extends ServiceImpl imple } } + /** + * 修改教育经历 + * @param list + * @param userId + */ + public void editAppUserEducation(List list, Long userId){ + if(list!=null&&list.size()>0){ + List add=new ArrayList<>(); + list.forEach(it->{ + it.setUserId(userId); + if(it.getId()!=null){appUserEducationMapper.updateById(it);}else{add.add(it);} + }); + if(add.size()>0){ + appUserEducationMapper.batchInsert(add); + } + } + } + + /** + * 修改培训经历 + * @param list + * @param userId + */ + public void editAppUserTrain(List list, Long userId){ + if(list!=null&&list.size()>0){ + List add=new ArrayList<>(); + list.forEach(it->{ + it.setUserId(userId); + if(it.getId()!=null){appUserTrainMapper.updateById(it);}else{add.add(it);} + }); + if(add.size()>0){ + appUserTrainMapper.batchInsert(add); + } + } + } + @Override public List selectNoTmAppUserList(AppUser appUser) { diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserTrainServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserTrainServiceImpl.java index de3bada..13ac944 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserTrainServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserTrainServiceImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.cms.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.cms.domain.AppUserTrain; +import com.ruoyi.common.core.domain.entity.AppUserTrain; import com.ruoyi.cms.mapper.AppUserTrainMapper; import com.ruoyi.cms.service.IAppUserTrainService; import org.springframework.stereotype.Service; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java index dde2fd8..41972bb 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java @@ -545,28 +545,38 @@ public class ESJobSearchImpl implements IESJobSearchService //优化岗位名称查询，只有命中岗位名称或者分类就行 String titleStr = esJobSearch.getJobTitle(); String cateStr = esJobSearch.getJobCategory(); - if (!StringUtil.isEmptyOrNull(titleStr) || !StringUtil.isEmptyOrNull(cateStr)) { + boolean hasTitle = !StringUtil.isEmptyOrNull(titleStr); + boolean hasCate = !StringUtil.isEmptyOrNull(cateStr); + + if (hasTitle || hasCate) { wrapper.and(sub -> { - boolean first = true; - sub.or(); - if (!StringUtil.isEmptyOrNull(titleStr)) { + if (hasTitle) { String[] words = titleStr.split(","); for (String w : words) { - if (!first) sub.or(); - // 同时匹配岗位名称和岗位分类（jobCategory 已存储为标签文字） - sub.match(ESJobDocument::getJobTitle, w, 5.0f); - sub.or(); - sub.match(ESJobDocument::getJobCategory, w, 5.0f); - first = false; + String word = w.trim(); + if (StringUtil.isEmptyOrNull(word)) { + continue; + } + sub.or(inner -> inner + .match(ESJobDocument::getJobTitle, word, 5.0f) + .or() + .match(ESJobDocument::getJobCategory, word, 5.0f) + ); } } - if (!StringUtil.isEmptyOrNull(cateStr)) { - // category 搜索时同时匹配 jobCategory 和 jobTitle，避免因 jobCategory 字段为空而搜不到 - if (!first) sub.or(); - sub.match(ESJobDocument::getJobCategory, cateStr, 5.0f); - first = false; - sub.or(); - sub.match(ESJobDocument::getJobTitle, cateStr, 5.0f); + if (hasCate) { + String[] words = cateStr.split(","); + for (String w : words) { + String word = w.trim(); + if (StringUtil.isEmptyOrNull(word)) { + continue; + } + sub.or(inner -> inner + .match(ESJobDocument::getJobTitle, word, 5.0f) + .or() + .match(ESJobDocument::getJobCategory, word, 5.0f) + ); + } } }); } diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/AppUserEducationMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/AppUserEducationMapper.xml index 92337af..5d61f3b 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/AppUserEducationMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/AppUserEducationMapper.xml @@ -20,6 +20,7 @@ + @@ -51,4 +52,21 @@ order by sort asc + + INSERT INTO app_user_education ( + user_id, school_name, education_level, major, degree, study_type, + start_time, end_time, content, sort, del_flag, create_by, create_time, + update_by, update_time,remark + ) VALUES + + ( + #{item.userId}, #{item.schoolName}, #{item.educationLevel}, + #{item.major}, #{item.degree}, #{item.studyType}, #{item.startTime}, + #{item.endTime}, #{item.content}, #{item.sort}, #{item.delFlag}, + #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, + #{item.remark} + ) + + + \ No newline at end of file diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/AppUserTrainMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/AppUserTrainMapper.xml index 3cb49e8..9278e9d 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/AppUserTrainMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/AppUserTrainMapper.xml @@ -17,6 +17,7 @@ + @@ -48,4 +49,20 @@ order by sort asc + + INSERT INTO app_user_train ( + user_id, train_org, train_course, start_time, end_time, + train_cert, train_content, sort, del_flag, create_by, create_time, + update_by, update_time,remark + ) VALUES + + ( + #{item.userId}, #{item.trainOrg}, #{item.trainCourse}, + #{item.startTime}, #{item.endTime}, #{item.trainCert}, #{item.trainContent}, + #{item.sort}, #{item.delFlag}, #{item.createBy}, #{item.createTime}, + #{item.updateBy}, #{item.updateTime}, #{item.remark} + ) + + + \ No newline at end of file diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/AppUserEducation.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUserEducation.java similarity index 97% rename from ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/AppUserEducation.java rename to ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUserEducation.java index 032ed8f..8a1c313 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/AppUserEducation.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUserEducation.java @@ -1,4 +1,4 @@ -package com.ruoyi.cms.domain; +package com.ruoyi.common.core.domain.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/AppUserTrain.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUserTrain.java similarity index 92% rename from ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/AppUserTrain.java rename to ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUserTrain.java index 21376fb..b2eb1cb 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/AppUserTrain.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUserTrain.java @@ -1,4 +1,4 @@ -package com.ruoyi.cms.domain; +package com.ruoyi.common.core.domain.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -9,8 +9,6 @@ import com.ruoyi.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; @Data @ApiModel("APP求职者培训经历表") diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java index 3996efc..db5dc12 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java @@ -21,6 +21,12 @@ public class RegisterBody extends LoginBody @ApiModelProperty("技能列表") private List appSkillsList; + @ApiModelProperty("教育经历列表") + private List appUserEducations; + + @ApiModelProperty("培训经历列表") + private List appUserTrains; + @ApiModelProperty("公司信息") private Company company;