From d7ff9b7ebbefa62fa3bc3cf32fc77082f031898c Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Mon, 23 Dec 2024 09:58:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=9D=A2=E8=AF=95=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E4=BF=A1=E6=81=AF=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../interview/BatchAddInterviewResultModeExpand.java           | 3 ++-
 .../modeexpand/interview/CreateInterviewModeExpand.java        | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/weaver/formmode/recruit/modeexpand/interview/BatchAddInterviewResultModeExpand.java b/src/weaver/formmode/recruit/modeexpand/interview/BatchAddInterviewResultModeExpand.java
index 0e3cc24..8007f71 100644
--- a/src/weaver/formmode/recruit/modeexpand/interview/BatchAddInterviewResultModeExpand.java
+++ b/src/weaver/formmode/recruit/modeexpand/interview/BatchAddInterviewResultModeExpand.java
@@ -97,6 +97,7 @@ public class BatchAddInterviewResultModeExpand extends AbstractModeExpandJavaCod
                 Set<String> userIdSet = new HashSet<>();
                 userIdSet.addAll(Arrays.asList(msg.split(",")));
                 userIdSet.addAll(Arrays.asList(ptmsg.split(",")));
+                String msfsValue = ApplicantCommonInfo.getSelectName(String.valueOf(formIdByTableName), "msfs", Util.null2String(mainDataMap.get("msfs")));
 
                 for (Map<String, Object> detailDataMap : detailMapList) {
                     List<Object> paramList = buildParamList(detailDataMap);
@@ -121,7 +122,6 @@ public class BatchAddInterviewResultModeExpand extends AbstractModeExpandJavaCod
                             // ypzValue + "-" + ypzwValue + "-" + msfsValue
                             String ypzValue = ApplicantCommonInfo.getApplicantName(Util.null2String(detailDataMap.get("ypz")));
                             String ypzwValue = ApplicantCommonInfo.getApplicantPosition(Util.null2String(detailDataMap.get("ypzw")));
-                            String msfsValue = ApplicantCommonInfo.getSelectName(String.valueOf(formIdByTableName), "msfs", Util.null2String(detailDataMap.get("msfs")));
                             workPlanCreateParams.setPlanName(ypzValue + "-" + ypzwValue + "-" + msfsValue);
                             workPlanCreateParams.setMemberIds(StringUtils.join(userIdSet,","));
                             workPlanCreateParams.setUrgentLevel("1");
@@ -160,6 +160,7 @@ public class BatchAddInterviewResultModeExpand extends AbstractModeExpandJavaCod
 
                     String msdd = Util.null2String(mainDataMap.get("msdd"));
                     msgBuilder.append("面试时间：").append(msrq).append("；面试官：").append(RecruitModeUtil.getResourceNames(msg)).append("，").append(RecruitModeUtil.getResourceNames(ptmsg)).append("<br/>");
+                    msgBuilder.append("面试方式：").append(msfsValue).append("<br/>");
                     msgBuilder.append("面试地址：").append(msdd);
 
                     // 消息发送
diff --git a/src/weaver/formmode/recruit/modeexpand/interview/CreateInterviewModeExpand.java b/src/weaver/formmode/recruit/modeexpand/interview/CreateInterviewModeExpand.java
index d0dc80b..192e662 100644
--- a/src/weaver/formmode/recruit/modeexpand/interview/CreateInterviewModeExpand.java
+++ b/src/weaver/formmode/recruit/modeexpand/interview/CreateInterviewModeExpand.java
@@ -109,6 +109,9 @@ public class CreateInterviewModeExpand extends AbstractModeExpandJavaCodeNew {
         msgBuilder.append("；应聘职位：").append(ApplicantCommonInfo.getApplicantPosition(ypzw));
         msgBuilder.append("<br/>");
         msgBuilder.append("面试时间：").append(msrq).append("；面试官：").append(RecruitModeUtil.getResourceNames(msg)).append("，").append(RecruitModeUtil.getResourceNames(ptmsg)).append("<br/>");
+        int formIdByTableName = ApplicantCommonInfo.getFormIdByTableName("uf_jcl_ms");
+        String msfsValue = ApplicantCommonInfo.getSelectName(String.valueOf(formIdByTableName), "msfs", Util.null2String(mainDataMap.get("msfs")));
+        msgBuilder.append("面试方式：").append(msfsValue).append("<br/>");
         msgBuilder.append("面试地址：").append(msdd);
 
         // 消息发送