diff --git a/src/com/engine/recruit/conn/StepMsgCommonInfo.java b/src/com/engine/recruit/conn/StepMsgCommonInfo.java index 2649d27..6a80f70 100644 --- a/src/com/engine/recruit/conn/StepMsgCommonInfo.java +++ b/src/com/engine/recruit/conn/StepMsgCommonInfo.java @@ -43,27 +43,33 @@ public class StepMsgCommonInfo { stepId = rs.getString("id"); stepName = rs.getString("jdmc"); } - // 判断该职位是否设置提醒人员 - rs.executeQuery("select * from uf_jcl_jdtx where zpzw = ?", positionId); - while (rs.next()) { - useFlowTips = false; - String zpjd = rs.getString("zpjd"); - if (StringUtils.isNotBlank(zpjd)) { - List strings = Arrays.asList(zpjd.split(",")); - if (strings.contains(stepId)) { - ids.add(rs.getString("id")); + rs.executeQuery("select qyzt from uf_jcl_step_config where zpzw = ?", positionId); + if (rs.next()) { + useFlowTips = !"1".equals(rs.getString("qyzt")); + } + if (!useFlowTips) { + // 判断该职位是否设置提醒人员 + rs.executeQuery("select * from uf_jcl_jdtx where zpzw = ?", positionId); + while (rs.next()) { + useFlowTips = false; + String zpjd = rs.getString("zpjd"); + if (StringUtils.isNotBlank(zpjd)) { + List strings = Arrays.asList(zpjd.split(",")); + if (strings.contains(stepId)) { + ids.add(rs.getString("id")); + } } } } if (useFlowTips) { // 判断是否启用全部配置,未启用直接跳过 - String stepReminder = ""; - rs.executeQuery("select value from uf_jcl_recruit_setting where name = ?", "ENABLE_STEP_MSG"); + String qyzt = ""; + rs.executeQuery("select qyzt from uf_jcl_step_config where zpzw = -1"); if (rs.next()) { - stepReminder = rs.getString("value"); + qyzt = rs.getString("qyzt"); } - if ("true".equals(stepReminder)) { + if ("1".equals(qyzt)) { // 查询当前流程的配置 rs.executeQuery("select * from uf_jcl_jdtx where zpzw is null and zplc = ?", flowId); while (rs.next()) { diff --git a/src/com/engine/recruit/service/impl/RecruitPositionServiceImpl.java b/src/com/engine/recruit/service/impl/RecruitPositionServiceImpl.java index ff13b1d..1c177ec 100644 --- a/src/com/engine/recruit/service/impl/RecruitPositionServiceImpl.java +++ b/src/com/engine/recruit/service/impl/RecruitPositionServiceImpl.java @@ -336,12 +336,24 @@ public class RecruitPositionServiceImpl extends Service implements RecruitPositi Map resultMap = new HashMap<>(); RecordSet rs = new RecordSet(); String checked = Util.null2String(param.get("checked")); - if (StringUtils.isNotBlank(checked)) { - rs.executeUpdate("update uf_jcl_recruit_setting set value = ? where name = ?", checked, "ENABLE_STEP_MSG"); + String zpzw = Util.null2String(param.get("cardid")); + if (StringUtils.isBlank(zpzw)) { + zpzw = "-1"; } - rs.executeQuery("select value from uf_jcl_recruit_setting where name = ?", "ENABLE_STEP_MSG"); + if (StringUtils.isNotBlank(checked)) { + checked = "true".equals(checked) ? "1" : "0"; + rs.executeQuery("select qyzt from uf_jcl_step_config where zpzw = ? ", zpzw); + if (rs.next()) { + // 更新数据 + rs.executeUpdate("update uf_jcl_step_config set qyzt = ? where zpzw = ?", checked, zpzw); + } else { + // 插入数据 + rs.executeUpdate("insert into uf_jcl_step_config (zpzw, qyzt) values (?, ?)", zpzw, checked); + } + } + rs.executeQuery("select qyzt from uf_jcl_step_config where zpzw = ?", zpzw); if (rs.next()) { - resultMap.put("enable", rs.getString("value")); + resultMap.put("enable", "1".equals(rs.getString("qyzt"))); } return resultMap; }