Merge remote-tracking branch 'origin/main'

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

@@ -552,4 +552,14 @@ public class CmsJobController extends BaseController
         }
         return null;
     }
+
+    @ApiOperation("查询石河子本地上传岗位列表")
+    @PreAuthorize("@ss.hasPermi('cms:job:searchLocalJob')")
+    @GetMapping("/searchLocalJob")
+    public TableDataInfo searchLocalJob(JobSearch job)
+    {
+        startPage();
+        List<Job> list = jobService.selectLocalExcelJobList(job);
+        return getDataTable(list);
+    }
 }

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

@@ -0,0 +1,29 @@
+package com.ruoyi.cms.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 石河子岗位数据入库监测记录 shz.job_excel_import_record
+ */
+@Data
+@ApiModel("石河子岗位数据入库监测记录明细")
+@TableName("job_excel_import_record_detail")
+public class JobExcelImportRecordDetail extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 监测主键ID */
+    @Excel(name = "监测主键ID")
+    @ApiModelProperty("监测主键ID")
+    private String detectionId;
+
+    /** 原始文件名称 */
+    @Excel(name = "岗位id")
+    @ApiModelProperty("岗位id")
+    private String jobId;
+}

ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobExcelImportRecordDetailMapper.java

@@ -0,0 +1,15 @@
+package com.ruoyi.cms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.cms.domain.JobExcelImportRecordDetail;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 石河子岗位数据入库监测记录Mapper
+ */
+public interface JobExcelImportRecordDetailMapper extends BaseMapper<JobExcelImportRecordDetail> {
+
+    void batchInsert(@Param("detectionId") String detectionId, @Param("ids") List<Long> ids);
+}

ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobMapper.java

@@ -87,4 +87,6 @@ public interface JobMapper extends BaseMapper<Job> {
 
     //根据名称查询企业
     List<Job> selectJobByMatchKeyList(@Param("keyList") List<String> list);
+
+    List<Job> selectLocalExcelJobList(JobSearch job);
 }

ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IJobService.java

@@ -124,4 +124,6 @@ public interface IJobService
     public int jobUp(Long jobId);
 
     void updateLonToByIds(List<Long> ids);
+
+    List<Job> selectLocalExcelJobList(JobSearch job);
 }

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

@@ -16,6 +16,7 @@ import com.ruoyi.cms.domain.query.CompanySearch;
 import com.ruoyi.cms.domain.vo.ContactParseResult;
 import com.ruoyi.cms.domain.vo.JobShzLocalExcelVo;
 import com.ruoyi.cms.mapper.CompanyMapper;
+import com.ruoyi.cms.mapper.JobExcelImportRecordDetailMapper;
 import com.ruoyi.cms.mapper.JobExcelImportRecordMapper;
 import com.ruoyi.cms.mapper.JobMapper;
 import com.ruoyi.cms.service.*;
@@ -52,7 +53,7 @@ public class JobExcelImportRecordServiceImpl extends ServiceImpl<JobExcelImportR
     @Autowired
     private IIndustryService industryService;
     @Autowired
-    private IJobService jobService;
+    private JobExcelImportRecordDetailMapper jobExcelImportRecordDetailMapper;
 
     @Override
     public List<JobExcelImportRecord> selectShzJobExcelImportRecordList(JobExcelImportRecord jobExcelImportRecord) {
@@ -258,6 +259,11 @@ public class JobExcelImportRecordServiceImpl extends ServiceImpl<JobExcelImportR
             }
         }
 
+        //保存明细表
+        if (CollUtil.isNotEmpty(allEffectJobIds)) {
+            jobExcelImportRecordDetailMapper.batchInsert(detectionId,allEffectJobIds);
+        }
+
         //记录结果
         String brief = String.format("共导入%d条数据，新增企业%d家，新增岗位%d条，更新岗位%d条",
                 jobExcelImportRecord.getStorageNumber(), addCompanyNum, addJobNum, updateJobNum);

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

@@ -1393,4 +1393,9 @@ public class JobServiceImpl extends ServiceImpl<JobMapper,Job> implements IJobSe
         iesJobSearchService.updateJob(jobId);
         return i;
     }
+
+    @Override
+    public List<Job> selectLocalExcelJobList(JobSearch job){
+        return jobMapper.selectLocalExcelJobList(job);
+    }
 }

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

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.cms.mapper.JobExcelImportRecordDetailMapper">
+
+    <resultMap type="com.ruoyi.cms.domain.JobExcelImportRecordDetail" id="JobExcelImportRecordDetailResult">
+        <result property="detectionId"    column="detection_id"    />
+        <result property="jobId"        column="job_id"       />
+        <result property="delFlag"         column="del_flag"        />
+        <result property="createBy"       column="create_by"       />
+        <result property="createTime"     column="create_time"     />
+        <result property="updateBy"       column="update_by"       />
+        <result property="updateTime"     column="update_time"     />
+        <result property="remark"         column="remark"          />
+    </resultMap>
+
+    <sql id="selectShzJobExcelImportRecordVo">
+        select detection_id,
+               job_id,
+               del_flag,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark
+        from job_excel_import_record_detail
+    </sql>
+
+    <insert id="batchInsert">
+        INSERT INTO job_excel_import_record_detail (
+        detection_id, job_id, create_time, del_flag
+        ) VALUES
+        <foreach collection="ids" item="jobId" separator=",">
+            (
+            #{detectionId}, #{jobId}, NOW(), '0'
+            )
+        </foreach>
+    </insert>
+
+
+</mapper>

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

@@ -228,7 +228,6 @@
             <if test="applyNum != null "> and apply_num = #{applyNum}</if>
             <if test="code != null "> and company_id in(select company_id from company where code=#{code})</if>
             <if test="jobStatus != null "> and job_status = #{jobStatus}</if>
-            <if test="createBy != null and createBy!='' "> and (create_by = #{createBy} or update_by = #{createBy})</if>
             <if test="compensation!=null ">
                 <if test="compensation==0 ">
                     and min_salary &lt; 1750
@@ -486,4 +485,28 @@
         </foreach>
     </select>
 
+    <select id="selectLocalExcelJobList" parameterType="JobSearch" resultMap="JobResult">
+        <include refid="selectJobVoT" />
+        inner join job_excel_import_record_detail jeird on t.job_id=jeird.job_id and jeird.detection_id=#{externalBatchId}
+        <where>  t.del_flag = '0'
+            <if test="jobTitle != null  and jobTitle != ''"> and job_title = #{jobTitle}</if>
+            <if test="minSalary != null "> and min_salary = #{minSalary}</if>
+            <if test="maxSalary != null "> and max_salary = #{maxSalary}</if>
+            <if test="education != null  and education != ''"> and education = #{education}</if>
+            <if test="experience != null  and experience != ''"> and experience = #{experience}</if>
+            <if test="companyName != null  and companyName != ''"> and company_name like concat('%', cast(#{companyName, jdbcType=VARCHAR} as varchar), '%')</if>
+        </where>
+        order by t.create_time desc
+    </select>
+
+    <sql id="selectJobVoT">
+        select t.job_id, job_title, min_salary, max_salary, salary_composition, welfare_benefits,
+               work_schedule, education, experience, company_name, job_location, posting_date, vacancies,
+               t.del_flag, t.create_by, t.create_time, t.update_by, t.update_time, t.remark, latitude, longitude, "view",
+               company_id, is_hot, is_urgent, apply_num, is_publish, description, job_location_area_code,
+               data_source, external_source_code, external_source_name, job_url, job_category, is_explain, explain_url, cover, job_type, job_address,
+               review_status, is_key_populations, key_populations
+        from job t
+    </sql>
+
 </mapper>