Merge remote-tracking branch 'origin/master'

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

@@ -184,7 +184,7 @@
 	<select id="foundJobManagement" parameterType="hashmap" resultType="map">
 		<![CDATA[
 			SELECT DISTINCT
-			  jwc.name_ workName,
+			  jr.title_ title,
 			  sdda.name_ dreamMoney,
 			  sddb.name_ jobStatus,
 			  year(now())-year(jre.birthday_)  age,
@@ -192,6 +192,7 @@
 			  sdde.name_ education,
 			  jj.head_image_url headImage,
 			  jj.real_name name,
+			  jre.id_ resumeId,
 			  jre.dream_add dreamAdd,
 			  jre.approve_status approveStatus,
               su.id_ sysUserId
@@ -214,6 +215,9 @@
 			<if test="searchParams.type != null">
 				and jre.approve_status = #{searchParams.type}
 			</if>
+			<if test="searchParams.sex != null">
+				and jre.sex_ = #{searchParams.sex}
+			</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

@@ -5,6 +5,13 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.jpsoft.employment.modules.base.entity.LabourServices;
+import com.jpsoft.employment.modules.job.entity.Recruitment;
+import com.jpsoft.employment.modules.job.entity.Resume;
+import com.jpsoft.employment.modules.job.entity.ResumeDeliver;
+import com.jpsoft.employment.modules.job.service.*;
+import com.jpsoft.employment.modules.sys.entity.User;
+import com.jpsoft.employment.modules.sys.service.DataDictionaryService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -21,11 +28,6 @@ import com.jpsoft.employment.modules.common.dto.Sort;
 import com.jpsoft.employment.modules.common.utils.MapUtils;
 import com.jpsoft.employment.modules.common.utils.PojoUtils;
 import com.jpsoft.employment.modules.job.entity.RecruitmentVO;
-import com.jpsoft.employment.modules.job.service.JobUserService;
-import com.jpsoft.employment.modules.job.service.RecruitmentCollectionService;
-import com.jpsoft.employment.modules.job.service.RecruitmentService;
-import com.jpsoft.employment.modules.job.service.ResumeService;
-import com.jpsoft.employment.modules.job.service.UserBrowseHrService;
 import com.jpsoft.employment.modules.sys.entity.UserVO;
 import com.jpsoft.employment.modules.sys.service.UserService;
 
@@ -62,6 +64,11 @@ public class RecruiterApiController {
     @Autowired
     private ResumeService resumeService;
 
+    @Autowired
+    private DataDictionaryService dataDictionaryService;
+
+    @Autowired
+    private ResumeDeliverService resumeDeliverService;
 
     @PostMapping("getAboutMe")
     @ApiOperation(value = "招聘方['我的'主页]")
@@ -264,7 +271,7 @@ public class RecruiterApiController {
             @ApiImplicitParam(name = "type", value = "类型(1:已投递,2:邀沟通,3:邀面试,4:邀入职,5:已入职,6:不合适)", required = false, paramType = "query")
     })
     public MessageResult<Map> loadJobManagement(
-            String id,String token,String type,
+            String id,String token,String type,String sex,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute  String subject) {
@@ -283,8 +290,24 @@ public class RecruiterApiController {
 
         searchParams.put("type",type);
 
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("sex",sex);
+        }
+
         Page<Map> page = resumeService.foundJobManagement(searchParams,pageIndex,pageSize,true,sortList);
 
+        for (Map map:page) {
+            User user = userService.get(id);
+            String companyId = user.getCompanyId();
+            Recruitment recruitment = recruitmentService.get(companyId);
+            String recruitmentId = recruitment.getId();
+            ResumeDeliver resumeDeliver = resumeDeliverService.get(recruitmentId);
+            String resumeId = resumeDeliver.getJobResumeId();
+            Resume resume = resumeService.get(resumeId);
+            String sexName = dataDictionaryService.findNameByCatalogNameAndValue("性别",resume.getSex());
+            map.put("sexName",sexName);
+        }
+
         msgResult.setResult(true);
         msgResult.setData(PojoUtils.pageWrapper(page));