diff --git a/src/com/engine/recruit/service/impl/RecruitInterviewServiceImpl.java b/src/com/engine/recruit/service/impl/RecruitInterviewServiceImpl.java index 5678ad9..8471589 100644 --- a/src/com/engine/recruit/service/impl/RecruitInterviewServiceImpl.java +++ b/src/com/engine/recruit/service/impl/RecruitInterviewServiceImpl.java @@ -104,16 +104,25 @@ public class RecruitInterviewServiceImpl extends Service implements RecruitInter List spanList = new ArrayList<>(); ResourceComInfo resourceComInfo = new ResourceComInfo(); for (String s : split) { - rs.executeQuery("select fkzt from uf_jcl_mspjfk where msid = ? and msg = ?", id, s); - String fkzt = ""; + rs.executeQuery("select jg,zt from uf_jcl_mspjfk where msid = ? and msg = ?", id, s); + String jg = ""; + String zt = ""; if (rs.next()) { - fkzt = Util.null2String(rs.getString("fkzt")); + jg = Util.null2String(rs.getString("jg")); + zt = Util.null2String(rs.getString("zt")); } - if (StringUtils.isNotBlank(fkzt)) { - fkzt = ApplicantCommonInfo.getSelectName(String.valueOf(formId), "fkzt", fkzt); - spanList.add("" + resourceComInfo.getLastname(s) + "(" + fkzt + ")"); + + if (StringUtils.isNotBlank(jg)) { + jg = ApplicantCommonInfo.getSelectName(String.valueOf(formId), "jg", jg); + spanList.add("" + resourceComInfo.getLastname(s) + "(" + jg + ")"); } else { - spanList.add("" + resourceComInfo.getLastname(s) + ""); + String span = "" + resourceComInfo.getLastname(s); + if (StringUtils.isNotBlank(zt)) { + zt = ApplicantCommonInfo.getSelectName(String.valueOf(formId), "zt", zt); + span += "(" + zt + ")"; + } + span += ""; + spanList.add(span); } } diff --git a/src/weaver/formmode/recruit/modeexpand/interview/DeleteInterviewExpand.java b/src/weaver/formmode/recruit/modeexpand/interview/DeleteInterviewExpand.java new file mode 100644 index 0000000..ad4c30c --- /dev/null +++ b/src/weaver/formmode/recruit/modeexpand/interview/DeleteInterviewExpand.java @@ -0,0 +1,44 @@ +package weaver.formmode.recruit.modeexpand.interview; + +import weaver.conn.RecordSet; +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; + +/** + * @author:dxfeng + * @createTime: 2024/10/14 + * @version: 1.0 + */ +public class DeleteInterviewExpand extends AbstractModeExpandJavaCodeNew { + @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"); + User user = (User) params.get("user"); + if (requestInfo != null) { + billId = Util.getIntValue(requestInfo.getRequestid()); + modeId = Util.getIntValue(requestInfo.getWorkflowid()); + if (billId > 0 && modeId > 0) { + rs.executeUpdate("delete from uf_jcl_mspjfk where msid = ? ", billId); + } + } + } catch (Exception e) { + rs.writeLog(e); + result.put("errmsg", e.getMessage()); + result.put("flag", "false"); + } + + return result; + } +} diff --git a/src/weaver/formmode/recruit/modeexpand/interview/UrgeInterviewEvaluationExpand.java b/src/weaver/formmode/recruit/modeexpand/interview/UrgeInterviewEvaluationExpand.java index cfe1af9..203d204 100644 --- a/src/weaver/formmode/recruit/modeexpand/interview/UrgeInterviewEvaluationExpand.java +++ b/src/weaver/formmode/recruit/modeexpand/interview/UrgeInterviewEvaluationExpand.java @@ -52,7 +52,7 @@ public class UrgeInterviewEvaluationExpand extends AbstractModeExpandJavaCodeNew Set userIdSet = new HashSet<>(); // 查询未反馈面试评价的面试官 - rs.executeQuery("select msg from uf_jcl_mspjfk where fkzt = 0 and msid = ?", billId); + rs.executeQuery("select msg from uf_jcl_mspjfk where zt = 0 and msid = ?", billId); while (rs.next()) { userIdSet.add(rs.getString("msg")); }