简历处邀请面试功能

common/src/main/java/com/jpsoft/employment/modules/job/dto/ResumeDeliverRecordDTO.java

@@ -15,5 +15,6 @@ public class ResumeDeliverRecordDTO {
     private String remark;
     private String resumeDeliverId;
     private String resumeId;
+    private String recruitmentId;
 
 }

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

@@ -70,4 +70,10 @@ public class ResumeDeliverRecord {
 
     @ApiModelProperty(value = "部门")
     private String entryDepartment;
+
+	@ApiModelProperty(value = "简历ID，用于显示，不保存数据库")
+    private String resumeId;
+
+	@ApiModelProperty(value = "招聘ID，用于显示，不保存数据库")
+	private String recruitmentId;
 }

common/src/main/java/com/jpsoft/employment/modules/job/service/impl/ResumeDeliverRecordServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.Map;
 import java.util.UUID;
 import javax.annotation.Resource;
 
+import com.jpsoft.employment.modules.common.utils.StringUtils;
 import com.jpsoft.employment.modules.job.dao.*;
 import com.jpsoft.employment.modules.job.entity.*;
 import com.jpsoft.employment.modules.job.service.RecruitmentService;
@@ -52,6 +53,29 @@ public class ResumeDeliverRecordServiceImpl implements ResumeDeliverRecordServic
 		// TODO Auto-generated method stub
 		int affectCount = 0;
 
+		ResumeDeliver resumeDeliver;
+
+		if(StringUtils.isEmpty(model.getResumeDeliverId())){
+			resumeDeliver = new ResumeDeliver();
+			resumeDeliver.setId(UUID.randomUUID().toString());
+			resumeDeliver.setCreateBy(model.getCreateBy());
+			resumeDeliver.setCreateTime(model.getCreateTime());
+			resumeDeliver.setDelFlag(false);
+			resumeDeliver.setJobUserId(model.getJobUserId());
+			resumeDeliver.setJobResumeId(model.getResumeId());
+			resumeDeliver.setChatStatus("3");//未投递岗位，直接邀请面试，所有状态直接设置为邀请面试
+			resumeDeliver.setJobRecruitmentId(model.getRecruitmentId());
+
+			int index = resumeDeliverDAO.insert(resumeDeliver);
+		}
+		else{
+			resumeDeliver = resumeDeliverDAO.get(model.getResumeDeliverId());
+		}
+
+		if(StringUtils.isEmpty(model.getResumeDeliverId())){
+			model.setResumeDeliverId(resumeDeliver.getId());
+		}
+
 		int count = resumeDeliverRecordDAO.insert(model);
 
 		if(count>0){
@@ -60,44 +84,38 @@ public class ResumeDeliverRecordServiceImpl implements ResumeDeliverRecordServic
 			resumeDeliverContent.setCreateBy(model.getCreateBy());
 			resumeDeliverContent.setCreateTime(model.getCreateTime());
 			resumeDeliverContent.setDelFlag(false);
-			resumeDeliverContent.setDeliverId(model.getResumeDeliverId());
-
-			ResumeDeliver resumeDeliver = resumeDeliverDAO.get(model.getResumeDeliverId());
-
-
-
-			if(resumeDeliver!=null){
-                Recruitment recruitment = recruitmentDAO.get(resumeDeliver.getJobRecruitmentId());
-
-                Resume resume = resumeDAO.get(resumeDeliver.getJobResumeId());
-
-                resumeDeliverContent.setJobUserId(model.getJobUserId());
-                if(recruitment!=null){
-                    resumeDeliverContent.setJobResumeId(recruitment.getId());
-                }
-                if(resume!=null){
-                    resumeDeliverContent.setJobResumeId(resume.getId());
-                }
-
-                resumeDeliverContent.setChatStatus(chatType);
-
-				if(chatType.equals("2")) {
-					resumeDeliverContent.setTodoTime(model.getChatDateStr());
-					resumeDeliverContent.setTodoMinuteStart(model.getBeginTime());
-					resumeDeliverContent.setTodoMinuteEnd(model.getEndTime());
-				}
-				else if(chatType.equals("3")){
-                    resumeDeliverContent.setAddress(model.getRemark());
-				}
-				else if(chatType.equals("4")){
-                    resumeDeliverContent.setEntryPost(model.getEntryPosition());
-                    resumeDeliverContent.setEntryDepartment(model.getEntryDepartment());
-				}
-				else if(chatType.equals("6")){
-					resumeDeliverContent.setRemark(model.getRemark());
-				}
+
+			resumeDeliverContent.setDeliverId(resumeDeliver.getId());
+
+			Recruitment recruitment = recruitmentDAO.get(resumeDeliver.getJobRecruitmentId());
+
+			Resume resume = resumeDAO.get(resumeDeliver.getJobResumeId());
+
+			resumeDeliverContent.setJobUserId(model.getJobUserId());
+			if(recruitment!=null){
+				resumeDeliverContent.setJobResumeId(recruitment.getId());
 			}
+			if(resume!=null){
+				resumeDeliverContent.setJobResumeId(resume.getId());
+			}
+
+			resumeDeliverContent.setChatStatus(chatType);
 
+			if(chatType.equals("2")) {
+				resumeDeliverContent.setTodoTime(model.getChatDateStr());
+				resumeDeliverContent.setTodoMinuteStart(model.getBeginTime());
+				resumeDeliverContent.setTodoMinuteEnd(model.getEndTime());
+			}
+			else if(chatType.equals("3")){
+				resumeDeliverContent.setAddress(model.getRemark());
+			}
+			else if(chatType.equals("4")){
+				resumeDeliverContent.setEntryPost(model.getEntryPosition());
+				resumeDeliverContent.setEntryDepartment(model.getEntryDepartment());
+			}
+			else if(chatType.equals("6")){
+				resumeDeliverContent.setRemark(model.getRemark());
+			}
 
             affectCount = resumeDeliverContentDAO.insert(resumeDeliverContent);
 		}

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

@@ -87,6 +87,7 @@ public class ResumeDeliverController {
         MessageResult<ResumeDeliverRecord> msgResult = new MessageResult<>();
 
         try {
+
             ResumeDeliverRecord resumeDeliverRecord=new ResumeDeliverRecord();
             resumeDeliverRecord.setId(UUID.randomUUID().toString());
             resumeDeliverRecord.setCreateBy(subject);
@@ -96,7 +97,9 @@ public class ResumeDeliverController {
 
             resumeDeliverRecord.setDelFlag(false);
 
-            resumeDeliverRecord.setResumeDeliverId(resumeDeliverRecordDTO.getResumeDeliverId());
+            if(StringUtils.isNotEmpty(resumeDeliverRecordDTO.getResumeDeliverId())){
+                resumeDeliverRecord.setResumeDeliverId(resumeDeliverRecordDTO.getResumeDeliverId());
+            }
 
             String chatStatusN = dataDictionaryService.findNameByCatalogNameAndValue("沟通状态",resumeDeliverRecordDTO.getChatType());
 
@@ -131,6 +134,15 @@ public class ResumeDeliverController {
             }
             else if(resumeDeliverRecordDTO.getChatType().equals("3")){
                 //邀请面试
+                if(StringUtils.isEmpty(resumeDeliverRecordDTO.getResumeDeliverId())){
+                    resumeDeliverRecord.setResumeId(resumeDeliverRecordDTO.getResumeId());
+                    //resumeDeliverRecord.setRecruitmentId(resumeDeliverRecordDTO.getRecruitmentId());
+                    Resume resume = resumeService.get(resumeDeliverRecordDTO.getResumeId());
+                    if(resume!=null){
+                        resumeDeliverRecord.setJobUserId(resume.getJobUserId());
+                    }
+                }
+
                 if (resumeDeliverRecordDTO.getChatDate() != null) {
                     ChatDateStr = sdf.format(resumeDeliverRecordDTO.getChatDate());
                 }
@@ -156,19 +168,21 @@ public class ResumeDeliverController {
                         entryDepartment = ChatTimeArray[1];
                     }
 
-                    resumeDeliverRecord.setRemark("录用人："+jobUser.getRealName()+"，身份证号："+jobUser.getIdCard()+"，入职公司："+company.getName()+"，入职岗位："+entryPosition+"，入职部门："+entryDepartment+"，工作地点："+recruitment.getArea());
+                    resumeDeliverRecord.setRemark("录用人：" + jobUser.getRealName() + "，身份证号：" + jobUser.getIdCard() + "，入职公司：" + company.getName() + "，入职岗位：" + entryPosition + "，入职部门：" + entryDepartment + "，工作地点：" + recruitment.getArea());
 
 
                     resumeDeliverRecord.setEntryPosition(entryPosition);
                     resumeDeliverRecord.setEntryDepartment(entryDepartment);
                     resumeDeliverRecord.setJobUserId(jobUser.getId());
                 }
+
             }
             else if(resumeDeliverRecordDTO.getChatType().equals("6")){
                 //拒绝/不合适
                 resumeDeliverRecord.setRemark("拒绝理由：" + resumeDeliverRecordDTO.getRemark());
             }
 
+
             int affectCount = resumeDeliverRecordService.insertAndResumeDeliver(resumeDeliverRecord,resumeDeliverRecordDTO.getChatType());
 
             if (affectCount > 0) {