diff --git a/src/com/engine/recruit/service/impl/RecruitFlowServiceImpl.java b/src/com/engine/recruit/service/impl/RecruitFlowServiceImpl.java index 147d8c3..94f5830 100644 --- a/src/com/engine/recruit/service/impl/RecruitFlowServiceImpl.java +++ b/src/com/engine/recruit/service/impl/RecruitFlowServiceImpl.java @@ -29,7 +29,7 @@ public class RecruitFlowServiceImpl extends Service implements RecruitFlowServic String stageId = Util.null2String(params.get("stageId")); //TODO 查询对应的招聘流程 - int zplcId = 2; + int zplcId = 3; List buttonList = new ArrayList<>(); RecordSet rs = new RecordSet(); if (StringUtils.isBlank(stageId)) { diff --git a/src/weaver/formmode/recruit/modeexpand/interview/BatchAddInterviewResultModeExpand.java b/src/weaver/formmode/recruit/modeexpand/interview/BatchAddInterviewResultModeExpand.java index d03d27e..bc094f0 100644 --- a/src/weaver/formmode/recruit/modeexpand/interview/BatchAddInterviewResultModeExpand.java +++ b/src/weaver/formmode/recruit/modeexpand/interview/BatchAddInterviewResultModeExpand.java @@ -62,7 +62,7 @@ public class BatchAddInterviewResultModeExpand extends AbstractModeExpandJavaCod Property[] properties = mainTableInfo.getProperty(); Map mainDataMap = new HashMap<>(); for (Property property : properties) { - mainDataMap.put(property.getName(), parseBlankToNull(property.getValue())); + mainDataMap.put(property.getName(), RecruitModeUtil.parseBlankToNull(property.getValue())); } // 填充建模数据基本信息 mainDataMap.put("formmodeid", formModeId); @@ -85,7 +85,7 @@ public class BatchAddInterviewResultModeExpand extends AbstractModeExpandJavaCod Map detailDataMap = new HashMap<>(mainDataMap); Cell[] cells = row.getCell(); for (Cell cell : cells) { - detailDataMap.put(cell.getName(), parseBlankToNull(cell.getValue())); + detailDataMap.put(cell.getName(), RecruitModeUtil.parseBlankToNull(cell.getValue())); } detailMapList.add(detailDataMap); } @@ -105,7 +105,7 @@ public class BatchAddInterviewResultModeExpand extends AbstractModeExpandJavaCod ModeRightInfo modeRightInfo = new ModeRightInfo(); modeRightInfo.setNewRight(true); modeRightInfo.editModeDataShare(1, formModeId, bid); - getApplicantsInfo(msgBuilder, Util.null2String(detailDataMap.get("ypz")), Util.null2String(detailDataMap.get("tdzw"))); + getApplicantsInfo(msgBuilder, Util.null2String(detailDataMap.get("ypz")), Util.null2String(detailDataMap.get("ypzw"))); } } } @@ -156,8 +156,8 @@ public class BatchAddInterviewResultModeExpand extends AbstractModeExpandJavaCod // 应聘者 param.add(map.get("ypz")); // 投递职位 - param.add(map.get("tdzw")); - //投递时间 + param.add(map.get("ypzw")); + // 投递时间 param.add(map.get("tdsj")); // 手机号码 param.add(map.get("sjhm")); @@ -186,16 +186,6 @@ public class BatchAddInterviewResultModeExpand extends AbstractModeExpandJavaCod } - /** - * 将空字符串转化为NULL - * - * @param str 字符串 - * @return Object - */ - private Object parseBlankToNull(String str) { - return StringUtils.isBlank(str) ? null : str; - } - /** * 获取应聘者信息 diff --git a/src/weaver/formmode/recruit/modeexpand/process/RelatedStageModeExpand.java b/src/weaver/formmode/recruit/modeexpand/process/RelatedStageModeExpand.java index 9a44dc5..9ae018c 100644 --- a/src/weaver/formmode/recruit/modeexpand/process/RelatedStageModeExpand.java +++ b/src/weaver/formmode/recruit/modeexpand/process/RelatedStageModeExpand.java @@ -4,6 +4,7 @@ import org.apache.commons.lang3.StringUtils; import weaver.common.DateUtil; import weaver.conn.RecordSet; import weaver.formmode.customjavacode.AbstractModeExpandJavaCodeNew; +import weaver.formmode.recruit.modeexpand.util.RecruitModeUtil; import weaver.formmode.setup.ModeRightInfo; import weaver.general.BaseBean; import weaver.general.Util; @@ -105,23 +106,23 @@ public class RelatedStageModeExpand extends AbstractModeExpandJavaCodeNew { */ private void insertMainTableData(String billId, String processId, String insertSql, List paramsList) { String uuid = UUID.randomUUID().toString(); - ArrayList insertList = new ArrayList<>(paramsList); + ArrayList insertList = new ArrayList<>(paramsList); insertList.add(0, uuid); RecordSet rs = new RecordSet(); rs.executeQuery("select * from uf_jcl_zpjdsz where id = ?", processId); if (rs.next()) { String formModeId = rs.getString("formmodeid"); insertList.add(formModeId); - insertList.add(rs.getString("jdmc")); - insertList.add(rs.getString("jdms")); - insertList.add(rs.getString("jdlx")); - insertList.add(rs.getString("hj")); - insertList.add(rs.getString("sfqy")); - insertList.add(rs.getString("zssx")); + insertList.add(RecruitModeUtil.parseBlankToNull(rs.getString("jdmc"))); + insertList.add(RecruitModeUtil.parseBlankToNull(rs.getString("jdms"))); + insertList.add(RecruitModeUtil.parseBlankToNull(rs.getString("jdlx"))); + insertList.add(RecruitModeUtil.parseBlankToNull(rs.getString("hj"))); + insertList.add(RecruitModeUtil.parseBlankToNull(rs.getString("sfqy"))); + insertList.add(RecruitModeUtil.parseBlankToNull(rs.getString("zssx"))); // zpjd - insertList.add(processId); + insertList.add(RecruitModeUtil.parseBlankToNull(processId)); // zplc - insertList.add(billId); + insertList.add(RecruitModeUtil.parseBlankToNull(billId)); // 插入主表数据 rs.executeUpdate(insertSql, insertList); refreshRight(uuid, formModeId, processId); @@ -147,35 +148,35 @@ public class RelatedStageModeExpand extends AbstractModeExpandJavaCodeNew { // 插入明细表数据 rs.executeQuery("select * from " + MODE_TABLE_NAME_DT1 + " where mainid = ? ", processId); - List> insertList = new ArrayList<>(); + List> insertList = new ArrayList<>(); while (rs.next()) { - List paramList = new ArrayList<>(); + List paramList = new ArrayList<>(); // mainid paramList.add(bid); - paramList.add(rs.getString("czan")); - paramList.add(rs.getString("zdyxsmc")); - paramList.add(rs.getString("sfqy")); - paramList.add(rs.getString("tzymbt")); - paramList.add(rs.getString("tzymdz")); - paramList.add(rs.getString("zssx")); + paramList.add(RecruitModeUtil.parseBlankToNull(rs.getString("czan"))); + paramList.add(RecruitModeUtil.parseBlankToNull(rs.getString("zdyxsmc"))); + paramList.add(RecruitModeUtil.parseBlankToNull(rs.getString("sfqy"))); + paramList.add(RecruitModeUtil.parseBlankToNull(rs.getString("tzymbt"))); + paramList.add(RecruitModeUtil.parseBlankToNull(rs.getString("tzymdz"))); + paramList.add(RecruitModeUtil.parseBlankToNull(rs.getString("zssx"))); insertList.add(paramList); } - for (List list : insertList) { + for (List list : insertList) { rs.executeUpdate("insert into " + MODE_TABLE_NAME_DT1 + " (mainid, czan, zdyxsmc, sfqy, tzymbt, tzymdz, zssx) values (?, ?, ?, ?, ?, ?, ?)", list); } insertList = new ArrayList<>(); rs.executeQuery("select * from " + MODE_TABLE_NAME_DT2 + " where mainid = ? ", processId); while (rs.next()) { - List paramList = new ArrayList<>(); + List paramList = new ArrayList<>(); // mainid paramList.add(bid); - paramList.add(rs.getString("ymbt")); - paramList.add(rs.getString("ymdz")); - paramList.add(rs.getString("zssx")); + paramList.add(RecruitModeUtil.parseBlankToNull(rs.getString("ymbt"))); + paramList.add(RecruitModeUtil.parseBlankToNull(rs.getString("ymdz"))); + paramList.add(RecruitModeUtil.parseBlankToNull(rs.getString("zssx"))); insertList.add(paramList); } - for (List list : insertList) { + for (List list : insertList) { rs.executeUpdate("insert into " + MODE_TABLE_NAME_DT2 + " (mainid, ymbt, ymdz, zssx) values (?, ?, ?, ?)", list); } } diff --git a/src/weaver/formmode/recruit/modeexpand/util/RecruitModeUtil.java b/src/weaver/formmode/recruit/modeexpand/util/RecruitModeUtil.java index 4d67e09..938b47e 100644 --- a/src/weaver/formmode/recruit/modeexpand/util/RecruitModeUtil.java +++ b/src/weaver/formmode/recruit/modeexpand/util/RecruitModeUtil.java @@ -3,6 +3,7 @@ package weaver.formmode.recruit.modeexpand.util; import com.cloudstore.dev.api.bean.MessageBean; import com.cloudstore.dev.api.bean.MessageType; import com.cloudstore.dev.api.util.Util_Message; +import org.apache.commons.lang3.StringUtils; import weaver.general.BaseBean; import weaver.hrm.resource.ResourceComInfo; @@ -67,4 +68,15 @@ public class RecruitModeUtil { } return value; } + + /** + * 转换空字符串为null + * + * @param str 字符串 + * @return 转换后的字符串 + */ + public static Object parseBlankToNull(String str) { + return StringUtils.isBlank(str) ? null : str; + } + } diff --git a/src/weaver/interfaces/recruit/action/RecruitFlowToModeAction.java b/src/weaver/interfaces/recruit/action/RecruitFlowToModeAction.java index e79f6fd..9317e18 100644 --- a/src/weaver/interfaces/recruit/action/RecruitFlowToModeAction.java +++ b/src/weaver/interfaces/recruit/action/RecruitFlowToModeAction.java @@ -4,10 +4,10 @@ import com.cloudstore.dev.api.bean.MessageBean; import com.cloudstore.dev.api.bean.MessageType; import com.cloudstore.dev.api.util.Util_Message; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import weaver.common.DateUtil; import weaver.conn.RecordSet; import weaver.conn.RecordSetTrans; +import weaver.formmode.recruit.modeexpand.util.RecruitModeUtil; import weaver.formmode.setup.ModeRightInfo; import weaver.general.BaseBean; import weaver.general.Util; @@ -87,7 +87,7 @@ public class RecruitFlowToModeAction implements Action { detailMap.putAll(mainMap); Cell[] cells = row.getCell(); for (Cell cell : cells) { - detailMap.put(cell.getName(), parseBlankToNull(cell.getValue())); + detailMap.put(cell.getName(), RecruitModeUtil.parseBlankToNull(cell.getValue())); } insertList.add(detailMap); } @@ -205,15 +205,6 @@ public class RecruitFlowToModeAction implements Action { return param; } - /** - * 将空字符串转化为NULL - * - * @param str 字符串 - * @return Object - */ - private Object parseBlankToNull(String str) { - return StringUtils.isBlank(str) ? null : str; - } /** * 权限重构