From 633d563f1e34a8ba7462c5b9c187ce164f137a58 Mon Sep 17 00:00:00 2001
From: chenshaohua <635616957@qq.com>
Date: Tue, 7 Jul 2026 18:48:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0es=E4=B8=AD=E5=B2=97?=
 =?UTF-8?q?=E4=BD=8D=E8=81=94=E7=B3=BB=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/cms/domain/ESJobDocument.java    |  4 ++++
 .../com/ruoyi/cms/service/impl/ESJobSearchImpl.java |  3 +++
 .../src/main/resources/mapper/app/JobMapper.xml     | 13 ++++++++++---
 3 files changed, 17 insertions(+), 3 deletions(-)

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 8500007..b4bab02 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
@@ -161,6 +161,10 @@ public class ESJobDocument
     @IndexField(fieldType = FieldType.TEXT)
     private String companyVoJson;
 
+    @ApiModelProperty("岗位联系人信息")
+    @IndexField(fieldType = FieldType.TEXT)
+    private String jobContactVoJson;
+
     @ApiModelProperty("是否发布 0未发布 1发布")
     private Integer isPublish;
 }
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 b6cf01c..8630adb 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
@@ -188,8 +188,11 @@ public class ESJobSearchImpl implements IESJobSearchService
                     esJobDocument.setJobCategory(resolveJobCategoryLabel(job.getJobCategory()));
                     //类型转换导致赋值问题，重新赋值
                     esJobDocument.setScale(org.apache.commons.lang3.StringUtils.isNotEmpty(job.getScale()) ? Integer.parseInt(job.getScale()) : 0);
+                    //企业信息
                     CompanyVo vo=job.getCompanyVo();
                     esJobDocument.setCompanyVoJson(JSON.toJSONString(vo));
+                    //岗位联系人
+                    esJobDocument.setJobContactVoJson(JSON.toJSONString(job.getJobContactList()));
                     esJobDocument.setAppJobUrl("https://www.xjksly.cn/app#/packageA/pages/post/post?jobId="+ job.getJobId());
                     if(!StringUtil.isEmptyOrNull(job.getScale())){
                         esJobDocument.setScale(Integer.valueOf(job.getScale()));
diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml
index f80131a..f921f1c 100644
--- a/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml
+++ b/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml
@@ -85,6 +85,7 @@
         <result property="reviewStatus"    column="review_status"    />
 
         <association property="companyVo" resultMap="CompanyResult"/>
+        <association property="jobContactList" resultMap="JomContactResult"/>
     </resultMap>
 
     <resultMap type="com.ruoyi.cms.domain.vo.CompanyVo" id="CompanyResult">
@@ -100,6 +101,11 @@
         <result property="contactPersonPhone" column="contact_person_phone"/>
     </resultMap>
 
+    <resultMap type="com.ruoyi.cms.domain.JobContact" id="JomContactResult">
+        <result property="contactPerson" column="job_contact_person"/>
+        <result property="contactPersonPhone" column="job_contact_person_phone"/>
+    </resultMap>
+
     <sql id="selectJobVo">
         select job_id, job_title, min_salary, max_salary, education, experience, company_name, job_location, posting_date, vacancies, del_flag, create_by, create_time, update_by, update_time, remark, latitude, longitude, "view", company_id , is_hot ,is_urgent,apply_num,is_publish, description,job_location_area_code,data_source,job_url,job_category,is_explain,explain_url,cover,job_type,job_address, review_status from job
     </sql>
@@ -285,10 +291,11 @@
             )
     </select>
     <select id="selectAllJob" resultMap="JobEsResult">
-        SELECT j.*,c.industry,c.scale,c.nature as company_nature,c.code,c.description as company_description,c.name,c.company_id,t.contact_person,t.contact_person_phone FROM job as j
+        SELECT j.*,c.industry,c.scale,c.nature as company_nature,c.code,c.description as company_description,c.name,c.company_id,t.contact_person,t.contact_person_phone,jc.contact_person as job_contact_person,jc.contact_person_phone as job_contact_person_phone FROM job as j
         left join company as c on c.company_id = j.company_id and j.del_flag='0' and c.del_flag='0'
-        LEFT JOIN (SELECT  t1.*, ROW_NUMBER() OVER (PARTITION BY t1.company_id ORDER BY t1.id) AS rn  FROM company_contact AS t1  WHERE t1.del_flag = '0' ) AS t
-        ON t.company_id = j.company_id AND t.rn = 1 WHERE j.del_flag = '0' AND c.del_flag = '0' limit #{offset},#{batchSize}
+        LEFT JOIN (SELECT  t1.*, ROW_NUMBER() OVER (PARTITION BY t1.company_id ORDER BY t1.id) AS rn  FROM company_contact AS t1  WHERE t1.del_flag = '0' ) AS t ON t.company_id = j.company_id AND t.rn = 1
+        LEFT JOIN (SELECT jc1.*, ROW_NUMBER() OVER(PARTITION BY jc1.job_id ORDER BY jc1.id) rn FROM job_contact jc1 WHERE jc1.del_flag='0') jc ON jc.job_id = j.job_id AND jc.rn=1
+        WHERE j.del_flag = '0' limit #{offset},#{batchSize}
     </select>
     <select id="selectAllInsertRowWork" resultType="com.ruoyi.cms.domain.RowWork">
         select  Id, TaskId, TaskName, Std_class, SF, ZCMC, Aca112, Acb22a, Aac011, Acb240,

From 30f7c952de945ee054a5126707e051950fa1562a Mon Sep 17 00:00:00 2001
From: chenshaohua <635616957@qq.com>
Date: Tue, 7 Jul 2026 19:19:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?app/job/list=E6=B7=BB=E5=8A=A0=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=8C=E5=B2=97=E4=BD=8D=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=EF=BC=8C=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4=EF=BC=8C?=
 =?UTF-8?q?=E6=88=AA=E8=87=B3=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/cms/service/impl/ESJobSearchImpl.java  | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

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 8630adb..aa95ef8 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
@@ -693,6 +693,9 @@ public class ESJobSearchImpl implements IESJobSearchService
         if(hasText(jobQuery.getScaleDictCode())){
             wrapper.and(a->a.eq(ESJobDocument::getScaleDictCode,jobQuery.getScaleDictCode().trim()));
         }
+        if(hasText(jobQuery.getJobCategory())){
+            wrapper.and(a->a.eq(ESJobDocument::getJobCategory,jobQuery.getJobCategory().trim()));
+        }
         if(hasText(jobQuery.getIndustry())){
             wrapper.and(a->a.eq(ESJobDocument::getIndustry,jobQuery.getIndustry().trim()));
         }
@@ -714,7 +717,14 @@ public class ESJobSearchImpl implements IESJobSearchService
         if(hasText(jobQuery.getType())){
             wrapper.and(a->a.eq(ESJobDocument::getType,jobQuery.getType().trim()));
         }
-
+        //开始时间
+        if(Objects.nonNull(jobQuery.getEndDate())){
+            wrapper.and(x->x.le(ESJobDocument::getPostingDate,jobQuery.getEndDate()));
+        }
+        //截至时间
+        if(Objects.nonNull(jobQuery.getStartDate())){
+            wrapper.and(x->x.ge(ESJobDocument::getPostingDate,jobQuery.getStartDate()));
+        }
         // 先开启打分、优先按匹配分数排序（关键词前台命中越高越靠前）
         wrapper.trackScores();
         wrapper.sortByScore(SortOrder.DESC);