zkr/shz-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of ssh://124.243.245.42:2222/zkr/shz-backend

Browse Source
This commit is contained in:
lapuda
2026-07-16 00:29:06 +08:00
parent 95f8e0af7e 7b6f431327
commit 8d77b358f9
6 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppJobController.java
View File

@@ -3,7 +3,6 @@ package com.ruoyi.cms.controller.app;
import com.ruoyi.cms.domain.ESJobDocument;
import com.ruoyi.cms.domain.Job;
import com.ruoyi.cms.domain.query.ESJobSearch;
import com.ruoyi.cms.service.ICompanyService;
import com.ruoyi.cms.service.IESJobSearchService;
import com.ruoyi.cms.service.IJobCollectionService;
import com.ruoyi.cms.service.IJobService;

6
ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ESJobDocument.java
View File

@@ -167,4 +167,10 @@ public class ESJobDocument
@ApiModelProperty("是否发布 0未发布 1发布")
private Integer isPublish;
@ApiModelProperty("是否重点人群 0是,1否")
private String isKeyPopulations;
@ApiModelProperty("重点人群-1农民工、2团场职工、3失业人员、4零就业家庭、5零工人员、6退役军人")
private String keyPopulations;
}

3
ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/InterviewInvitation.java
View File

@@ -103,4 +103,7 @@ public class InterviewInvitation extends BaseEntity {
*/
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("是否已读0未读，1已读")
private String isRead;
}

6
ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java
View File

@@ -206,6 +206,12 @@ public class Job extends BaseEntity
@ApiModelProperty("审核状态")
private String reviewStatus;
@ApiModelProperty("是否重点人群 0是,1否")
private String isKeyPopulations;
@ApiModelProperty("重点人群-1农民工、2团场职工、3失业人员、4零就业家庭、5零工人员、6退役军人")
private String keyPopulations;
@ApiModelProperty("状态 0上架，1下架")
private String jobStatus;

3
ruoyi-bussiness/src/main/resources/mapper/app/InterviewInvitationMapper.xml
View File

@@ -26,6 +26,7 @@
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="remark" column="remark"/>
<result property="isRead" column="is_read"/>
</resultMap>
<!-- VO 带公司名和岗位名（继承基础映射，jobTitle 来自关联查询的实时数据） -->
@@ -39,7 +40,7 @@
select id, company_id, job_id, user_id, apply_id, interview_time,
interview_method, meeting_link, meeting_password, interview_location,
contact_phone, interviewer_name, company_name, job_name, status, del_flag,
create_by, create_time, update_by, update_time, remark
create_by, create_time, update_by, update_time, remark,is_read
from interview_invitation
</sql>

13
ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml
View File

@@ -37,6 +37,8 @@
<result property="jobType" column="job_type" />
<result property="jobAddress" column="job_address" />
<result property="reviewStatus" column="review_status" />
<result property="isKeyPopulations" column="is_key_populations" />
<result property="keyPopulations" column="key_populations" />
</resultMap>
@@ -84,6 +86,8 @@
<result property="jobAddress" column="job_address" />
<result property="reviewStatus" column="review_status" />
<result property="jobStatus" column="job_status" />
<result property="isKeyPopulations" column="is_key_populations" />
<result property="keyPopulations" column="key_populations" />
<association property="companyVo" resultMap="CompanyResult"/>
<association property="jobContactList" resultMap="JomContactResult"/>
@@ -108,7 +112,7 @@
</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
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,is_key_populations,key_populations from job
</sql>
<insert id="insertBatchRowWork">
INSERT INTO row_work (
@@ -138,7 +142,8 @@
job_title, min_salary, max_salary, education, experience, company_name, job_location,
job_location_area_code, posting_date, vacancies, latitude, longitude, "view", company_id,
is_hot, is_urgent, apply_num, description, is_publish, data_source, job_url, remark, del_flag,
create_by, create_time, row_id, job_category,job_type,job_address,job_status
create_by, create_time, row_id, job_category,job_type,job_address,job_status,is_key_populations,
key_populations
) VALUES
<foreach collection="list" item="job" separator=",">
(
@@ -147,7 +152,7 @@
#{job.vacancies}, #{job.latitude}, #{job.longitude}, #{job.view}, #{job.companyId},
#{job.isHot}, #{job.isUrgent}, #{job.applyNum}, #{job.description}, #{job.isPublish}, #{job.dataSource},
#{job.jobUrl}, #{job.remark}, #{job.delFlag}, #{job.createBy}, #{job.createTime},
#{job.rowId}, #{job.jobCategory},#{job.jobType},#{job.jobAddress},#{job.jobStatus}
#{job.rowId}, #{job.jobCategory},#{job.jobType},#{job.jobAddress},#{job.jobStatus},#{job.isKeyPopulations},#{job.keyPopulations}
)
</foreach>
</insert>
@@ -235,7 +240,7 @@
and create_time &lt;= #{endDate}
</if>
</where>
order by is_explain desc
order by create_time desc
</select>
<select id="selectAppJobList" resultType="com.ruoyi.cms.domain.query.ESJobSearch">
<include refid="selectJobVo"/>