Compare commits

...

3 Commits

Author SHA1 Message Date
chenyanchang
1393f1bd47 update 2026-06-29 09:51:43 +08:00
chenyanchang
45587c2389 Merge branch 'main' of http://124.243.245.42:3000/zkr/shz-backend into main
 Conflicts:
	ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml
2026-06-29 09:43:43 +08:00
chenyanchang
bdbdfbf180 update 2026-06-29 09:41:50 +08:00

View File

@@ -387,16 +387,16 @@
r.*, r.*,
ja.id AS apply_id, ja.id AS apply_id,
CASE CASE
WHEN CAST(p.job_category AS TEXT) = ANY(string_to_array(r.job_title_id, ',')) 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) 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)
AND (CAST(r.area AS INTEGER) = CAST(p.job_location_area_code AS INTEGER) OR p.job_location_area_code IS NULL) AND (CAST(r.area AS INTEGER) = CAST(p.job_location_area_code AS INTEGER) OR p.job_location_area_code IS NULL)
AND (CAST(r.education AS INTEGER) >=CAST(p.education AS INTEGER) OR p.education IS NULL OR p.education = '-1') AND (CAST(r.education AS INTEGER) >=CAST(p.education AS INTEGER) OR p.education IS NULL OR p.education = '-1')
THEN 1 THEN 1
WHEN CAST(p.job_category AS TEXT) = ANY(string_to_array(r.job_title_id, ',')) 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) 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)
AND (CAST(r.area AS INTEGER) = CAST(p.job_location_area_code AS INTEGER) OR p.job_location_area_code IS NULL) AND (CAST(r.area AS INTEGER) = CAST(p.job_location_area_code AS INTEGER) OR p.job_location_area_code IS NULL)
THEN 2 THEN 2
WHEN CAST(p.job_category AS TEXT) = ANY(string_to_array(r.job_title_id, ',')) 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) 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)
THEN 3 THEN 3
WHEN (CAST(p.job_category AS TEXT) = ANY(string_to_array(r.job_title_id, ',')) OR p.job_category IS NULL) WHEN (CAST(p.job_category AS TEXT) = ANY(string_to_array(r.job_title_id, ',')) OR p.job_category IS NULL)
@@ -406,7 +406,7 @@
FROM shz.job p FROM shz.job p
JOIN shz.app_user r ON r.del_flag = '0' JOIN shz.app_user r ON r.del_flag = '0'
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' 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} WHERE r.is_company_user = '1' and p.job_id = #{jobId}
) c ) c
) t ) t
WHERE best_rn = 1 WHERE best_rn = 1