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

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

@@ -116,15 +116,39 @@ id_,create_by,create_time,update_by,update_time,del_flag,company_id,sys_user_id,
 	 	</foreach>
 	</select>
 
-	<select id="pagedLoad" parameterType="hashMap" resultMap="ResumeVOMap">
+	<!--用于移动端接口：招聘方【收藏简历】-->
+	<select id="pagedLoad" parameterType="hashMap" resultType="Map">
 		<![CDATA[
-			select r.*,w.name_ position_category_name from job_recruitment_collection  c inner join job_resume  r on c.resume_id=r.id_
-			left join job_work_category w on r.position_category_id=w.id_
-			where c.sys_user_id = #{searchParams.recruiterId}
+			select  * from (select
+			c.sys_user_id hrId,
+			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_  sexName,
+			jobstaw.name_  jobStatus,
+			drmoneyw.name_ dreamMoney,
+			c.update_time collectionTime,
+			c.del_flag
+			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
+			left join sys_data_dictionary workExpw on r.work_exp=workExpw.value_ and workExpw.del_flag=0  and workExpw.parent_id='7724a25f-a781-46f4-b048-d9812108ff02'
+			left join sys_data_dictionary eduw on r.education_=eduw.value_ and eduw.del_flag=0  and eduw.parent_id='c1887d9d-e945-4875-be3f-905195cd8a8e'
+			left join sys_data_dictionary sexw on r.sex_=sexw.value_ and sexw.del_flag=0  and sexw.parent_id='0c3194dc-884d-4ea9-9966-dfb94f537f5c'
+			left join sys_data_dictionary jobstaw on ju.job_status=jobstaw.value_ and jobstaw.del_flag=0  and jobstaw.parent_id='e03f43d0-46f8-4696-a6f2-331d353dccd8'
+			left join sys_data_dictionary drmoneyw on r.dream_money=drmoneyw.value_ and drmoneyw.del_flag=0  and drmoneyw.parent_id='b5e4a52a-9f89-4e3b-976f-79207a40587d'
+			) tab
 		]]>
 		<where>
+			<if test="1==1">
+				and del_flag=0 and hrId = #{searchParams.recruiterId}
+			</if>
 			<if test="searchParams.positionName != null">
-				and w.name_ like #{searchParams.positionName}
+				and positionCategoryName like #{searchParams.positionName}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

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

@@ -112,8 +112,9 @@ public class RecruiterApiController {
 
         try{
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("update_time","desc"));
-            Page<ResumeVO> page = recruitmentCollectionService.pagedLoad(MapUtils.builder("recruiter",subject,"positionName",positionName),pageIndex,pageSize,true,sortList);
+            sortList.add(new Sort("collectionTime","desc"));
+            positionName=StringUtils.isEmpty(positionName)?null:("%"+positionName+"%");
+            Page<ResumeVO> page = recruitmentCollectionService.pagedLoad(MapUtils.builder("recruiterId",subject,"positionName",positionName),pageIndex,pageSize,true,sortList);
             return MessageResultBuilder.ok(PojoUtils.pageWrapper(page));
         }
         catch(Exception ex){