From 5ec8cc7ca58e4b8880ce422d86aba446fdb52bf1 Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Tue, 7 Nov 2023 14:31:20 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../recruit/enums/RecordOperateEnum.java      |  1 -
 .../SingleAddDeptScreeningModeExpand.java     |  4 +-
 .../record/AddApplicantModeExpand.java        | 37 +------------------
 3 files changed, 4 insertions(+), 38 deletions(-)

diff --git a/src/com/engine/recruit/enums/RecordOperateEnum.java b/src/com/engine/recruit/enums/RecordOperateEnum.java
index a257765..a71ad2c 100644
--- a/src/com/engine/recruit/enums/RecordOperateEnum.java
+++ b/src/com/engine/recruit/enums/RecordOperateEnum.java
@@ -333,7 +333,6 @@ public enum RecordOperateEnum implements RecordOperateAdapter {
     }),
 
     PENDING_EMPLOYMENT("pendingEmployment", "进入待入职", "进入待入职", recordPo -> {
-        // $创建人$操作进入待入职
         Map<String, Object> otherParam = recordPo.getOtherParam();
 
 
diff --git a/src/weaver/formmode/recruit/modeexpand/departmentscreening/SingleAddDeptScreeningModeExpand.java b/src/weaver/formmode/recruit/modeexpand/departmentscreening/SingleAddDeptScreeningModeExpand.java
index bb187eb..0869bc3 100644
--- a/src/weaver/formmode/recruit/modeexpand/departmentscreening/SingleAddDeptScreeningModeExpand.java
+++ b/src/weaver/formmode/recruit/modeexpand/departmentscreening/SingleAddDeptScreeningModeExpand.java
@@ -83,8 +83,8 @@ public class SingleAddDeptScreeningModeExpand extends AbstractModeExpandJavaCode
                 String messageTitle = RecruitModeUtil.getRecruitPropValue("SCREENING_MESSAGE_TITLE");
                 String linkUrl = RecruitModeUtil.getRecruitPropValue("SCREENING_MESSAGE_URL");
                 String fkr = Util.null2String(dataMap.get("fkr"));
-                String applicantName = ApplicantCommonInfo.getApplicantName(Util.null2String(param.get("ypz")));
-                String applicantPosition = ApplicantCommonInfo.getApplicantPosition(Util.null2String(param.get("ypzw")));
+                String applicantName = ApplicantCommonInfo.getApplicantName(Util.null2String(dataMap.get("ypz")));
+                String applicantPosition = ApplicantCommonInfo.getApplicantPosition(Util.null2String(dataMap.get("ypzw")));
                 String messageContent = user.getLastname() + "给你发来简历进行筛选，请查看。<br/>" +
                         "【应聘者：" + applicantName + "，应聘职位：" + applicantPosition + "】";
 
diff --git a/src/weaver/formmode/recruit/modeexpand/record/AddApplicantModeExpand.java b/src/weaver/formmode/recruit/modeexpand/record/AddApplicantModeExpand.java
index 03a324b..0266f4f 100644
--- a/src/weaver/formmode/recruit/modeexpand/record/AddApplicantModeExpand.java
+++ b/src/weaver/formmode/recruit/modeexpand/record/AddApplicantModeExpand.java
@@ -1,14 +1,8 @@
 package weaver.formmode.recruit.modeexpand.record;
 
-import com.engine.recruit.entity.record.ApplicantRecordPo;
 import com.engine.recruit.enums.RecordOperateEnum;
-import weaver.common.DateUtil;
 import weaver.formmode.customjavacode.AbstractModeExpandJavaCodeNew;
-import weaver.general.Util;
-import weaver.hrm.User;
-import weaver.soa.workflow.request.RequestInfo;
 
-import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -19,35 +13,8 @@ import java.util.Map;
 public class AddApplicantModeExpand extends AbstractModeExpandJavaCodeNew {
     @Override
     public Map<String, String> doModeExpand(Map<String, Object> params) {
-        Map<String, String> result = new HashMap<>(2);
-        try {
-            //数据id
-            int billId;
-            //模块id
-            int modeId;
-            RequestInfo requestInfo = (RequestInfo) params.get("RequestInfo");
-            User user = (User) params.get("user");
-            if (requestInfo != null) {
-                billId = Util.getIntValue(requestInfo.getRequestid());
-                modeId = Util.getIntValue(requestInfo.getWorkflowid());
-                if (billId > 0 && modeId > 0) {
-
-                    // 插入应聘过程
-                    ApplicantRecordPo recordPo = ApplicantRecordPo.builder()
-                            .billId(String.valueOf(billId))
-                            .operateTime(DateUtil.getDateTime())
-                            .user(user)
-                            .recordOperateType(RecordOperateEnum.RESUME_SUBMISSION)
-                            .build();
-                    recordPo.execute();
-                }
-            }
-        } catch (Exception e) {
-            result.put("errmsg", "自定义出错信息");
-            result.put("flag", "false");
-        }
-
-        return result;
+        params.put("recordType", RecordOperateEnum.RESUME_SUBMISSION.getOperateType());
+        return new RecruitRecordModeExpand().doModeExpand(params);
     }