diff --git a/src/com/engine/recruit/service/impl/RecruitInterviewServiceImpl.java b/src/com/engine/recruit/service/impl/RecruitInterviewServiceImpl.java index 65e81dc..5678ad9 100644 --- a/src/com/engine/recruit/service/impl/RecruitInterviewServiceImpl.java +++ b/src/com/engine/recruit/service/impl/RecruitInterviewServiceImpl.java @@ -109,8 +109,8 @@ public class RecruitInterviewServiceImpl extends Service implements RecruitInter if (rs.next()) { fkzt = Util.null2String(rs.getString("fkzt")); } - fkzt = ApplicantCommonInfo.getSelectName(String.valueOf(formId), "fkzt", fkzt); if (StringUtils.isNotBlank(fkzt)) { + fkzt = ApplicantCommonInfo.getSelectName(String.valueOf(formId), "fkzt", fkzt); spanList.add("" + resourceComInfo.getLastname(s) + "(" + fkzt + ")"); } else { spanList.add("" + resourceComInfo.getLastname(s) + ""); diff --git a/src/weaver/formmode/recruit/modeexpand/interview/BatchAddInterviewResultModeExpand.java b/src/weaver/formmode/recruit/modeexpand/interview/BatchAddInterviewResultModeExpand.java index dcc5610..3268458 100644 --- a/src/weaver/formmode/recruit/modeexpand/interview/BatchAddInterviewResultModeExpand.java +++ b/src/weaver/formmode/recruit/modeexpand/interview/BatchAddInterviewResultModeExpand.java @@ -102,9 +102,9 @@ public class BatchAddInterviewResultModeExpand extends AbstractModeExpandJavaCod modeRightInfo.setNewRight(true); modeRightInfo.editModeDataShare(user.getUID(), formModeId, bid); getApplicantsInfo(msgBuilder, Util.null2String(detailDataMap.get("ypz")), Util.null2String(detailDataMap.get("ypzw"))); + // 创建面试评价反馈数据 + InterviewEvaluate.createEvaluate(detailDataMap, bid, user); } - // 创建面试评价反馈数据 - InterviewEvaluate.createEvaluate(detailDataMap, formModeId, user); // 发送邮件 String msgContent = RecruitModeUtil.getReplaceContent(yjnr, fieldMapList, detailDataMap); diff --git a/src/weaver/formmode/recruit/modeexpand/interview/InterviewEvaluate.java b/src/weaver/formmode/recruit/modeexpand/interview/InterviewEvaluate.java index 3b7d5f2..ee2a629 100644 --- a/src/weaver/formmode/recruit/modeexpand/interview/InterviewEvaluate.java +++ b/src/weaver/formmode/recruit/modeexpand/interview/InterviewEvaluate.java @@ -111,7 +111,7 @@ public class InterviewEvaluate { */ public static void cancelEvaluate(int msId) { RecordSet rs = new RecordSet(); - rs.executeUpdate("update " + TABLE_NAME + " set fkzt = 3 where msid=" + msId); + rs.executeUpdate("update " + TABLE_NAME + " set zt = 4 where msid=" + msId); } @@ -131,8 +131,8 @@ public class InterviewEvaluate { dataMap.put("modeuuid", uuid); dataMap.put("formmodeid", formModeId); RecruitRecordSet.buildModeInsertFields(dataMap, user.getUID()); - // 反馈状态（设置为待反馈） - dataMap.put("fkzt", "0"); + // 面试状态（设置为待面试） + dataMap.put("zt", "0"); // 批次ID dataMap.put("pcid", mainDataMap.get("pcid")); // 面试ID diff --git a/src/weaver/formmode/recruit/modeexpand/interview/UrgeInterviewEvaluationExpand.java b/src/weaver/formmode/recruit/modeexpand/interview/UrgeInterviewEvaluationExpand.java new file mode 100644 index 0000000..cfe1af9 --- /dev/null +++ b/src/weaver/formmode/recruit/modeexpand/interview/UrgeInterviewEvaluationExpand.java @@ -0,0 +1,77 @@ +package weaver.formmode.recruit.modeexpand.interview; + +import com.engine.recruit.constant.RecruitConstant; +import com.weaver.formmodel.data.model.Formfield; +import org.apache.commons.collections.CollectionUtils; +import weaver.conn.RecordSet; +import weaver.formmode.customjavacode.AbstractModeExpandJavaCodeNew; +import weaver.formmode.recruit.modeexpand.util.RecruitModeUtil; +import weaver.general.Util; +import weaver.hrm.User; +import weaver.soa.workflow.request.MainTableInfo; +import weaver.soa.workflow.request.Property; +import weaver.soa.workflow.request.RequestInfo; + +import java.util.*; +import java.util.stream.Collectors; + +/** + * @author:dxfeng + * @createTime: 2024/10/12 + * @version: 1.0 + */ +public class UrgeInterviewEvaluationExpand extends AbstractModeExpandJavaCodeNew { + private static final String MODE_TABLE_NAME = "uf_jcl_ms"; + + @Override + public Map doModeExpand(Map params) { + Map result = new HashMap<>(); + RecordSet rs = new RecordSet(); + try { + //数据id + int billId; + //模块id + int modeId; + RequestInfo requestInfo = (RequestInfo) params.get("RequestInfo"); + if (requestInfo != null) { + billId = Util.getIntValue(requestInfo.getRequestid()); + modeId = Util.getIntValue(requestInfo.getWorkflowid()); + if (billId > 0 && modeId > 0) { + User user = (User) params.get("user"); + MainTableInfo mainTableInfo = requestInfo.getMainTableInfo(); + Property[] properties = mainTableInfo.getProperty(); + Map mainDataMap = new HashMap<>(); + for (Property property : properties) { + mainDataMap.put(property.getName(), property.getValue()); + } + + // 发送消息 + + String msgContent = "您有一个面试还未评价，请尽快填写评价
" + + "应聘者：$ypz$ ；应聘职位：$ypzw$；面试时间：$msrq$"; + Set userIdSet = new HashSet<>(); + + // 查询未反馈面试评价的面试官 + rs.executeQuery("select msg from uf_jcl_mspjfk where fkzt = 0 and msid = ?", billId); + while (rs.next()) { + userIdSet.add(rs.getString("msg")); + } + if (CollectionUtils.isNotEmpty(userIdSet)) { + // 消息发送 + List fieldList = RecruitModeUtil.getFieldList(MODE_TABLE_NAME); + Map fieldMap = fieldList.stream().collect(Collectors.toMap(Formfield::getFieldname, item -> item, (k1, k2) -> k1)); + String msgStr = RecruitModeUtil.getMsgReplaceStr(msgContent, fieldMap, mainDataMap); + RecruitModeUtil.messagePush(RecruitConstant.INTERVIEW_MESSAGE_TYPE, RecruitConstant.INTERVIEW_EVALUATE_MESSAGE_TITLE, msgStr, userIdSet, user.getUID()); + } + } + + } + } catch (Exception e) { + rs.writeLog(e); + result.put("errmsg", e.getMessage()); + result.put("flag", "false"); + } + + return result; + } +}