diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/vo/CandidateVO.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/vo/CandidateVO.java index 38ec0ec..157f3ba 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/vo/CandidateVO.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/vo/CandidateVO.java @@ -12,7 +12,7 @@ public class CandidateVO extends AppUser { @JsonFormat(pattern = "yyyy-MM-dd") private Date applyDate; private Integer matchingDegree; - private String applyId; + private Long applyId; private String hire; @Excel(name = "公司名称", sort = 0) private String companyName; diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml index 1e6dd26..8432164 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml @@ -385,6 +385,7 @@ FROM ( SELECT r.*, + ja.id AS apply_id, CASE WHEN (CAST(p.job_category AS TEXT) = ANY(string_to_array(r.job_title_id, ',')) OR p.job_category IS NULL) AND ((CAST(r.salary_min AS INTEGER) <= p.max_salary AND CAST(r.salary_max AS INTEGER) >= p.min_salary) OR p.max_salary IS NULL) @@ -404,7 +405,8 @@ END AS match_level FROM shz.job p JOIN shz.app_user r ON r.del_flag = '0' - WHERE r.is_company_user = '1' and p.job_id = #{jobId} + LEFT JOIN shz.job_apply ja ON ja.user_id = r.user_id AND ja.job_id = p.job_id AND ja.del_flag = '0' + WHERE p.job_id = #{jobId} ) c ) t WHERE best_rn = 1 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java index d5dce8a..805c6c1 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java @@ -176,4 +176,8 @@ public class AppUser extends BaseEntity //匹配描述 @TableField(exist = false) private String matchLevelDesc; + + /** 投递申请ID(推荐简历关联查询时填充,非app_user表字段) */ + @TableField(exist = false) + private Long applyId; }