调整

common/src/main/java/com/jpsoft/employment/modules/job/entity/JobUser.java

@@ -79,8 +79,4 @@ public class JobUser {
 	@ApiModelProperty(value = "身份证照片")
 	private String idCardUrl;
 
-	@ApiModelProperty(value = "工作状态(是否上班")
-	private String jobStatus;
-	
-
 }

common/src/main/java/com/jpsoft/employment/modules/job/entity/Resume.java

@@ -74,4 +74,7 @@ public class Resume {
 	@ApiModelProperty(value = "审批状态")
 	private String approveStatus;
 
+	@ApiModelProperty(value = "工作状态(字典:工作在职状态")
+	private String jobStatus;
+
 }

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

@@ -23,7 +23,6 @@
 			<result property="isAuthentication" column="is_authentication" />
 			<result property="idCard" column="id_card" />
 			<result property="idCardUrl" column="id_card_url" />
-			<result property="jobStatus" column="job_status" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.job.entity.JobUser">
 	<!--
@@ -33,7 +32,7 @@
 	-->
 	<![CDATA[
 		insert into job_jobuser
-	    (id_,create_by,create_time,update_by,update_time,del_flag,user_name,password_,real_name,open_id,tel_,sex_,birthday_,address_,first_job_time,head_image_url,is_authentication,id_card,id_card_url,job_status)
+	    (id_,create_by,create_time,update_by,update_time,del_flag,user_name,password_,real_name,open_id,tel_,sex_,birthday_,address_,first_job_time,head_image_url,is_authentication,id_card,id_card_url)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -55,7 +54,6 @@
 ,#{isAuthentication,jdbcType= VARCHAR }
 ,#{idCard,jdbcType=VARCHAR}
 ,#{idCardUrl,jdbcType= NUMERIC }
-,#{jobStatus,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -118,9 +116,6 @@
 		</if>
 				<if test="idCardUrl!=null">
 		id_card_url=#{idCardUrl,jdbcType= NUMERIC },
-		</if>
-				<if test="jobStatus!=null">
-		job_status=#{jobStatus,jdbcType=VARCHAR},
 		</if>
 		</set>
 	where id_=#{id}

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

@@ -21,6 +21,7 @@
 			<result property="introduction" column="introduction_" />
 			<result property="status" column="status_" />
 			<result property="approveStatus" column="approve_status" />
+			<result property="jobStatus" column="job_status" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.job.entity.Resume">
 	<!--
@@ -30,7 +31,8 @@
 	-->
 	<![CDATA[
 		insert into job_resume
-	    (id_,create_by,create_time,update_by,update_time,del_flag,job_user_id,sex_,position_category_id,work_exp,education_,dream_money,dream_add,birthday_,introduction_,status_,approve_status)
+	    (id_,create_by,create_time,update_by,update_time,del_flag,job_user_id,sex_,position_category_id,work_exp,education_,dream_money,dream_add,birthday_,introduction_,status_,approve_status,
+	    job_status)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -50,6 +52,7 @@
 ,#{introduction,jdbcType=VARCHAR}
 ,#{status,jdbcType=VARCHAR}
 ,#{approveStatus,jdbcType=VARCHAR}
+,#{jobStatus,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -107,6 +110,9 @@
 				<if test="approveStatus!=null">
 		approve_status=#{approveStatus,jdbcType=VARCHAR},
 		</if>
+			<if test="jobStatus!=null">
+				job_status=#{jobStatus,jdbcType=VARCHAR},
+			</if>
 		</set>
 	where id_=#{id}
 	</update>

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

@@ -378,14 +378,6 @@ public class ResumeDeliverController {
 
             if(jobUser!=null){
                 dto.setName(jobUser.getRealName());
-                dto.setJobStatus(jobUser.getJobStatus());
-
-                if(StringUtils.isNotEmpty(jobUser.getJobStatus())) {
-                    String jobStatusN = dataDictionaryService.findNameByCatalogNameAndValue("工作在职状态", jobUser.getJobStatus());
-                    dto.setJobStatusN(jobStatusN);
-                }
-
-
             }
 
             Recruitment recruitment = recruitmentService.get(resumeDeliver.getJobRecruitmentId());
@@ -409,6 +401,12 @@ public class ResumeDeliverController {
                 dto.setWorkExp(resume.getWorkExp());
                 dto.setEducation(resume.getEducation());
                 dto.setBirthday(resume.getBirthday());
+                dto.setJobStatus(resume.getJobStatus());
+
+                if(StringUtils.isNotEmpty(resume.getJobStatus())) {
+                    String jobStatusN = dataDictionaryService.findNameByCatalogNameAndValue("工作在职状态", resume.getJobStatus());
+                    dto.setJobStatusN(jobStatusN);
+                }
             }
 
             dto.setChatStatus(resumeDeliver.getChatStatus());
@@ -600,14 +598,6 @@ public class ResumeDeliverController {
 
             if(jobUser!=null){
                 map.put("name",jobUser.getRealName());
-                map.put("jobStatus",jobUser.getJobStatus());
-
-                if(StringUtils.isNotEmpty(jobUser.getJobStatus())) {
-                    String jobStatusN = dataDictionaryService.findNameByCatalogNameAndValue("工作在职状态", jobUser.getJobStatus());
-                    map.put("jobStatusN",jobStatusN);
-                }
-
-
             }
 
             Recruitment recruitment = recruitmentService.get(resumeDeliver.getJobRecruitmentId());
@@ -627,6 +617,12 @@ public class ResumeDeliverController {
                 map.put("dreamMoney",resume.getDreamMoney());
                 map.put("workExp",resume.getWorkExp());
                 map.put("education",resume.getEducation());
+                map.put("jobStatus",resume.getJobStatus());
+
+                if(StringUtils.isNotEmpty(resume.getJobStatus())) {
+                    String jobStatusN = dataDictionaryService.findNameByCatalogNameAndValue("工作在职状态", resume.getJobStatus());
+                    map.put("jobStatusN",jobStatusN);
+                }
 
                 String birthday="";
 

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

@@ -131,7 +131,6 @@ public class JobUserApiController {
                 jobUser.setId(UUID.randomUUID().toString());
                 jobUser.setRealName("未注册用户");
                 jobUser.setPassword(passwordEnc);
-                jobUser.setJobStatus("1");
                 jobUser.setCreateTime(new Date());
                 jobUser.setDelFlag(false);
                 jobUser.setHeadImageUrl("http://xpgj.oss-cn-shanghai.aliyuncs.com/xpgj/test/default_avatar.jpg");
@@ -233,7 +232,6 @@ public class JobUserApiController {
                     jobUser.setId(UUID.randomUUID().toString());
                     jobUser.setRealName("未注册用户");
                     jobUser.setPassword(passwordEnc);
-                    jobUser.setJobStatus("1");
                     jobUser.setCreateTime(new Date());
                     jobUser.setDelFlag(false);
                     jobUser.setHeadImageUrl("http://xpgj.oss-cn-shanghai.aliyuncs.com/xpgj/test/default_avatar.jpg");

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

@@ -244,7 +244,9 @@ public class ResumeApiController {
                 return messageResult;
             }
 
+            //教育经验
             List<ResumeEducationExperience> rexList = resumeEducationExperienceService.findByResumeId(resume.getId());
+            //工作经验
             List<ResumeWorkExperience> rweList = resumeWorkExperienceService.findByResumeId(resume.getId());
 
 
@@ -299,4 +301,86 @@ public class ResumeApiController {
 
         return messageResult;
     }
+
+    @PostMapping("submitResume")
+    @ApiOperation(value = "保存简历")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resumeId", value = "简历ID,不传则默认查当前简历", paramType = "form"),
+            @ApiImplicitParam(name = "categoryId", value = "应聘职位", paramType = "form"),
+            @ApiImplicitParam(name = "sex", value = "性别", paramType = "form"),
+            @ApiImplicitParam(name = "dreamMoney", value = "期望工资", paramType = "form"),
+            @ApiImplicitParam(name = "workExp", value = "工作经验", paramType = "form"),
+            @ApiImplicitParam(name = "education", value = "学历", paramType = "form"),
+            @ApiImplicitParam(name = "jobStatus", value = "工作状态(是否上班)", paramType = "form"),
+            @ApiImplicitParam(name = "birthday", value = "出生年月", paramType = "form"),
+            @ApiImplicitParam(name = "dreamAdd", value = "期望工作地点", paramType = "form"),
+            @ApiImplicitParam(name = "introduction", value = "自我介绍", paramType = "form"),
+            @ApiImplicitParam(name = "resumeId", value = "工作经历-json", paramType = "form"),
+            @ApiImplicitParam(name = "resumeId", value = "教育经历-json", paramType = "form"),
+            @ApiImplicitParam(name = "resumeId", value = "简历附件,多文件逗号分割", paramType = "form"),
+
+    })
+    public MessageResult<String> submitResume(
+            String recruitmentId,
+            @RequestParam(value="resumeId",defaultValue="") String resumeId,
+            @RequestAttribute  String subject) {
+        MessageResult<String> messageResult = new MessageResult<>();
+
+        try {
+            //JobUser jobUser = jobUserService.get(subject);
+            Resume resume = null;
+            if(StringUtils.isNotEmpty(resumeId)) {
+                resume = resumeService.get(resumeId);
+            }else{
+                resume = resumeService.findByUserId(subject);
+            }
+            if(resume == null){
+                messageResult.setMessage("未创建简历");
+                messageResult.setResult(false);
+                messageResult.setCode(400);
+                return messageResult;
+            }else{
+                if(!"0".equals(resume.getStatus())){
+                    messageResult.setMessage("当前简历未开启");
+                    messageResult.setResult(false);
+                    messageResult.setCode(400);
+                    return messageResult;
+                }
+
+                if(!"2".equals(resume.getApproveStatus())){
+                    messageResult.setMessage("当前简历未审批");
+                    messageResult.setResult(false);
+                    messageResult.setCode(400);
+                    return messageResult;
+                }
+            }
+
+            ResumeDeliver rd = new ResumeDeliver();
+            rd.setId(UUID.randomUUID().toString());
+            rd.setCreateBy(subject);
+            rd.setCreateTime(new Date());
+            rd.setDelFlag(false);
+            rd.setJobRecruitmentId(recruitmentId);
+            rd.setJobUserId(subject);
+            rd.setStatus("0");
+
+            int inCount = resumeDeliverService.insert(rd);
+            if(inCount > 0) {
+                messageResult.setMessage("投递成功");
+                messageResult.setResult(true);
+                messageResult.setCode(200);
+            }else{
+                messageResult.setMessage("投递失败");
+                messageResult.setResult(false);
+                messageResult.setCode(400);
+                return messageResult;
+            }
+        } catch (Exception ex) {
+            log.error(ex.getMessage());
+            messageResult.setResult(false);
+            messageResult.setMessage(ex.getMessage());
+        }
+
+        return messageResult;
+    }
 }