diff --git a/src/com/engine/hrm/cmd/jobset/AddJobTitleCmd.java b/src/com/engine/hrm/cmd/jobset/AddJobTitleCmd.java index 957f350..5c0973a 100644 --- a/src/com/engine/hrm/cmd/jobset/AddJobTitleCmd.java +++ b/src/com/engine/hrm/cmd/jobset/AddJobTitleCmd.java @@ -59,13 +59,14 @@ public class AddJobTitleCmd extends AbstractCommonCommand> { String isBrowser = Util.null2String(params.get("isBrowser")); String jobtitlemark = Util.null2String(params.get("jobtitlemark")); String remarkMultilingual = Util.formatMultiLang(jobtitlemark,""+user.getLanguage()); - String jobtitlename = Util.null2String(params.get("jobtitlename")); + String jobtitlename = jobtitlemark; String jobactivityid = Util.null2String(params.get("jobactivityid")); String jobresponsibility = Util.null2String(params.get("jobresponsibility")); String jobcompetency = Util.null2String(params.get("jobcompetency")); String jobtitleremark = Util.null2String(params.get("jobtitleremark")); String jobdoc = Util.null2String(params.get("jobdoc")); String jobtitlecode = Util.null2String(params.get("jobtitlecode")); + String englishname = Util.null2String(params.get("englishname")); String[] strObj = {jobtitlemark, jobtitlename, jobactivityid, Util.null2String(params.get("jobresponsibility")), Util.null2String(params.get("jobcompetency")), @@ -127,6 +128,9 @@ public class AddJobTitleCmd extends AbstractCommonCommand> { String sql = "update HrmJobTitles set " + DbFunctionUtil.getInsertUpdateSetSql(RecordSet.getDBType(), user.getUID()) + " where id=" + id; RecordSet.executeUpdate(sql); + // 更新英文名称 + sql = "update HrmJobTitles set englishname = ? where id= ?"; + RecordSet.executeUpdate(sql,englishname,id); HrmServiceManager HrmServiceManager = new HrmServiceManager(); HrmServiceManager.SynInstantJobtitle("" + id, "1"); diff --git a/src/com/engine/hrm/cmd/jobset/EditJobTitleCmd.java b/src/com/engine/hrm/cmd/jobset/EditJobTitleCmd.java index 552d88f..07d3891 100644 --- a/src/com/engine/hrm/cmd/jobset/EditJobTitleCmd.java +++ b/src/com/engine/hrm/cmd/jobset/EditJobTitleCmd.java @@ -58,7 +58,7 @@ public class EditJobTitleCmd extends AbstractCommonCommand> String operateIp = Util.null2String(params.get("operateIp")); String jobtitlemark = Util.null2String(params.get("jobtitlemark")); String remarkMultilingual = Util.formatMultiLang(jobtitlemark,""+user.getLanguage()); - String jobtitlename = Util.null2String(params.get("jobtitlename")); + String jobtitlename = jobtitlemark; String jobactivityid = Util.null2String(params.get("jobactivityid")); String jobresponsibility = Util.null2String(params.get("jobresponsibility")); String jobcompetency = Util.null2String(params.get("jobcompetency")); @@ -66,6 +66,7 @@ public class EditJobTitleCmd extends AbstractCommonCommand> String jobdoc = Util.null2String(params.get("jobdoc")); String id = Util.null2String(params.get("id")); String jobtitlecode = Util.null2String(params.get("jobtitlecode")); + String englishname = Util.null2String(params.get("englishname")); try { // jobtitlecode = CodeRuleManager.getCodeRuleManager().generateRuleCode(RuleCodeType.JOBTITLES, jobtitlecode); if (StringUtils.isNotEmpty(jobtitlecode)) { @@ -126,6 +127,9 @@ public class EditJobTitleCmd extends AbstractCommonCommand> String sql = "update HrmJobTitles set "+ DbFunctionUtil.getUpdateSetSql(RecordSet.getDBType(),user.getUID())+" where id="+id; RecordSet.executeUpdate(sql); + // 更新英文名称 + sql = "update HrmJobTitles set englishname = ? where id= ?"; + RecordSet.executeUpdate(sql,englishname,id); HrmServiceManager HrmServiceManager = new HrmServiceManager(); JobTitlesComInfo JobTitlesComInfo = new JobTitlesComInfo(); diff --git a/src/com/engine/hrm/cmd/jobset/GetJobDetailCmd.java b/src/com/engine/hrm/cmd/jobset/GetJobDetailCmd.java index 3de8ee6..cddde19 100644 --- a/src/com/engine/hrm/cmd/jobset/GetJobDetailCmd.java +++ b/src/com/engine/hrm/cmd/jobset/GetJobDetailCmd.java @@ -107,6 +107,10 @@ public class GetJobDetailCmd extends AbstractCommonCommand> datas.put("value", rs.getString(3)); list.add(datas); + datas = new HashMap(); + datas.put("label", SystemEnv.getHtmlLabelName(548239, Util.getIntValue(user.getLanguage()))); + datas.put("value", rs.getString("englishname")); + list.add(datas); datas = new HashMap(); datas.put("label", SystemEnv.getHtmlLabelName(524944, Util.getIntValue(user.getLanguage()))); datas.put("value", rs.getString("jobtitlecode")); diff --git a/src/com/engine/hrm/cmd/jobset/GetJobTitleFormCmd.java b/src/com/engine/hrm/cmd/jobset/GetJobTitleFormCmd.java index 66ae45c..47b2cea 100644 --- a/src/com/engine/hrm/cmd/jobset/GetJobTitleFormCmd.java +++ b/src/com/engine/hrm/cmd/jobset/GetJobTitleFormCmd.java @@ -125,16 +125,16 @@ public class GetJobTitleFormCmd extends AbstractCommonCommand(); groupitem = new HashMap(); if (jobtitleid.length() != 0) { - groupitem.put("title", SystemEnv.getHtmlLabelName(386216,weaver.general.Util.getIntValue(user.getLanguage()))); + groupitem.put("title", SystemEnv.getHtmlLabelName(386216, Util.getIntValue(user.getLanguage()))); } else { - groupitem.put("title", SystemEnv.getHtmlLabelName(125302,weaver.general.Util.getIntValue(user.getLanguage()))); + groupitem.put("title", SystemEnv.getHtmlLabelName(125302, Util.getIntValue(user.getLanguage()))); } groupitem.put("defaultshow", true); for (int i = 0; i < fields.length; i++) { @@ -187,10 +187,13 @@ public class GetJobTitleFormCmd extends AbstractCommonCommand