1.修改岗位列表排序

2.添加重点服务人群岗位并添加重点人群岗位类型

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;

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;
 }

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;
 

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

@@ -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"/>