guantao 3 年 前
コミット
eba7cc319b

+ 15 - 10
wxdks/src/main/resources/com/c3/wxdks/mapper/RecruitMapper.xml

@@ -143,17 +143,22 @@
                 and scale = #{scale}
             </if>
             and (
-                    <if test="minSalary != null and minSalary != ''">
-                         ((#{minSalary} &gt;= min_salary OR max_salary IS NULL) and ( #{minSalary} &lt;= max_salary or max_salary is null))
+                    <if test="minSalary != null and minSalary != -1">
+                        <if test="minSalary != null and minSalary != ''">
+                            ((#{minSalary} &gt;= min_salary AND max_salary != -1) and ( #{minSalary} &lt;= max_salary or max_salary is null))
+                        </if>
+                        <if test="(minSalary != null and minSalary != '') and (maxSalary != null and maxSalary != '')">
+                            or
+                        </if>
+                        <if test="maxSalary != null and maxSalary != ''">
+                            ((#{maxSalary} &gt;= min_salary AND max_salary != -1) and ( #{maxSalary} &lt;= max_salary or max_salary is null))
+                        </if>
+                        <if test="(minSalary != null and minSalary != '') or (maxSalary != null and maxSalary != '')">
+                            and
+                        </if>
                     </if>
-                    <if test="(minSalary != null and minSalary != '') and (maxSalary != null and maxSalary != '')">
-                        or
-                    </if>
-                    <if test="maxSalary != null and maxSalary != ''">
-                         ((#{maxSalary} &gt;= min_salary OR max_salary IS NULL) and ( #{maxSalary} &lt;= max_salary or max_salary is null))
-                    </if>
-                    <if test="(minSalary != null and minSalary != '') or (maxSalary != null and maxSalary != '')">
-                        and
+                    <if test="minSalary != null and minSalary == -1">
+                        min_salary = -1 and
                     </if>
                     1 = 1
                 )

+ 2 - 1
wxdks/src/main/resources/static/zlhbw/jrwm/jrwm.html

@@ -92,6 +92,7 @@
                 <span class="xz-title">薪资范围:</span>
                 <div class="xz-content salary-area">
                 	<span data-index="">不限</span>
+                	<span data-index="-1">面议</span>
                     <span data-index="0">2K以下</span>
                     <span data-index="1">2K-4K</span>
                     <span data-index="2">4K-6K</span>
@@ -246,7 +247,7 @@
             </ul>
         </div>
     </div>
-    
+
     <!-- 侧边导航栏 -->
     <div class="side_nav">
         <div class="snav_title">

+ 20 - 4
wxdks/src/main/resources/static/zlhbw/jrwm/jrwm.js

@@ -175,7 +175,7 @@ function initPageClick() {
 	$('.salary-area').on('click', 'span', function () {
 		var attr = ['0-2K', '2K-4K', '4K-6K', '6K-8K', '8K-10K', '10k-'];
 		var index = $(this).attr('data-index');
-		if(index){
+		if(index && index >= 0){
 			var range = attr[index].split('-');
 			$('input[name=qsxz]').val(range[0]);
 			$('input[name=jsxz]').val(range[1]);
@@ -184,11 +184,17 @@ function initPageClick() {
 			$('input[name=jsxz]').val("");
 		}
 
+		if (index < 0) {
+			getRecruitList();
+		}
+
 	})
 
 	$('.xzconfirm').on('click', function () {
-		condition.minSalary = parseInt(($('input[name=qsxz]').val().split('K')[0])*1000);
-		condition.maxSalary = parseInt(($('input[name=jsxz]').val().split('K')[0])*1000);
+		var qsxz = $('input[name=qsxz]').val();
+		var jsxz = $('input[name=jsxz]').val();
+		condition.minSalary = qsxz ? parseInt((qsxz.split('K')[0])*1000) : '';
+		condition.maxSalary = jsxz ? parseInt((jsxz.split('K')[0])*1000) : '';
 		console.log("minSalary:"+condition.minSalary);
 		console.log("maxSalary:"+condition.maxSalary);
 		getRecruitList();
@@ -218,6 +224,10 @@ function initPageEvent() {
  * 获取并渲染列表数据
  */
 function getRecruitList() {
+	var my = $('.salary-area span[data-index="-1"]').hasClass('textActive');
+	if (my) {
+		condition.minSalary = -1;
+	}
 	$.ajax({
 		url: PAGE_BASIC + "/recruit/getFrontList",
 		type: "get",
@@ -232,13 +242,19 @@ function getRecruitList() {
 				var html = '';
 				for (var i = 0; i < data.length; i++) {
 					const obj = data[i];
+					var salary = '';
+					if (obj.minSalary == -1) {
+						salary = '面议';
+					} else {
+						salary = numberToChar(obj.minSalary) + ( obj.maxSalary ? '-' + numberToChar(obj.maxSalary) : '+' );
+					}
 					html += '<div class="zpList">' +
 								'<div class="zp-title">' +
 									'<div class="left">' +
 										'<span class="zp-name">' + obj.workName + '</span>' +
 										'<span class="zp-time">' + obj.createTime.split(' ')[0] + '发布</span>' +
 									'</div>' +
-									'<div class="right">' + numberToChar(obj.minSalary) + ( obj.maxSalary ? '-' + numberToChar(obj.maxSalary) : '+' ) + '</div>' +
+									'<div class="right">' + salary + '</div>' +
 								'</div>' +
 								'<p class="zp-enterprise">' + obj.orgName + '</p>' +
 								'<div class="zp-second">' +

+ 13 - 5
wxdks/src/main/resources/static/zlhbw/zpxq/zpxq.js

@@ -22,20 +22,28 @@ function initPage() {
         success: function(json) {
             const data = json.data;
             if (json.result && data) {
+                var salary = '';
+                if (data.minSalary == -1) {
+                    salary = '面议';
+                } else {
+                    salary = numberToChar(data.minSalary) + (data.maxSalary ? '-' + numberToChar(data.maxSalary) : '+');
+                }
                 $('.zw_name').empty().append(data.workName);
                 $('.fb_time').empty().append(data.createTime.split(' ')[0] + '发布');
                 $('.gs_name').empty().append(data.orgName);
                 $('.num_info').empty().append('招聘人数:' + data.recruitNum + '人丨' +
                     '工作经验:' + (data.workExp ? data.workExp : '不限') + ' 丨 ' +
                     '学历:' + (data.edu ? data.edu : '不限'));
-                $('.my_s').empty().append(numberToChar(data.minSalary) + (data.maxSalary ? '-' + numberToChar(data.maxSalary) : '+'));
+                $('.my_s').empty().append(salary);
 
+                var zwsm = data.workDescribe ? data.workDescribe.replaceAll('\n', '<br>') : '暂无';
+                var zwyq = data.workRequirement ? data.workRequirement.replaceAll('\n', '<br>') : '暂无';
 
-                $('.zwsm ul').empty().append(data.workDescribe.replaceAll('\n', '<br>'))
-                $('.zwyq ul').empty().append(data.workRequirement.replaceAll('\n', '<br>'))
+                $('.zwsm ul').empty().append(zwsm)
+                $('.zwyq ul').empty().append(zwyq)
                 $('.xx2 ul').append('<li>联系人: ' + data.contacts + '</li>')
                 $('.xx2 ul').append('<li>联系电话: ' + data.contactPhone + '</li>')
-                $('.xx2 ul').append('<li>上班地址: ' + data.address + '</li>')
+                $('.xx2 ul').append('<li>上班地址: ' + (data.address ? data.address : '暂无') + '</li>')
             }
         }
     })
@@ -46,4 +54,4 @@ function initPage() {
  */
 function numberToChar(num) {
     return (num / 1000) + 'k';
-}
+}