接口修改

common/src/main/resources/mapper/job/Recruitment.xml

@@ -216,14 +216,14 @@
 			SELECT
 				jr.id_ AS id,
 				jr.title_ AS title,
-				jr.requirements_ AS requirements,
 				jr.address_ AS address,
 				bc.logo_ AS logo,
 				bc.name_ AS name,
 				sdda.name_ AS scaleName,
 				sddb.name_ AS wageTypeN,
 				bci.city_name AS cityName,
-				sddc.name_ AS industry
+				sddc.name_ AS industry,
+				sddd.name_ AS workYear
 			FROM
 				job_recruitment AS jr
 			LEFT JOIN base_company AS bc ON jr.company_id = bc.id_
@@ -240,7 +240,7 @@
 				and jr.wage_type like #{searchParams.monthlySalary}
 			</if>
 			<if test="searchParams.workExperience != null">
-				and jr.requirements_ like #{searchParams.workExperience}
+				and sddd.name_ like #{searchParams.workExperience}
 			</if>
 			<if test="searchParams.education != null">
 				and jr.education_ like #{searchParams.education}

common/src/main/resources/mapper/job/UserBrowseHr.xml

@@ -79,7 +79,10 @@
 	</select>
 	<select id="search" parameterType="hashmap" resultMap="UserBrowseHrMap">
 		<![CDATA[
-			select * from job_user_browse_hr a left join job_resume b on a.job_resume_id = b.id_
+			select * from
+			  job_user_browse_hr a
+			left join job_resume b on a.job_resume_id = b.id_
+			left join job_work_category c on b.position_category_id = c.id_
 		]]>
 		<where>
 			a.del_flag = 0 and b.del_flag = 0
@@ -108,6 +111,11 @@
 			<if test="searchParams.endTime != null">
 				<![CDATA[
                   and a.create_time <= #{searchParams.endTime}
+                ]]>
+			</if>
+			<if test="searchParams.positionName != null">
+				<![CDATA[
+                  and c.name_ like #{searchParams.positionName}
                 ]]>
 			</if>
 		</where>

web/src/main/java/com/jpsoft/employment/modules/mobile/controller/UserBrowseHrApiController.java

@@ -11,6 +11,8 @@ import com.jpsoft.employment.modules.job.service.*;
 import com.jpsoft.employment.modules.sys.entity.DataDictionary;
 import com.jpsoft.employment.modules.sys.service.DataDictionaryService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -48,8 +50,11 @@ public class UserBrowseHrApiController {
 
     @PostMapping("pageListHR")
     @ApiOperation(value = "浏览记录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "positionName", value = "职位名称关键字", required = false, paramType = "form")
+    })
     public MessageResult<Map> pageListHR(
-            String token,String positionCategoryId,Integer age,String sex,
+            String token,String positionName,String positionCategoryId,Integer age,String sex,
             String workExp,String education,String createTimeRange,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
@@ -116,6 +121,9 @@ public class UserBrowseHrApiController {
             searchParams.put("endTime", endTime);
         }
 
+        if(StringUtils.isNotEmpty(positionName)){
+            searchParams.put("positionName","%"+positionName+"%");
+        }
 
         Page<UserBrowseHr> page = userBrowseHrService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
 
@@ -134,7 +142,7 @@ public class UserBrowseHrApiController {
             String workExpName="";
             String dreamMoneyName="";
             String educationName="";
-            String positionName = "";
+//            String positionName = "";
 
 
             if(resume!=null){