diff --git a/src/com/engine/recruit/entity/recruitflow/po/RecruitButton.java b/src/com/engine/recruit/entity/recruitflow/po/RecruitButton.java index f776839..2b6b11e 100644 --- a/src/com/engine/recruit/entity/recruitflow/po/RecruitButton.java +++ b/src/com/engine/recruit/entity/recruitflow/po/RecruitButton.java @@ -22,6 +22,6 @@ public class RecruitButton { private String tabName; private String tabLink; private String buttonKey; - private String buttonAction; + private String buttonType; private Integer orderNum; } diff --git a/src/com/engine/recruit/entity/recruitflow/po/RecruitTabPo.java b/src/com/engine/recruit/entity/recruitflow/po/RecruitTabPo.java index b45d5a4..dd37999 100644 --- a/src/com/engine/recruit/entity/recruitflow/po/RecruitTabPo.java +++ b/src/com/engine/recruit/entity/recruitflow/po/RecruitTabPo.java @@ -45,7 +45,14 @@ public class RecruitTabPo { if (rs.next()) { String tableName = rs.getString("tablename"); String tabCount = "0"; - rs.executeQuery("select count(1) as num from " + tableName + " where pcid = ?", billId); + if ("uf_jcl_yppc".equalsIgnoreCase(tableName)) { + rs.executeQuery("select xm,sjhm from uf_jcl_yppc where id = ?", billId); + if (rs.next()) { + rs.executeQuery("select count(id) as num from uf_jcl_yppc where xm=? and sjhm =?", rs.getString("xm"), rs.getString("sjhm")); + } + } else { + rs.executeQuery("select count(1) as num from " + tableName + " where ypz = ? ", billId); + } if (rs.next()) { tabCount = rs.getString("num"); } diff --git a/src/com/engine/recruit/util/RecruitMessageUtils.java b/src/com/engine/recruit/util/RecruitMessageUtils.java new file mode 100644 index 0000000..52f1553 --- /dev/null +++ b/src/com/engine/recruit/util/RecruitMessageUtils.java @@ -0,0 +1,27 @@ +package com.engine.recruit.util; + +import weaver.common.MessageUtil; +import weaver.general.Util; + +import java.util.Map; + +/** + * @author:dxfeng + * @createTime: 2023/10/13 + * @version: 1.0 + */ +public class RecruitMessageUtils { + public static boolean SendEmail(Map param) { + String sendTo = Util.null2String(param.get("sendTo")); + String emailTitle = Util.null2String(param.get("emailTitle")); + String emailContent = Util.null2String(param.get("emailContent")); + //EmailWorkRunnable.threadModeReminder(sendTo, emailTitle, emailContent); + return MessageUtil.sendEmail(sendTo, emailTitle, emailContent); + } + + public static boolean sendSMS(Map param) { + String receiver = Util.null2String(param.get("receiver")); + String content = Util.null2String(param.get("content")); + return MessageUtil.sendSMS(receiver, content); + } +} diff --git a/src/weaver/formmode/recruit/modeexpand/process/RelatedStageModeExpand.java b/src/weaver/formmode/recruit/modeexpand/process/RelatedStageModeExpand.java index 8c75874..8c5a459 100644 --- a/src/weaver/formmode/recruit/modeexpand/process/RelatedStageModeExpand.java +++ b/src/weaver/formmode/recruit/modeexpand/process/RelatedStageModeExpand.java @@ -56,7 +56,6 @@ public class RelatedStageModeExpand extends AbstractModeExpandJavaCodeNew { } } catch (Exception e) { new BaseBean().writeLog(e); - ; result.put("errmsg", "完成需求操作失败"); result.put("flag", "false"); } @@ -90,29 +89,26 @@ public class RelatedStageModeExpand extends AbstractModeExpandJavaCodeNew { String processIdsStr = StringUtils.join(Arrays.asList(processIds), ","); String insertSql = "insert into " + MODE_TABLE_NAME + " (modeuuid, modedatacreater, modedatacreatedate, modedatacreatetime, modedatamodifier, modedatamodifydatetime, modedatacreatertype, formmodeid, jdmc, jdms, jdlx, hj, sfqy, zssx, zpjd, zplc) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; - for (String processId : processIdsStr.split(",")) { - if (StringUtils.isBlank(processId)) { - continue; - } - insertMainTableData(billId, processId, insertSql, paramsList); + if (StringUtils.isNotBlank(processIdsStr)) { + insertMainTableData(billId, processIdsStr, insertSql, paramsList); } } /** * 插入主表数据 * - * @param billId 招聘流程表单ID - * @param processId 招聘阶段ID - * @param insertSql 插入SQL语句 - * @param paramsList 待插入参数集合 + * @param billId 招聘流程表单ID + * @param processIdsStr 招聘阶段ID + * @param insertSql 插入SQL语句 + * @param paramsList 待插入参数集合 */ - private void insertMainTableData(String billId, String processId, String insertSql, List paramsList) { - String uuid = UUID.randomUUID().toString(); - ArrayList insertList = new ArrayList<>(paramsList); - insertList.add(0, uuid); + private void insertMainTableData(String billId, String processIdsStr, String insertSql, List paramsList) { RecordSet rs = new RecordSet(); - rs.executeQuery("select * from uf_jcl_zpjdsz where id = ?", processId); - if (rs.next()) { + rs.executeQuery("select * from uf_jcl_zpjdsz where id in (" + processIdsStr + ") order by hj,zssx"); + while (rs.next()) { + String uuid = UUID.randomUUID().toString(); + ArrayList insertList = new ArrayList<>(paramsList); + insertList.add(0, uuid); String formModeId = rs.getString("formmodeid"); insertList.add(formModeId); insertList.add(RecruitModeUtil.parseBlankToNull(rs.getString("jdmc"))); @@ -122,12 +118,12 @@ public class RelatedStageModeExpand extends AbstractModeExpandJavaCodeNew { insertList.add(RecruitModeUtil.parseBlankToNull(rs.getString("sfqy"))); insertList.add(RecruitModeUtil.parseBlankToNull(rs.getString("zssx"))); // zpjd - insertList.add(RecruitModeUtil.parseBlankToNull(processId)); + insertList.add(RecruitModeUtil.parseBlankToNull(rs.getString("id"))); // zplc insertList.add(RecruitModeUtil.parseBlankToNull(billId)); // 插入主表数据 rs.executeUpdate(insertSql, insertList); - refreshRight(uuid, formModeId, processId); + refreshRight(uuid, formModeId, rs.getString("id")); } }