修改BUG

6bbfe446 · 284718418@qq.com · 5e30b96f · 6bbfe446 · 6bbfe446 · 6bbfe446
Commit 6bbfe446 authored Apr 24, 2022 by 284718418@qq.com
Showing with 32 additions and 1 deletions

src/main/java/cn/timer/api/controller/zpgl/ZpglH5Controller.java
+19 -0

src/main/java/cn/timer/api/controller/zpgl/sevice/ZpglServiceImpl.java
+12 -1

src/main/java/cn/timer/api/utils/ZpglMessageTemplate.java
+1 -0

No files found.
--- a/src/main/java/cn/timer/api/controller/zpgl/ZpglH5Controller.java
+++ b/src/main/java/cn/timer/api/controller/zpgl/ZpglH5Controller.java
@@ -3,15 +3,19 @@ package cn.timer.api.controller.zpgl;
 import cn.timer.api.aspect.lang.annotation.Log;
 import cn.timer.api.aspect.lang.enums.BusinessType;
 import cn.timer.api.bean.zpgl.*;
+import cn.timer.api.config.enuminterface.JxglEnumInterface;
+import cn.timer.api.controller.zpgl.sevice.ZpglMslcLogService;
 import cn.timer.api.dto.zpgl.InterviewApplicationDto;
 import cn.timer.api.utils.DateFormatUtils;
 import cn.timer.api.utils.Result;
 import cn.timer.api.utils.ResultUtil;
+import cn.timer.api.utils.ZpglMessageTemplate;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -26,6 +30,11 @@ import java.util.List;
 @RequestMapping(value = "/zpgl/h5")
 public class ZpglH5Controller {
+    @Autowired
+    private ZpglMslcLogService zpglMslcLogService;
    /**
     * 添加面试申请
     * @param
@@ -43,6 +52,16 @@ public class ZpglH5Controller {
        if(!StringUtils.isEmpty(zpglRcxx.getWorkBeginYear())){
            zpglRcxx.setWorkyears(DateFormatUtils.yearCompare(zpglRcxx.getWorkBeginYear(),new Date()));
        }
+        if(!StringUtils.isEmpty(zpglRcxx.getId()) && zpglRcxx.getId() > 0){
+            // 新增人才信息 初始化流程记录
+            ZpglMslcLog zpglMslcLog = new ZpglMslcLog();
+            zpglMslcLog.setZpglRcxxId(zpglRcxx.getId());
+            zpglMslcLog.setUserId(0);
+            zpglMslcLog.setUserName("");
+            zpglMslcLog.setZpglRcxxStatus(JxglEnumInterface.MslcLogStatus.OTHER.getType());
+            zpglMslcLog.setDetail(ZpglMessageTemplate.SYS_ADD);
+            zpglMslcLogService.addZpglMslcLog(zpglMslcLog);
+        }
        zpglRcxx.insertOrUpdate();
        //添加紧急联系人

--- a/src/main/java/cn/timer/api/controller/zpgl/sevice/ZpglServiceImpl.java
+++ b/src/main/java/cn/timer/api/controller/zpgl/sevice/ZpglServiceImpl.java
@@ -466,6 +466,7 @@ public class ZpglServiceImpl implements ZpglService {
            log.info("招聘-导入候选人简历:results is null");
            return ResultUtil.error("导入简历失败，请检查是否为简历文件~");
        }
+        /** 基础信息开始 */
        ZpglRcxx zpglRcxx = ZpglRcxx.builder().build();
        zpglRcxx.setZpglZwxxId(importCandidateDto.getZpglZwxxId());
        zpglRcxx.setStatus(importCandidateDto.getStatus());
@@ -518,6 +519,7 @@ public class ZpglServiceImpl implements ZpglService {
        zpglRcxx.setNativePlace(reumeSdkResult.getNationality());
        zpglRcxx.setAddress(reumeSdkResult.getLiving_address());
        zpglRcxx.setUniversitie(reumeSdkResult.getCollege());
+        zpglRcxx.setSubject(reumeSdkResult.getMajor());
        if(!StringUtils.isEmpty(reumeSdkResult.getDegree())){
            zpglRcxx.setHighesteducation(this.getEducation(reumeSdkResult.getDegree())+"");
        }
@@ -535,7 +537,16 @@ public class ZpglServiceImpl implements ZpglService {
        zpglRcxx.setZjzw(reumeSdkResult.getWork_position());
        zpglRcxx.insert();
+        /** 基础信息结束 */
        if (!StringUtils.isEmpty(zpglRcxx.getId())) {
+            // 初始化流程记录
+            ZpglMslcLog zpglMslcLog = new ZpglMslcLog();
+            zpglMslcLog.setZpglRcxxId(zpglRcxx.getId());
+            zpglMslcLog.setUserId(userBean.getEmpNum());
+            zpglMslcLog.setUserName(userBean.getQyzxEmpLogin().getUsername());
+            zpglMslcLog.setZpglRcxxStatus(JxglEnumInterface.MslcLogStatus.OTHER.getType());
+            zpglMslcLog.setDetail(ZpglMessageTemplate.SYS_ADD);
+            zpglMslcLogService.addZpglMslcLog(zpglMslcLog);
            // 添加教育经历
            if (!StringUtils.isEmpty(reumeSdkResult.getEducation_objs())) {
                ZpglRcxxStudy zpglRcxxStudy = ZpglRcxxStudy.builder().zpglRcxxId(zpglRcxx.getId()).build();
@@ -619,7 +630,7 @@ public class ZpglServiceImpl implements ZpglService {
     */
    private Date getDate(String date) {
        String datebirth = "";
-        date.replace(".","-");
+        date = date.replace(".","-");
        String[] num = date.split("-");
        if (num.length == 1) {
            datebirth = num[0] + "-1-1";

--- a/src/main/java/cn/timer/api/utils/ZpglMessageTemplate.java
+++ b/src/main/java/cn/timer/api/utils/ZpglMessageTemplate.java
@@ -21,6 +21,7 @@ public class ZpglMessageTemplate {
 	public static final String ENTRY ="{0} 为候选人办理了入职.";
 	public static final String INTERVIEWED_ENTRYING ="{0} 将候选人状态从[{3}]更改为[面试淘汰], 淘汰原因:{1},备注:{2}";
 	public static final String OFFER_ENTRYING ="{0} 将候选人状态从[{3}}]更改为[录用淘汰], 淘汰原因:{1},备注:{2}";
+	public static final String SYS_ADD ="系统添加了候选人";
 	public static final String TO_INTERVIEWER ="您好，{0}{1}已安排由您面试";
 	public static final String TO_INTERVIEWEE ="候选人{0}你好！你所投递的 {1} 职位为你安排了面试";