dxfeng
/
weaver-hrm-recruit
generated from dxfeng/secondev-chapanda-feishu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加英文名称字段支持

This commit is contained in:
dxfeng 2025-01-07 09:11:48 +08:00
parent 499520e39d
commit e01f86f125
4 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/engine/hrm/cmd/jobset/AddJobTitleCmd.java
View File

@ -59,13 +59,14 @@ public class AddJobTitleCmd extends AbstractCommonCommand<Map<String, Object>> {
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<Map<String, Object>> {
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");

6
src/com/engine/hrm/cmd/jobset/EditJobTitleCmd.java
View File

@ -58,7 +58,7 @@ public class EditJobTitleCmd extends AbstractCommonCommand<Map<String, Object>>
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<Map<String, Object>>
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<Map<String, Object>>
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();

4
src/com/engine/hrm/cmd/jobset/GetJobDetailCmd.java
View File

@ -107,6 +107,10 @@ public class GetJobDetailCmd extends AbstractCommonCommand<Map<String, Object>>
datas.put("value", rs.getString(3));
list.add(datas);
datas = new HashMap<String, Object>();
datas.put("label", SystemEnv.getHtmlLabelName(548239, Util.getIntValue(user.getLanguage())));
datas.put("value", rs.getString("englishname"));
list.add(datas);
datas = new HashMap<String, Object>();
datas.put("label", SystemEnv.getHtmlLabelName(524944, Util.getIntValue(user.getLanguage())));
datas.put("value", rs.getString("jobtitlecode"));

11
src/com/engine/hrm/cmd/jobset/GetJobTitleFormCmd.java
View File

@ -125,16 +125,16 @@ public class GetJobTitleFormCmd extends AbstractCommonCommand<Map<String, Object
}
}
String[] fields = new String[]{"jobtitlemark,382413,1,1", "jobtitlename,382414,1,1","jobtitlecode,524944,1,1", "jobactivityid,15855,3,282", "jobresponsibility,15856,2,1", "jobdoc,857,3,9", "jobcompetency,895,2,1", "jobtitleremark,454,2,1"};
String[] fields = new String[]{"jobtitlemark,382413,1,1", "jobtitlename,382414,1,1", "englishname,548239,1,1","jobtitlecode,524944,1,1", "jobactivityid,15855,3,282", "jobresponsibility,15856,2,1", "jobdoc,857,3,9", "jobcompetency,895,2,1", "jobtitleremark,454,2,1"};
HrmFieldSearchConditionComInfo hrmFieldSearchConditionComInfo = new HrmFieldSearchConditionComInfo();
SearchConditionItem searchConditionItem = null;
HrmFieldBean hrmFieldBean = null;
itemlist = new ArrayList<Object>();
groupitem = new HashMap<String, Object>();
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<Map<String, Object
searchConditionItem.setLabelcol(6);
searchConditionItem.setFieldcol(18);
if (hrmFieldBean.getFieldname().equals("jobtitlemark") || hrmFieldBean.getFieldname().equals("jobtitlename") || hrmFieldBean.getFieldname().equals("jobactivityid")) {
if (hrmFieldBean.getFieldname().equals("jobtitlemark") || hrmFieldBean.getFieldname().equals("englishname") || hrmFieldBean.getFieldname().equals("jobactivityid")) {
searchConditionItem.setViewAttr(3);
searchConditionItem.setRules("required|string");
}
if( hrmFieldBean.getFieldname().equals("jobtitlename")){
continue;
}
if(onlyView){
searchConditionItem.setViewAttr(1);
}