From 9067dde9e55d570e29c38163697b26af357b6bce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E8=BE=89?= Date: Fri, 26 Jun 2026 12:39:55 +0800 Subject: [PATCH 01/15] skill --- .codex/__MACOSX/._skills | Bin 0 -> 163 bytes .codex/__MACOSX/skills/._.DS_Store | Bin 0 -> 120 bytes .codex/__MACOSX/skills/._inspect-shz-logs | Bin 0 -> 163 bytes .codex/__MACOSX/skills/._query-shz-highgo | Bin 0 -> 163 bytes .../__MACOSX/skills/inspect-shz-logs/._.DS_Store | Bin 0 -> 120 bytes .../__MACOSX/skills/inspect-shz-logs/._SKILL.md | Bin 0 -> 163 bytes .codex/__MACOSX/skills/inspect-shz-logs/._agents | Bin 0 -> 163 bytes .../__MACOSX/skills/inspect-shz-logs/._references | Bin 0 -> 163 bytes .codex/__MACOSX/skills/inspect-shz-logs/._scripts | Bin 0 -> 163 bytes .../skills/inspect-shz-logs/agents/._openai.yaml | Bin 0 -> 163 bytes .../references/._log-locations.md | Bin 0 -> 163 bytes .../skills/inspect-shz-logs/scripts/._view.sh | Bin 0 -> 163 bytes .../__MACOSX/skills/query-shz-highgo/._.DS_Store | Bin 0 -> 120 bytes .../__MACOSX/skills/query-shz-highgo/._.password | Bin 0 -> 163 bytes .../__MACOSX/skills/query-shz-highgo/._SKILL.md | Bin 0 -> 163 bytes .codex/__MACOSX/skills/query-shz-highgo/._agents | Bin 0 -> 163 bytes .../__MACOSX/skills/query-shz-highgo/._references | Bin 0 -> 163 bytes .codex/__MACOSX/skills/query-shz-highgo/._scripts | Bin 0 -> 163 bytes .../skills/query-shz-highgo/agents/._openai.yaml | Bin 0 -> 163 bytes .../query-shz-highgo/references/._connection.md | Bin 0 -> 163 bytes .../skills/query-shz-highgo/scripts/._query.sh | Bin 0 -> 163 bytes .../ruoyi/cms/service/impl/ESJobSearchImpl.java | 2 +- 22 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 .codex/__MACOSX/._skills create mode 100644 .codex/__MACOSX/skills/._.DS_Store create mode 100644 .codex/__MACOSX/skills/._inspect-shz-logs create mode 100644 .codex/__MACOSX/skills/._query-shz-highgo create mode 100644 .codex/__MACOSX/skills/inspect-shz-logs/._.DS_Store create mode 100644 .codex/__MACOSX/skills/inspect-shz-logs/._SKILL.md create mode 100644 .codex/__MACOSX/skills/inspect-shz-logs/._agents create mode 100644 .codex/__MACOSX/skills/inspect-shz-logs/._references create mode 100644 .codex/__MACOSX/skills/inspect-shz-logs/._scripts create mode 100644 .codex/__MACOSX/skills/inspect-shz-logs/agents/._openai.yaml create mode 100644 .codex/__MACOSX/skills/inspect-shz-logs/references/._log-locations.md create mode 100644 .codex/__MACOSX/skills/inspect-shz-logs/scripts/._view.sh create mode 100644 .codex/__MACOSX/skills/query-shz-highgo/._.DS_Store create mode 100644 .codex/__MACOSX/skills/query-shz-highgo/._.password create mode 100644 .codex/__MACOSX/skills/query-shz-highgo/._SKILL.md create mode 100644 .codex/__MACOSX/skills/query-shz-highgo/._agents create mode 100644 .codex/__MACOSX/skills/query-shz-highgo/._references create mode 100644 .codex/__MACOSX/skills/query-shz-highgo/._scripts create mode 100644 .codex/__MACOSX/skills/query-shz-highgo/agents/._openai.yaml create mode 100644 .codex/__MACOSX/skills/query-shz-highgo/references/._connection.md create mode 100644 .codex/__MACOSX/skills/query-shz-highgo/scripts/._query.sh diff --git a/.codex/__MACOSX/._skills b/.codex/__MACOSX/._skills new file mode 100644 index 0000000000000000000000000000000000000000..295701fd01e7a2b242b9fbe206883e20e96480bb GIT binary patch literal 163 zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDI}aUl?c_=|y<2;dkJ5(HHS(lG;wxzV&S oBE&_L^K$Vqox1Ojhs@R)|o50+1L3ClDI}u^SMB_!U6R08`;00ODZ-jv*mIP;rnB Iur73U08|YJ=l}o! literal 0 HcmV?d00001 diff --git a/.codex/__MACOSX/skills/._inspect-shz-logs b/.codex/__MACOSX/skills/._inspect-shz-logs new file mode 100644 index 0000000000000000000000000000000000000000..295701fd01e7a2b242b9fbe206883e20e96480bb GIT binary patch literal 163 zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDI}aUl?c_=|y<2;dkJ5(HHS(lG;wxzV&S oBE&_L^K$Vqox1Ojhs@R)|o50+1L3ClDI}aUl?c_=|y<2;dkJ5(HHS(lG;wxzV&S oBE&_L^K$Vqox1Ojhs@R)|o50+1L3ClDI}u^SMB_!U6R08`;00ODZ-jv*mIP;rnB Iur73U08|YJ=l}o! literal 0 HcmV?d00001 diff --git a/.codex/__MACOSX/skills/inspect-shz-logs/._SKILL.md b/.codex/__MACOSX/skills/inspect-shz-logs/._SKILL.md new file mode 100644 index 0000000000000000000000000000000000000000..295701fd01e7a2b242b9fbe206883e20e96480bb GIT binary patch literal 163 zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDI}aUl?c_=|y<2;dkJ5(HHS(lG;wxzV&S oBE&_L^K$Vqox1Ojhs@R)|o50+1L3ClDI}aUl?c_=|y<2;dkJ5(HHS(lG;wxzV&S oBE&_L^K$Vqox1Ojhs@R)|o50+1L3ClDI}aUl?c_=|y<2;dkJ5(HHS(lG;wxzV&S oBE&_L^K$Vqox1Ojhs@R)|o50+1L3ClDI}aUl?c_=|y<2;dkJ5(HHS(lG;wxzV&S oBE&_L^K$Vqox1Ojhs@R)|o50+1L3ClDI}aUl?c_=|y<2;dkJ5(HHS(lG;wxzV&S oBE&_L^K$Vqox1Ojhs@R)|o50+1L3ClDI}aUl?c_=|y<2;dkJ5(HHS(lG;wxzV&S oBE&_L^K$Vqox1Ojhs@R)|o50+1L3ClDI}aUl?c_=|y<2;dkJ5(HHS(lG;wxzV&S oBE&_L^K$Vqox1Ojhs@R)|o50+1L3ClDI}u^SMB_!U6R08`;00ODZ-jv*mIP;rnB Iur73U08|YJ=l}o! literal 0 HcmV?d00001 diff --git a/.codex/__MACOSX/skills/query-shz-highgo/._.password b/.codex/__MACOSX/skills/query-shz-highgo/._.password new file mode 100644 index 0000000000000000000000000000000000000000..295701fd01e7a2b242b9fbe206883e20e96480bb GIT binary patch literal 163 zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDI}aUl?c_=|y<2;dkJ5(HHS(lG;wxzV&S oBE&_L^K$Vqox1Ojhs@R)|o50+1L3ClDI}aUl?c_=|y<2;dkJ5(HHS(lG;wxzV&S oBE&_L^K$Vqox1Ojhs@R)|o50+1L3ClDI}aUl?c_=|y<2;dkJ5(HHS(lG;wxzV&S oBE&_L^K$Vqox1Ojhs@R)|o50+1L3ClDI}aUl?c_=|y<2;dkJ5(HHS(lG;wxzV&S oBE&_L^K$Vqox1Ojhs@R)|o50+1L3ClDI}aUl?c_=|y<2;dkJ5(HHS(lG;wxzV&S oBE&_L^K$Vqox1Ojhs@R)|o50+1L3ClDI}aUl?c_=|y<2;dkJ5(HHS(lG;wxzV&S oBE&_L^K$Vqox1Ojhs@R)|o50+1L3ClDI}aUl?c_=|y<2;dkJ5(HHS(lG;wxzV&S oBE&_L^K$Vqox1Ojhs@R)|o50+1L3ClDI}aUl?c_=|y<2;dkJ5(HHS(lG;wxzV&S oBE&_L^K Date: Fri, 26 Jun 2026 13:18:51 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E6=B7=BB=E5=8A=A0es=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=98=AFisPublish=20=E7=BC=BA=E5=A4=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/cms/domain/ESJobDocument.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ESJobDocument.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ESJobDocument.java index db4ac4d..4c80f48 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ESJobDocument.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ESJobDocument.java @@ -156,4 +156,7 @@ public class ESJobDocument @ApiModelProperty("公司信息") @IndexField(fieldType = FieldType.TEXT) private String companyVoJson; + + @ApiModelProperty("是否发布 0未发布 1发布") + private Integer isPublish; } From a78703ede7827584e3db26ad79811f2a182300c9 Mon Sep 17 00:00:00 2001 From: chenshaohua <635616957@qq.com> Date: Fri, 26 Jun 2026 13:46:31 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E6=B7=BB=E5=8A=A0es=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=98=AFJobTitle=E6=88=96=E8=80=85JobCategory?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cms/service/impl/ESJobSearchImpl.java | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) 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 8684aff..a6a2a45 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 @@ -500,18 +500,27 @@ public class ESJobSearchImpl implements IESJobSearchService String cateStr = esJobSearch.getJobCategory(); if (!StringUtil.isEmptyOrNull(titleStr) || !StringUtil.isEmptyOrNull(cateStr)) { wrapper.and(sub -> { - boolean first = true; sub.or(); + boolean hasPrev = false; if (!StringUtil.isEmptyOrNull(titleStr)) { String[] words = titleStr.split(","); - for (String w : words) { - if (!first) sub.or(); + for (int i = 0; i < words.length; i++) { + String w = words[i]; sub.match(ESJobDocument::getJobTitle, w, 5.0f); - first = false; + if (i != words.length - 1) { + sub.or(); + } } + hasPrev = true; + sub.or(); + sub.eq(ESJobDocument::getJobCategory, titleStr); } - if (!StringUtil.isEmptyOrNull(cateStr)) { - if (!first) sub.or(); + if (!StringUtil.isEmptyOrNull(cateStr) && !cateStr.equals(titleStr)) { + if (hasPrev) { + sub.or(); + } + sub.match(ESJobDocument::getJobTitle, cateStr, 5.0f); + sub.or(); sub.eq(ESJobDocument::getJobCategory, cateStr); } }); From a0d5cc063709b0cc578f6d3b5d9f5e4b57733683 Mon Sep 17 00:00:00 2001 From: chenyanchang <30190327@qq.com> Date: Fri, 26 Jun 2026 15:32:34 +0800 Subject: [PATCH 04/15] update --- .../src/main/java/com/ruoyi/cms/domain/CompanyJobLive.java | 1 - .../ruoyi/cms/service/impl/CompanyJobLiveServiceImpl.java | 2 +- .../com/ruoyi/cms/service/impl/JobApplyServiceImpl.java | 6 +++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/CompanyJobLive.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/CompanyJobLive.java index e1e61cd..98705c2 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/CompanyJobLive.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/CompanyJobLive.java @@ -49,7 +49,6 @@ public class CompanyJobLive extends BaseEntity @ApiModelProperty("结束时间") private String endTime; - @ApiModelProperty("公司ID") private Long companyId; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyJobLiveServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyJobLiveServiceImpl.java index 8471214..dcb855d 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyJobLiveServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyJobLiveServiceImpl.java @@ -64,6 +64,6 @@ public class CompanyJobLiveServiceImpl implements ICompanyJobLiveService { LoginUser logUser = SecurityUtils.getLoginUser(); SysUser sysUser = logUser.getUser(); Company company = companyService.queryCodeCompany(sysUser.getIdCard()); - return company.getCompanyId(); + return company != null ? company.getCompanyId() : null; } } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobApplyServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobApplyServiceImpl.java index b3b9aa4..8e244df 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobApplyServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobApplyServiceImpl.java @@ -153,7 +153,11 @@ public class JobApplyServiceImpl extends ServiceImpl im @Override public List selectJobApplyListJob(JobApply jobApply) { - return jobApplyMapper.selectJobApplyListJob(jobApply); + List jobList = jobApplyMapper.selectJobApplyListJob(jobApply); + jobList.forEach(job -> { + job.setIsApply(1); + }); + return jobList; } @Override From 0ec82c0b4f73a69ad6cd1bbaf106f0f7b5da8d1f Mon Sep 17 00:00:00 2001 From: chenyanchang <30190327@qq.com> Date: Fri, 26 Jun 2026 15:50:09 +0800 Subject: [PATCH 05/15] update --- .../app/AppUserWorkExperiencesController.java | 17 ++--------------- .../cms/UserWorkExperiencesController.java | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserWorkExperiencesController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserWorkExperiencesController.java index 430fa9f..2e5e19d 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserWorkExperiencesController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserWorkExperiencesController.java @@ -1,7 +1,5 @@ package com.ruoyi.cms.controller.app; -import com.ruoyi.cms.domain.JobApply; -import com.ruoyi.cms.service.impl.JobApplyServiceImpl; import com.ruoyi.common.core.domain.entity.UserWorkExperiences; import com.ruoyi.cms.service.UserWorkExperiencesService; import com.ruoyi.common.core.controller.BaseController; @@ -20,8 +18,8 @@ import java.util.List; /** * 用户工作经历表 * - * @author - * @email + * @author + * @email * @date 2025-10-10 16:26:26 */ @RestController @@ -32,9 +30,6 @@ public class AppUserWorkExperiencesController extends BaseController { @Autowired private UserWorkExperiencesService userWorkExperiencesService; - @Autowired - JobApplyServiceImpl jobApplyService; - /** * 列表 */ @@ -44,14 +39,6 @@ public class AppUserWorkExperiencesController extends BaseController { if(userWorkExperiences.getUserId()==null){ userWorkExperiences.setUserId(SiteSecurityUtils.getUserId()); } - //已读简历 - if (userWorkExperiences.getJobId() != null) { - JobApply jobApply = jobApplyService.selectByJobIdAndUserId(userWorkExperiences.getJobId(), userWorkExperiences.getUserId()); - if (jobApply != null) { - jobApply.setIsView("1"); - jobApplyService.updateJobApply(jobApply); - } - } startPage(); List list=userWorkExperiencesService.getWorkExperiencesList(userWorkExperiences); return getDataTable(list); diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/UserWorkExperiencesController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/UserWorkExperiencesController.java index 7506440..806e82f 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/UserWorkExperiencesController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/UserWorkExperiencesController.java @@ -1,6 +1,8 @@ package com.ruoyi.cms.controller.cms; +import com.ruoyi.cms.domain.JobApply; import com.ruoyi.cms.service.IAppUserService; +import com.ruoyi.cms.service.impl.JobApplyServiceImpl; import com.ruoyi.cms.util.RoleUtils; import com.ruoyi.common.core.domain.entity.AppUser; import com.ruoyi.common.core.domain.entity.UserWorkExperiences; @@ -33,9 +35,13 @@ public class UserWorkExperiencesController extends BaseController { @Autowired private UserWorkExperiencesService userWorkExperiencesService; + @Autowired private IAppUserService appUserService; + @Autowired + private JobApplyServiceImpl jobApplyService; + /** * 列表 */ @@ -43,6 +49,14 @@ public class UserWorkExperiencesController extends BaseController { @PreAuthorize("@ss.hasPermi('cms:userworkexperiences:list')") @GetMapping("/list") public TableDataInfo list(UserWorkExperiences userWorkExperiences){ + //已读简历 + if (userWorkExperiences.getJobId() != null) { + JobApply jobApply = jobApplyService.selectByJobIdAndUserId(userWorkExperiences.getJobId(), userWorkExperiences.getUserId()); + if (jobApply != null) { + jobApply.setIsView("1"); + jobApplyService.updateJobApply(jobApply); + } + } startPage(); List list=userWorkExperiencesService.getWorkExperiencesList(userWorkExperiences); return getDataTable(list); From 7836f97dc5a44abf39baf99b201a5d4afaae91f7 Mon Sep 17 00:00:00 2001 From: chenshaohua <635616957@qq.com> Date: Fri, 26 Jun 2026 16:31:31 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E6=B7=BB=E5=8A=A0es=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=98=AFJobTitle=E6=88=96=E8=80=85JobCategory?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cms/service/impl/ESJobSearchImpl.java | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) 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 a6a2a45..8684aff 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 @@ -500,27 +500,18 @@ public class ESJobSearchImpl implements IESJobSearchService String cateStr = esJobSearch.getJobCategory(); if (!StringUtil.isEmptyOrNull(titleStr) || !StringUtil.isEmptyOrNull(cateStr)) { wrapper.and(sub -> { + boolean first = true; sub.or(); - boolean hasPrev = false; if (!StringUtil.isEmptyOrNull(titleStr)) { String[] words = titleStr.split(","); - for (int i = 0; i < words.length; i++) { - String w = words[i]; + for (String w : words) { + if (!first) sub.or(); sub.match(ESJobDocument::getJobTitle, w, 5.0f); - if (i != words.length - 1) { - sub.or(); - } + first = false; } - hasPrev = true; - sub.or(); - sub.eq(ESJobDocument::getJobCategory, titleStr); } - if (!StringUtil.isEmptyOrNull(cateStr) && !cateStr.equals(titleStr)) { - if (hasPrev) { - sub.or(); - } - sub.match(ESJobDocument::getJobTitle, cateStr, 5.0f); - sub.or(); + if (!StringUtil.isEmptyOrNull(cateStr)) { + if (!first) sub.or(); sub.eq(ESJobDocument::getJobCategory, cateStr); } }); From 65566c16d4cd51db69f1ba7a464bae5250b61bfe Mon Sep 17 00:00:00 2001 From: chenyanchang <30190327@qq.com> Date: Fri, 26 Jun 2026 17:05:58 +0800 Subject: [PATCH 07/15] update --- .../java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 8684aff..4171a9e 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 @@ -531,14 +531,14 @@ public class ESJobSearchImpl implements IESJobSearchService // 岗位薪资范围与用户期望薪资范围有交集 // 条件：岗位最小薪资 <= 用户最大薪资 AND 岗位最大薪资 >= 用户最小薪资 if(Objects.nonNull(userMinSalary) && Objects.nonNull(userMaxSalary)){ - wrapper.and(x->x.le(ESJobDocument::getMaxSalary,userMaxSalary) - .ge(ESJobDocument::getMinSalary,userMinSalary)); + wrapper.and(x->x.le(ESJobDocument::getMinSalary,userMaxSalary) + .ge(ESJobDocument::getMaxSalary,userMinSalary)); } else if(Objects.nonNull(userMinSalary)){ // 只有最小薪资：岗位最大薪资 >= 用户最小薪资 - wrapper.and(x->x.ge(ESJobDocument::getMinSalary,userMinSalary)); + wrapper.and(x->x.ge(ESJobDocument::getMaxSalary,userMinSalary)); } else if(Objects.nonNull(userMaxSalary)){ // 只有最大薪资：岗位最小薪资 <= 用户最大薪资 - wrapper.and(x->x.le(ESJobDocument::getMaxSalary,userMaxSalary)); + wrapper.and(x->x.le(ESJobDocument::getMinSalary,userMaxSalary)); } if(!StringUtil.isEmptyOrNull(esJobSearch.getExperience())){ Integer maxValue = StringUtil.findMaxValue(esJobSearch.getExperience()); From 8449bd5e711fb0f50049afb1677d907c90730249 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E8=BE=89?= Date: Fri, 26 Jun 2026 21:37:19 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E7=AE=80=E5=8E=86=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E8=A2=AB=E6=9F=A5=E7=9C=8B=E3=80=81=E6=B1=82=E8=81=8C=E8=80=85?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BDbug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + .../resources/mapper/app/JobApplyMapper.xml | 25 +++++++++++++------ .../common/core/domain/entity/AppUser.java | 4 +++ 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index fb41a99..8ca3bd7 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,4 @@ nbdist/ .local/ local.sh +.claude \ No newline at end of file diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/JobApplyMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/JobApplyMapper.xml index 6e9584f..4ceef72 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/JobApplyMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/JobApplyMapper.xml @@ -141,13 +141,24 @@ and latest_ii.job_id = a.job_id and latest_ii.del_flag = '0' where a.del_flag='0' - and b.job_title like concat('%', cast(#{company.jobTitle, jdbcType=VARCHAR} as varchar), '%') - and b.education = #{company.education} - and b.experience = #{company.experience} - and b.company_name like concat('%', cast(#{company.companyName, jdbcType=VARCHAR} as varchar), '%') - and b.company_id = #{company.companyId} - and l.code =#{company.code} - and b.job_title like concat('%', cast(#{name, jdbcType=VARCHAR} as varchar), '%') + + and e.name like concat('%', cast(#{name, jdbcType=VARCHAR} as varchar), '%') + + and e.phone like concat('%', cast(#{phone, jdbcType=VARCHAR} as varchar), '%') + + and e.education = #{education} + + and e.sex = #{sex} + + and e.area = #{area} + + and e.political_affiliation = #{politicalAffiliation} + + and e.id_card like concat('%', cast(#{idCard, jdbcType=VARCHAR} as varchar), '%') + + and e.birth_date = #{birthDate} + + and b.job_title like concat('%', cast(#{jobName, jdbcType=VARCHAR} as varchar), '%') + SELECT + *, + CASE match_level + WHEN 1 THEN '一级: 学历+区域+薪资+岗位类别' + WHEN 2 THEN '二级: 区域+薪资+岗位类别' + WHEN 3 THEN '三级: 薪资+岗位类别' + WHEN 4 THEN '四级: 仅岗位类别' + WHEN 5 THEN '五级: 无满足条件' + END AS match_level_desc + FROM ( + SELECT + *, + ROW_NUMBER() OVER (PARTITION BY user_id ORDER BY match_level asc) AS best_rn + FROM ( + SELECT + r.*, + CASE + WHEN CAST(j.job_id AS TEXT) = ANY(string_to_array(r.job_title_id, ',')) + AND ((CAST(r.salary_min AS INTEGER) <= p.max_salary AND CAST(r.salary_max AS INTEGER) >= p.min_salary) OR p.max_salary IS NULL) + AND (CAST(r.area AS INTEGER) = CAST(p.job_location_area_code AS INTEGER) OR p.job_location_area_code IS NULL) + AND (CAST(r.education AS INTEGER) >=CAST(p.education AS INTEGER) OR p.education IS NULL OR p.education = '-1') + THEN 1 + WHEN CAST(j.job_id AS TEXT) = ANY(string_to_array(r.job_title_id, ',')) + AND ((CAST(r.salary_min AS INTEGER) <= p.max_salary AND CAST(r.salary_max AS INTEGER) >= p.min_salary) OR p.max_salary IS NULL) + AND (CAST(r.area AS INTEGER) = CAST(p.job_location_area_code AS INTEGER) OR p.job_location_area_code IS NULL) + THEN 2 + WHEN CAST(j.job_id AS TEXT) = ANY(string_to_array(r.job_title_id, ',')) + AND ((CAST(r.salary_min AS INTEGER) <= p.max_salary AND CAST(r.salary_max AS INTEGER) >= p.min_salary) OR p.max_salary IS NULL) + THEN 3 + WHEN (CAST(j.job_id AS TEXT) = ANY(string_to_array(r.job_title_id, ',')) OR p.job_category IS NULL) + THEN 4 + ELSE 5 + END AS match_level + FROM shz.job p + JOIN shz.app_user r ON r.del_flag = '0' + JOIN shz.job_title j ON j.job_name = p.job_category + WHERE p.job_id = #{jobId} + ) c + ) t + WHERE best_rn = 1 + ORDER BY match_level ASC, login_date DESC + LIMIT (SELECT vacancies FROM shz.job WHERE job_id = #{jobId}) + \ No newline at end of file diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java index 5146aa7..87a9641 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java @@ -168,4 +168,8 @@ public class AppUser extends BaseEntity /** 1-大龄人员;2-低保人员;3-残疾人员;4-失地农名或联队职工;5-防止返贫;6-未就业大中专毕业生;7-退役军人;8-长期失业人员;9-城镇零就业家庭成员；10.刑满释放人员 **/ @ApiModelProperty("用户类型，以逗号分隔") private String userType; + + //匹配描述 + @TableField(exist = false) + private String matchLevelDesc; } From ba2f73d3b83ea95eb3f35122a95c3b61b2c4e1de Mon Sep 17 00:00:00 2001 From: chenyanchang <30190327@qq.com> Date: Sat, 27 Jun 2026 12:48:54 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=9A=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=B2=97=E4=BD=8D=E5=8C=B9=E9=85=8D=E7=AE=80=E5=8E=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E8=A1=A5=E5=85=85=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E7=BB=8F=E5=8E=86=EF=BC=8C=E6=8A=80=E8=83=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/cms/mapper/JobMapper.java | 2 +- .../cms/service/impl/JobServiceImpl.java | 22 ++++++++++++++++++- .../main/resources/mapper/app/JobMapper.xml | 2 +- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobMapper.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobMapper.java index ac7f557..9285ad3 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobMapper.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobMapper.java @@ -68,5 +68,5 @@ public interface JobMapper extends BaseMapper { //删除岗位 Long delRowWork(); - List getRecommendAppUser(@Param("jobId") Long jobId); + List getRecommendByJobId(@Param("jobId") Long jobId); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java index c9b935e..ee49311 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java @@ -105,6 +105,12 @@ public class JobServiceImpl extends ServiceImpl implements IJobSe @Autowired private DataSource dataSource; + @Autowired + private UserWorkExperiencesMapper userWorkExperiencesMapper; + + @Autowired + private AppSkillMapper appSkillMapper; + /** * 应用启动后自动迁移：添加 is_urgent 列（幂等） */ @@ -1264,6 +1270,20 @@ public class JobServiceImpl extends ServiceImpl implements IJobSe @Override public List getRecommendByJobId(Long jobId) { - return jobMapper.getRecommendAppUser(jobId); + List list = jobMapper.getRecommendByJobId(jobId); + if (CollectionUtils.isNotEmpty(list)) { + list.forEach(appUser -> { + UserWorkExperiences workExperiences = new UserWorkExperiences(); + workExperiences.setUserId(appUser.getUserId()); + List experiences = userWorkExperiencesMapper.getWorkExperiencesList(workExperiences); + appUser.setExperiencesList(experiences); + + AppSkill skill = new AppSkill(); + skill.setUserId(appUser.getUserId()); + List skillList = appSkillMapper.getList(skill); + appUser.setAppSkillsList(skillList); + }); + } + return list; } } diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml index 01a4e6e..1e6021b 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml @@ -368,7 +368,7 @@ delete from row_work - SELECT *, CASE match_level From 1647e0ce13b3586ef2ae558a4c5c8d64464ef05f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E8=BE=89?= Date: Sat, 27 Jun 2026 16:24:55 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=BC=96=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/RuoYiApplication.java | 2 +- .../ruoyi/web/core/config/DevToolsConfig.java | 24 ++++++ .../src/main/resources/application.yml | 7 ++ watch.sh | 73 +++++++++++++++++++ 4 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/core/config/DevToolsConfig.java create mode 100644 watch.sh diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index 4ee4001..c3dfdea 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java @@ -29,4 +29,4 @@ public class RuoYiApplication " | | \\ / \\ / \n" + " ''-' `'-' `-..-' "); } -} +} \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/DevToolsConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/DevToolsConfig.java new file mode 100644 index 0000000..953ce14 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/DevToolsConfig.java @@ -0,0 +1,24 @@ +package com.ruoyi.web.core.config; + +import org.apache.catalina.connector.Connector; +import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; +import org.springframework.boot.web.server.WebServerFactoryCustomizer; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Profile; + +/** + * DevTools 热重启配置 - 修复 Windows 下端口未释放问题 + * 启用 SO_REUSEADDR，允许 DevTools 重启时立即复用端口 + * 仅在本地开发环境生效，不影响线上 + */ +@Profile("local") +@Configuration +public class DevToolsConfig implements WebServerFactoryCustomizer { + + @Override + public void customize(TomcatServletWebServerFactory factory) { + factory.addConnectorCustomizers((Connector connector) -> { + connector.setProperty("socket.soReuseAddress", "true"); + }); + } +} diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 5c0a451..f422b66 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -2,6 +2,8 @@ server: # 服务器的HTTP端口，默认为8080 port: 9091 + # 优雅关闭，防止 Windows 下 DevTools 重启时端口冲突 + shutdown: graceful servlet: # 应用的访问路径 context-path: / @@ -50,6 +52,11 @@ spring: restart: # 热部署开关 enabled: true + # 变更检测后的静默期（ms），给 IDE 编译留时间 + quiet-period: 400 + lifecycle: + # 优雅关闭超时 + timeout-per-shutdown-phase: 10s # redis 配置 # token配置 token: diff --git a/watch.sh b/watch.sh new file mode 100644 index 0000000..a0d1b8d --- /dev/null +++ b/watch.sh @@ -0,0 +1,73 @@ +#!/bin/bash +# 石河子后端 自动重启脚本 +# VS Code 保存 → Java 扩展编译 → 本脚本检测变更 → 杀旧进程 → 起新进程 +# 用法: bash watch.sh + +SRC_DIR="$(cd "$(dirname "$0")" && pwd)" +cd "$SRC_DIR" + +APP_CLASS="com.ruoyi.RuoYiApplication" +PORT=9091 + +echo "================================================" +echo " SHZ Backend 自动重启模式" +echo " 流程: 保存文件 → Java扩展编译 → 检测变更 → 重启服务" +echo " 端口: $PORT" +echo " 按 Ctrl+C 退出" +echo "================================================" + +# 获取最新 .java 文件修改时间 +get_latest_mtime() { + find . -name "*.java" -path "*/src/*" -type f -printf '%T@\n' 2>/dev/null | sort -rn | head -1 | cut -d'.' -f1 +} + +# 精准杀后端进程 +kill_backend() { + local pid=$(jps -l 2>/dev/null | grep "$APP_CLASS" | awk '{print $1}') + if [ -n "$pid" ]; then + echo "[$(date '+%H:%M:%S')] 🔪 终止旧进程 PID=$pid..." + taskkill //PID "$pid" //F 2>/dev/null + sleep 3 + # 确认端口已释放 + while netstat -ano 2>/dev/null | grep -q ":$PORT "; do + sleep 2 + echo "[$(date '+%H:%M:%S')] ⏳ 等待端口 $PORT 释放..." + done + fi +} + +# 启动服务 +start_server() { + echo "[$(date '+%H:%M:%S')] 🚀 启动服务..." + cd "$SRC_DIR" + nohup mvn spring-boot:run -pl ruoyi-admin -DskipTests > /tmp/shz-backend.log 2>&1 & + echo "[$(date '+%H:%M:%S')] 等待服务就绪..." + for i in $(seq 1 90); do + sleep 2 + curl -s --max-time 2 "http://localhost:$PORT/" > /dev/null 2>&1 && \ + echo "[$(date '+%H:%M:%S')] ✅ 服务已就绪: http://localhost:$PORT/" && \ + return 0 + done + echo "[$(date '+%H:%M:%S')] ⚠️ 启动超时，查看 /tmp/shz-backend.log" +} + +# --- 主流程 --- + +# 首次启动 +kill_backend +start_server + +last_ts=$(get_latest_mtime) + +while true; do + sleep 3 + current_ts=$(get_latest_mtime) + + if [ -n "$current_ts" ] && [ -n "$last_ts" ] && [ "$current_ts" -gt "$last_ts" ]; then + echo "" + echo "[$(date '+%H:%M:%S')] 📝 检测到 .java 文件变更，重启服务..." + kill_backend + start_server + last_ts=$(get_latest_mtime) + fi +done From d0fdbb6c1ce75eb027529e5f50580de03221a2e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E8=BE=89?= Date: Sat, 27 Jun 2026 16:33:21 +0800 Subject: [PATCH 13/15] =?UTF-8?q?Revert=20"=E6=9C=AC=E5=9C=B0=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=87=AA=E5=8A=A8=E7=BC=96=E8=AF=91"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 1647e0ce13b3586ef2ae558a4c5c8d64464ef05f. --- .../main/java/com/ruoyi/RuoYiApplication.java | 2 +- .../ruoyi/web/core/config/DevToolsConfig.java | 24 ------ .../src/main/resources/application.yml | 7 -- watch.sh | 73 ------------------- 4 files changed, 1 insertion(+), 105 deletions(-) delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/core/config/DevToolsConfig.java delete mode 100644 watch.sh diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index c3dfdea..4ee4001 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java @@ -29,4 +29,4 @@ public class RuoYiApplication " | | \\ / \\ / \n" + " ''-' `'-' `-..-' "); } -} \ No newline at end of file +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/DevToolsConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/DevToolsConfig.java deleted file mode 100644 index 953ce14..0000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/DevToolsConfig.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.ruoyi.web.core.config; - -import org.apache.catalina.connector.Connector; -import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; -import org.springframework.boot.web.server.WebServerFactoryCustomizer; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Profile; - -/** - * DevTools 热重启配置 - 修复 Windows 下端口未释放问题 - * 启用 SO_REUSEADDR，允许 DevTools 重启时立即复用端口 - * 仅在本地开发环境生效，不影响线上 - */ -@Profile("local") -@Configuration -public class DevToolsConfig implements WebServerFactoryCustomizer { - - @Override - public void customize(TomcatServletWebServerFactory factory) { - factory.addConnectorCustomizers((Connector connector) -> { - connector.setProperty("socket.soReuseAddress", "true"); - }); - } -} diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index f422b66..5c0a451 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -2,8 +2,6 @@ server: # 服务器的HTTP端口，默认为8080 port: 9091 - # 优雅关闭，防止 Windows 下 DevTools 重启时端口冲突 - shutdown: graceful servlet: # 应用的访问路径 context-path: / @@ -52,11 +50,6 @@ spring: restart: # 热部署开关 enabled: true - # 变更检测后的静默期（ms），给 IDE 编译留时间 - quiet-period: 400 - lifecycle: - # 优雅关闭超时 - timeout-per-shutdown-phase: 10s # redis 配置 # token配置 token: diff --git a/watch.sh b/watch.sh deleted file mode 100644 index a0d1b8d..0000000 --- a/watch.sh +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/bash -# 石河子后端 自动重启脚本 -# VS Code 保存 → Java 扩展编译 → 本脚本检测变更 → 杀旧进程 → 起新进程 -# 用法: bash watch.sh - -SRC_DIR="$(cd "$(dirname "$0")" && pwd)" -cd "$SRC_DIR" - -APP_CLASS="com.ruoyi.RuoYiApplication" -PORT=9091 - -echo "================================================" -echo " SHZ Backend 自动重启模式" -echo " 流程: 保存文件 → Java扩展编译 → 检测变更 → 重启服务" -echo " 端口: $PORT" -echo " 按 Ctrl+C 退出" -echo "================================================" - -# 获取最新 .java 文件修改时间 -get_latest_mtime() { - find . -name "*.java" -path "*/src/*" -type f -printf '%T@\n' 2>/dev/null | sort -rn | head -1 | cut -d'.' -f1 -} - -# 精准杀后端进程 -kill_backend() { - local pid=$(jps -l 2>/dev/null | grep "$APP_CLASS" | awk '{print $1}') - if [ -n "$pid" ]; then - echo "[$(date '+%H:%M:%S')] 🔪 终止旧进程 PID=$pid..." - taskkill //PID "$pid" //F 2>/dev/null - sleep 3 - # 确认端口已释放 - while netstat -ano 2>/dev/null | grep -q ":$PORT "; do - sleep 2 - echo "[$(date '+%H:%M:%S')] ⏳ 等待端口 $PORT 释放..." - done - fi -} - -# 启动服务 -start_server() { - echo "[$(date '+%H:%M:%S')] 🚀 启动服务..." - cd "$SRC_DIR" - nohup mvn spring-boot:run -pl ruoyi-admin -DskipTests > /tmp/shz-backend.log 2>&1 & - echo "[$(date '+%H:%M:%S')] 等待服务就绪..." - for i in $(seq 1 90); do - sleep 2 - curl -s --max-time 2 "http://localhost:$PORT/" > /dev/null 2>&1 && \ - echo "[$(date '+%H:%M:%S')] ✅ 服务已就绪: http://localhost:$PORT/" && \ - return 0 - done - echo "[$(date '+%H:%M:%S')] ⚠️ 启动超时，查看 /tmp/shz-backend.log" -} - -# --- 主流程 --- - -# 首次启动 -kill_backend -start_server - -last_ts=$(get_latest_mtime) - -while true; do - sleep 3 - current_ts=$(get_latest_mtime) - - if [ -n "$current_ts" ] && [ -n "$last_ts" ] && [ "$current_ts" -gt "$last_ts" ]; then - echo "" - echo "[$(date '+%H:%M:%S')] 📝 检测到 .java 文件变更，重启服务..." - kill_backend - start_server - last_ts=$(get_latest_mtime) - fi -done From a23f3a29bbc9e0ad551e9f686c8e47f3eb94b5da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E8=BE=89?= Date: Sat, 27 Jun 2026 17:57:25 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E7=AE=80=E5=8E=86=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/cms/controller/cms/CmsJobController.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java index 5390792..c9d4024 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java @@ -84,6 +84,13 @@ public class CmsJobController extends BaseController return getDataTable(list); } + @ApiOperation("根据岗位ID获取推荐的人") + @GetMapping("/getRecommendByJobId") + public AjaxResult getRecommendByJobId(@RequestParam("jobId") Long jobId) + { + return AjaxResult.success(jobService.getRecommendByJobId(jobId)); + } + /** * 获取岗位详细信息 */ @@ -375,10 +382,4 @@ public class CmsJobController extends BaseController } - @ApiOperation("根据岗位ID获取推荐的人") - @GetMapping("/getRecommendByJobId") - public AjaxResult getRecommendByJobId(@RequestParam("jobId") Long jobId) - { - return AjaxResult.success(jobService.getRecommendByJobId(jobId)); - } } From fd30b8246adcecdd1ffe9a87adfbdbb90bbca24e Mon Sep 17 00:00:00 2001 From: chenyanchang <30190327@qq.com> Date: Sat, 27 Jun 2026 21:49:27 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=9A=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/framework/web/service/SsoService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoService.java index 11ffaf6..1203075 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoService.java @@ -282,6 +282,8 @@ public class SsoService { company.setLegalPhone(object.getString("entLegalPersonPhone")); company.setIndustry(object.getString("entIndustry")); company.setRegisteredAddress(object.getString("entRegisteredAddress")); + company.setNature(object.getString("entType")); +// company.setScale(object.getString("entSize")); companyService.insertCompany(company); } /**