1

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

@@ -5,25 +5,29 @@
 <mapper namespace="com.jpsoft.employment.modules.job.dao.ResumeDAO">
 	<resultMap id="ResumeMap" type="com.jpsoft.employment.modules.job.entity.Resume">
 		<id property="id" column="id_" />
-			<result property="createBy" column="create_by" />
-			<result property="createTime" column="create_time" />
-			<result property="updateBy" column="update_by" />
-			<result property="updateTime" column="update_time" />
-			<result property="delFlag" column="del_flag" />
-			<result property="jobUserId" column="job_user_id" />
-			<result property="sex" column="sex_" />
-			<result property="positionCategoryId" column="position_category_id" />
-			<result property="workExp" column="work_exp" />
-			<result property="education" column="education_" />
-			<result property="dreamMoney" column="dream_money" />
-			<result property="dreamAdd" column="dream_add" />
-			<result property="birthday" column="birthday_" />
-			<result property="introduction" column="introduction_" />
-			<result property="status" column="status_" />
-			<result property="approveStatus" column="approve_status" />
-			<result property="jobStatus" column="job_status" />
-			<result property="resumeUrls" column="resume_urls" />
-			</resultMap>
+		<result property="createBy" column="create_by" />
+		<result property="createTime" column="create_time" />
+		<result property="updateBy" column="update_by" />
+		<result property="updateTime" column="update_time" />
+		<result property="delFlag" column="del_flag" />
+		<result property="jobUserId" column="job_user_id" />
+		<result property="sex" column="sex_" />
+		<result property="positionCategoryId" column="position_category_id" />
+		<result property="workExp" column="work_exp" />
+		<result property="education" column="education_" />
+		<result property="dreamMoney" column="dream_money" />
+		<result property="dreamAdd" column="dream_add" />
+		<result property="birthday" column="birthday_" />
+		<result property="introduction" column="introduction_" />
+		<result property="status" column="status_" />
+		<result property="approveStatus" column="approve_status" />
+		<result property="jobStatus" column="job_status" />
+		<result property="resumeUrls" column="resume_urls" />
+		<!--外联字段-->
+		<result property="userPhoto" column="head_image_url" />
+		<result property="userName" column="real_name" />
+		<result property="userIsAuthentication" column="is_authentication" />
+	</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.job.entity.Resume">
 	<!--
 	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
@@ -132,12 +136,22 @@
 	</select>
 	<select id="search" parameterType="hashmap" resultMap="ResumeMap">
 		<![CDATA[
-			select * from job_resume
+			SELECT a.*,b.head_image_url,b.real_name,b.is_authentication FROM job_resume a
+			LEFT JOIN job_jobuser b ON a.job_user_id = b.id_
 		]]>
 		<where>
-			del_flag = 0
-			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
+			a.del_flag = 0
+			<if test="searchParams.positionCategoryId != null">
+				and a.position_category_id = #{searchParams.positionCategoryId}
+			</if>
+			<if test="searchParams.approveStatus != null">
+				and a.approve_status = #{searchParams.approveStatus}
+			</if>
+			<if test="searchParams.status != null">
+				and a.status_ = #{searchParams.status}
+			</if>
+			<if test="searchParams.name != null">
+				and b.real_name like #{searchParams.name}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

web/src/main/java/com/jpsoft/employment/modules/job/controller/RecruitmentController.java

@@ -230,12 +230,7 @@ public class RecruitmentController {
 
             recruitment.setWorkYearName(dataDictionaryService.getName(recruitment.getWorkYear()));
             recruitment.setEducationName(dataDictionaryService.getName(recruitment.getEducation()));
-            if(recruitment.getIsDiscussPersonally()){
-                recruitment.setWageTypeName("面议");
-            }
-            else{
-                recruitment.setWageTypeName(dataDictionaryService.getName(recruitment.getWageType()));
-            }
+            recruitment.setWageTypeName(dataDictionaryService.getName(recruitment.getWageType()));
         }
 
         msgResult.setResult(true);

web/src/main/java/com/jpsoft/employment/modules/job/controller/ResumeController.java

@@ -157,7 +157,7 @@ public class ResumeController {
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     public MessageResult<Map> pageList(
-            String id,
+            String positionCategoryId, String approveStatus, String status, String name,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             HttpServletRequest request){
@@ -166,20 +166,29 @@ public class ResumeController {
         Map<String,Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_","asc"));
+        sortList.add(new Sort("a.id_","asc"));
 
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
+        if (StringUtils.isNotEmpty(positionCategoryId)) {
+            searchParams.put("positionCategoryId",positionCategoryId);
+        }
+        if (StringUtils.isNotEmpty(approveStatus)) {
+            searchParams.put("approveStatus",approveStatus);
+        }
+        if (StringUtils.isNotEmpty(status)) {
+            searchParams.put("status",status);
+        }
+        if (StringUtils.isNotEmpty(name)) {
+            searchParams.put("name","%" + name + "%");
         }
 
         Page<Resume> page = resumeService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
         for(Resume resume : page.getResult()){
-            JobUser jobUser = jobUserService.get(resume.getJobUserId());
-            if(jobUser != null) {
-                resume.setUserPhoto(jobUser.getHeadImageUrl());
-                resume.setUserName(jobUser.getRealName());
-                resume.setUserIsAuthentication(jobUser.getIsAuthentication());
-            }
+//            JobUser jobUser = jobUserService.get(resume.getJobUserId());
+//            if(jobUser != null) {
+//                resume.setUserPhoto(jobUser.getHeadImageUrl());
+//                resume.setUserName(jobUser.getRealName());
+//                resume.setUserIsAuthentication(jobUser.getIsAuthentication());
+//            }
 
             WorkCategory workCategory = workCategoryService.get(resume.getPositionCategoryId());
             if(workCategory != null) resume.setPositionCategoryName(workCategory.getName());
@@ -205,11 +214,11 @@ public class ResumeController {
 
         try {
             Resume resume = resumeService.get(id);
-            if(resume.getStatus().equals("0")) {
-                resume.setStatus("1");
+            if(resume.getStatus().equals("7a308001-f476-411a-8802-28992be86cb1")) {
+                resume.setStatus("89ad69d3-b9e5-4ea3-90bf-04a57fc3c48c");
             }
             else{
-                resume.setStatus("0");
+                resume.setStatus("7a308001-f476-411a-8802-28992be86cb1");
             }
             int affectCount = resumeService.update(resume);