diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppJobController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppJobController.java
index 695af38..0ca6aef 100644
--- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppJobController.java
+++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppJobController.java
@@ -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;
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 b4bab02..62003a9 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
@@ -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;
}
diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/InterviewInvitation.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/InterviewInvitation.java
index e7a1858..f40107f 100644
--- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/InterviewInvitation.java
+++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/InterviewInvitation.java
@@ -103,4 +103,7 @@ public class InterviewInvitation extends BaseEntity {
*/
@ApiModelProperty("备注")
private String remark;
+
+ @ApiModelProperty("是否已读0未读,1已读")
+ private String isRead;
}
diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java
index 44a9b02..32a3141 100644
--- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java
+++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java
@@ -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;
diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/InterviewInvitationMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/InterviewInvitationMapper.xml
index ced903e..7d245c9 100644
--- a/ruoyi-bussiness/src/main/resources/mapper/app/InterviewInvitationMapper.xml
+++ b/ruoyi-bussiness/src/main/resources/mapper/app/InterviewInvitationMapper.xml
@@ -26,6 +26,7 @@
+
@@ -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
diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml
index 35dc9ec..b7b38cf 100644
--- a/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml
+++ b/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml
@@ -37,6 +37,8 @@
+
+
@@ -84,6 +86,8 @@
+
+
@@ -108,7 +112,7 @@
- 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
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
(
@@ -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}
)
@@ -235,7 +240,7 @@
and create_time <= #{endDate}
- order by is_explain desc
+ order by create_time desc