Merge branch 'master' of http://47.92.161.104:10080/shuzhan/jp-employment-server

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

@@ -137,7 +137,8 @@ id_,create_by,create_time,update_by,update_time,del_flag,company_id,sys_user_id,
 			r.education_,
 			r.work_exp,
 			r.dream_money,
-			r.job_status
+			r.job_status,
+			r.position_category_id
 			from job_recruitment_collection  c inner join job_resume  r on c.resume_id=r.id_
 			inner join job_jobuser ju on r.job_user_id=ju.id_ and ju.del_flag=0
 			left join job_work_category w on r.position_category_id=w.id_ and w.del_flag=0
@@ -155,6 +156,9 @@ id_,create_by,create_time,update_by,update_time,del_flag,company_id,sys_user_id,
 			<if test="searchParams.positionName != null and searchParams.positionName !=''">
 				and positionCategoryName like #{searchParams.positionName}
 			</if>
+			<if test="searchParams.positionId != null and searchParams.positionId !=''">
+				and position_category_id in (select id_ from job_work_category  where instr(code_,#{searchParams.positionId})>0)
+			</if>
 			<if test="searchParams.education != null and searchParams.education != ''">
 				and education_ = #{searchParams.education}
 			</if>
@@ -183,21 +187,26 @@ id_,create_by,create_time,update_by,update_time,del_flag,company_id,sys_user_id,
 	<select id="pagedLoadAllResumes" parameterType="hashMap" resultType="Map">
 		<![CDATA[
 			select  * from (select
-			ju.real_name  realName,
-			ju.head_image_url headImage,
-			ju.address_ address,
-			year(now())-year(ju.birthday_)  age,
-			w.name_ positionCategoryName,
-			workExpw.name_   workExp,
-			eduw.name_  eduName,
-			sexw.name_   sex,
-			jobstaw.name_   jobStatus,
-			drmoneyw.name_  dreamMoney,
-			r.id_ as resumeId,
-			r.del_flag,
-			r.update_time,
-			rede.chat_status,
-			rerd.browse_count
+				ju.real_name  realName,
+				ju.head_image_url headImage,
+				ju.address_ address,
+				year(now())-year(ju.birthday_)  age,
+				w.name_ positionCategoryName,
+				workExpw.name_   workExp,
+				eduw.name_  eduName,
+				sexw.name_   sex,
+				jobstaw.name_   jobStatus,
+				drmoneyw.name_  dreamMoney,
+				r.id_ as resumeId,
+				r.del_flag,
+				r.update_time,
+				rede.chat_status,
+				rerd.browse_count,
+				r.education_,
+				r.work_exp,
+				r.dream_money,
+				r.job_status,
+				r.position_category_id
 			from job_resume  r
 			inner join job_jobuser ju on r.job_user_id=ju.id_ and ju.del_flag=0
 			left join job_resume_deliver rede on r.id_=rede.job_resume_id and rede.del_flag=0
@@ -217,6 +226,22 @@ id_,create_by,create_time,update_by,update_time,del_flag,company_id,sys_user_id,
 			<if test="searchParams.positionName != null and searchParams.positionName !=''">
 				and positionCategoryName like #{searchParams.positionName}
 			</if>
+			<if test="searchParams.positionId != null and searchParams.positionId !=''">
+				and position_category_id in (select id_ from job_work_category  where instr(code_,#{searchParams.positionId})>0)
+			</if>
+			<if test="searchParams.education != null and searchParams.education != ''">
+				and education_ = #{searchParams.education}
+			</if>
+			<if test="searchParams.workExp != null and searchParams.workExp !='' ">
+				and work_exp = #{searchParams.workExp}
+			</if>
+			
+			<if test="searchParams.dreamMoney != null and searchParams.dreamMoney !=''">
+				and dream_money = #{searchParams.dreamMoney}
+			</if>
+			<if test="searchParams.jobStatus != null and searchParams.jobStatus != ''">
+				and job_status = #{searchParams.jobStatus}
+			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
 			${sort.name} ${sort.order}

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

@@ -137,6 +137,7 @@ public class RecruiterApiController {
     @ApiOperation(value = "招聘方[收藏简历]")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "positionName", value = "职位名称关键字", required = false, paramType = "form"),
+            @ApiImplicitParam(name = "positionId", value = "职位类别id值", required = false, paramType = "form"),
             @ApiImplicitParam(name = "education", value = "学历编码值", required = false, paramType = "form"),
             @ApiImplicitParam(name = "workExp", value = "工作经验编码值", required = false, paramType = "form"),
             @ApiImplicitParam(name = "dreamMoney", value = "期望月薪编码值", required = false, paramType = "form"),
@@ -145,6 +146,7 @@ public class RecruiterApiController {
     public MessageResultSimple loadCollectResumes(@RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
                                                 @RequestParam(value="pageSize",defaultValue="20") int pageSize,
                                                 @RequestParam(value="positionName",required = false) String positionName,
+                                                @RequestParam(value="positionId",required = false) String positionId,
                                                 @RequestParam(value="education",required = false) String education,
                                                 @RequestParam(value="workExp",required = false) String workExp,
                                                 @RequestParam(value="dreamMoney",required = false) String dreamMoney,
@@ -156,7 +158,7 @@ public class RecruiterApiController {
             List<Sort> sortList = new ArrayList<>();
             sortList.add(new Sort("collectionTime","desc"));
             positionName=StringUtils.isEmpty(positionName)?null:("%"+positionName+"%");
-            Map<String,Object> args=MapUtils.builder("recruiterId",subject,"positionName",positionName,"education",education,"workExp",workExp,"dreamMoney",dreamMoney,"jobStatus",jobStatus);
+            Map<String,Object> args=MapUtils.builder("recruiterId",subject,"positionId",positionId,"positionName",positionName,"education",education,"workExp",workExp,"dreamMoney",dreamMoney,"jobStatus",jobStatus);
             Page<Map<String,Object>> page = recruitmentCollectionService.pagedLoadCollectResumes(args,pageIndex,pageSize,true,sortList);
             return MessageResultBuilder.success(PojoUtils.pageWrapper(page));
         }
@@ -189,12 +191,22 @@ public class RecruiterApiController {
     @ApiOperation(value = "招聘方[招聘主页]")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "positionName", value = "职位名称关键字", required = false, paramType = "form"),
+            @ApiImplicitParam(name = "positionId", value = "职位类别id值", required = false, paramType = "form"),
+            @ApiImplicitParam(name = "education", value = "学历编码值", required = false, paramType = "form"),
+            @ApiImplicitParam(name = "workExp", value = "工作经验编码值", required = false, paramType = "form"),
+            @ApiImplicitParam(name = "dreamMoney", value = "期望月薪编码值", required = false, paramType = "form"),
+            @ApiImplicitParam(name = "jobStatus", value = "工作状态编码值", required = false, paramType = "form"),
             @ApiImplicitParam(name = "orderType", value = "排序类别[new:最新，hot:最热]", required = false, paramType = "form")
     })
-    public MessageResult<Map> loadAllResumes(@RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+    public MessageResultSimple loadAllResumes(@RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
                                                  @RequestParam(value="pageSize",defaultValue="20") int pageSize,
                                                  @RequestParam(value="orderType",defaultValue="new") String orderType,
-                                                 @RequestParam(value="positionName",required = false) String positionName
+                                                 @RequestParam(value="positionName",required = false) String positionName,
+                                                 @RequestParam(value="positionId",required = false) String positionId,
+                                                 @RequestParam(value="education",required = false) String education,
+                                                 @RequestParam(value="workExp",required = false) String workExp,
+                                                 @RequestParam(value="dreamMoney",required = false) String dreamMoney,
+                                                 @RequestParam(value="jobStatus",required = false) String jobStatus
     ) {
 
         try{
@@ -206,12 +218,14 @@ public class RecruiterApiController {
                 sortList.add(new Sort("update_time","desc"));
             }
             positionName=StringUtils.isEmpty(positionName)?null:("%"+positionName+"%");
-            Page<Map<String,Object>> page = recruitmentCollectionService.pagedLoadAllResumes(MapUtils.builder("positionName",positionName),pageIndex,pageSize,true,sortList);
-            return MessageResultBuilder.ok(PojoUtils.pageWrapper(page));
+            Map<String,Object> args=MapUtils.builder("positionId",positionId,"positionName",positionName,"education",education,"workExp",workExp,"dreamMoney",dreamMoney,"jobStatus",jobStatus);
+            
+            Page<Map<String,Object>> page = recruitmentCollectionService.pagedLoadAllResumes(args,pageIndex,pageSize,true,sortList);
+            return MessageResultBuilder.success(PojoUtils.pageWrapper(page));
         }
         catch(Exception ex){
             log.error(ex.getMessage());
-            return MessageResultBuilder.error(ex.getMessage());
+            return MessageResultBuilder.failed(ex.getMessage());
         }
     }