Merge remote-tracking branch 'origin/master'

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

@@ -198,7 +198,7 @@
 			INNER JOIN job_recruitment jr ON jub.job_recruitment_id = jr.id_
 			INNER JOIN sys_user su ON jr.company_id = su.company_id
 			INNER JOIN job_jobuser jj ON jub.job_user_id = jj.id_
-			LEFT JOIN job_resume jre ON jj.id_ = jre.job_user_id
+			LEFT JOIN job_resume jre ON jj.id_ = jre.job_user_id on jre.approve_status=2
 		]]>
 		<where>
 			<if test="searchParams.id != null">

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

@@ -494,7 +494,7 @@ public class ResumeApiController {
                         updateWorkExp(resume.getId(),workExpDTOList,subject);
                     }
                 }
-                resume.setApproveStatus("2");//审批中
+                resume.setApproveStatus("3");//已审批
 
                 resumeService.insert(resume);
 
@@ -529,19 +529,19 @@ public class ResumeApiController {
                         updateWorkExp(resume.getId(),workExpDTOList,subject);
                     }
                 }
-                resume.setApproveStatus("2");//审批中
+                resume.setApproveStatus("3");//已审批
                 resumeService.update(resume);
             }
 
             //创建简历审批信息
-            ResumeApprove ra = new ResumeApprove();
-            ra.setId(UUID.randomUUID().toString());
-            ra.setCreateBy(subject);
-            ra.setCreateTime(new Date());
-            ra.setDelFlag(false);
-            ra.setJobResumeId(resume.getId());
-            ra.setApprovalStatus("2");//简历审批中
-            resumeApproveService.insert(ra);
+//            ResumeApprove ra = new ResumeApprove();
+//            ra.setId(UUID.randomUUID().toString());
+//            ra.setCreateBy(subject);
+//            ra.setCreateTime(new Date());
+//            ra.setDelFlag(false);
+//            ra.setJobResumeId(resume.getId());
+//            ra.setApprovalStatus("2");//简历审批中
+//            resumeApproveService.insert(ra);
 
 
             messageResult.setResult(true);