1.job表添加pass和passReason字典

2.修改企业es排序，未发布放最上面

ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java

@@ -401,6 +401,7 @@ public class CmsJobController extends BaseController
      * @throws Exception
      */
     @PostMapping("/downloadModel")
+    @ApiOperation("岗位批量上传模板下载")
     public void downloadModel(HttpServletRequest request, HttpServletResponse response)throws Exception{
         String name = "模板.xlsx";
         String pathFile="/data/downloadmodel/"+name;

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

@@ -162,4 +162,13 @@ public class ESJobDocument
     @ApiModelProperty("公司信息")
     @IndexField(fieldType = FieldType.TEXT)
     private String companyVoJson;
+
+    @ApiModelProperty("是否发布 0未发布 1发布")
+    private Integer isPublish;
+
+    @ApiModelProperty("是否通过 0通过,1不通过")
+    private String pass;
+
+    @ApiModelProperty("是否通过原因")
+    private String passReason;
 }

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

@@ -198,4 +198,10 @@ public class Job extends BaseEntity
     @TableField(exist = false)
     @ApiModelProperty("申请人列表")
     private List<AppUser> applyUsers;
+
+    @ApiModelProperty("是否通过 0通过,1不通过")
+    private String pass;
+
+    @ApiModelProperty("是否通过原因")
+    private String passReason;
 }

ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java

@@ -239,7 +239,7 @@ public class ESJobSearchImpl implements IESJobSearchService
             int pageSize = esJobSearch.getPageSize() == null ? 10 : esJobSearch.getPageSize();
             pageSize = Math.min(pageSize, 50); // 限制最大条数
             int from = current * pageSize;
-            wrapper.orderByAsc(ESJobDocument::getId);
+            wrapper.orderByAsc(ESJobDocument::getIsPublish);//按照未发布放最上面
             wrapper.limit(from, pageSize);
         }else{
             wrapper.limit(esJobSearch.getPageSize());

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

@@ -37,6 +37,8 @@
         <result property="jobAddress"    column="job_address"    />
         <result property="regionCode"    column="region_code"    />
         <result property="staffType"    column="staff_type"    />
+        <result property="pass"    column="pass"    />
+        <result property="passReason"    column="pass_reason"    />
 
     </resultMap>
 
@@ -83,6 +85,8 @@
         <result property="jobAddress"    column="job_address"    />
         <result property="regionCode"    column="region_code"    />
         <result property="staffType"    column="staff_type"    />
+        <result property="pass"    column="pass"    />
+        <result property="passReason"    column="pass_reason"    />
 
         <association property="companyVo" resultMap="CompanyResult"/>
     </resultMap>
@@ -101,7 +105,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 ,apply_num,is_publish, description,job_location_area_code,data_source,job_url,job_category,is_explain,explain_url,cover,job_type,job_address,region_code,staff_type 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 ,apply_num,is_publish, description,job_location_area_code,data_source,job_url,job_category,is_explain,explain_url,cover,job_type,job_address,region_code,staff_type,pass,pass_reason from job
     </sql>
     <insert id="insertBatchRowWork">
         INSERT INTO row_work (
@@ -131,7 +135,7 @@
         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, apply_num, description, is_publish, data_source, job_url, remark, del_flag,
-        create_by, create_time, row_id, job_category,job_type,type,job_address,region_code,staff_type
+        create_by, create_time, row_id, job_category,job_type,type,job_address,region_code,staff_type,pass,pass_reason
         ) VALUES
         <foreach collection="list" item="job" separator=",">
         (
@@ -141,7 +145,7 @@
         #{job.isHot}, #{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.type},#{job.jobAddress},
-        #{job.regionCode},#{job.staffType}
+        #{job.regionCode},#{job.staffType},#{job.pass},#{job.passReason}
         )
         </foreach>
     </insert>
@@ -359,7 +363,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, apply_num, description, is_publish, data_source, job_url, remark, del_flag,
-        create_by, create_time, row_id, job_category,job_type,type,job_address,region_code,staff_type
+        create_by, create_time, row_id, job_category,job_type,type,job_address,region_code,
+        staff_type,pass,pass_reason
         ) VALUES
         <foreach collection="list" item="job" separator=",">
             (
@@ -369,7 +374,7 @@
             #{job.isHot}, #{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.type},#{job.jobAddress},
-            #{job.regionCode},#{job.staffType}
+            #{job.regionCode},#{job.staffType},#{job.pass},#{job.passReason}
             )
         </foreach>
     </insert>