liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

人员批量导入 BUG修复

This commit is contained in:
dxfeng 2023-06-08 15:56:06 +08:00
parent 4a8652a8b3
commit cdd2e6384e
2 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
View File

@ -796,35 +796,37 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
departmentColumn = column;
iterator.remove();
}
if ("方案编号".equals(column)) {
schemeList.add(column);
levelList.add(column);
gradeList.add(column);
}
if ("方案名称".equals(column)) {
schemeList.add(column);
}
if ("方案说明".equals(column)) {
schemeList.add(column);
}
if ("职等编号".equals(column)) {
levelList.add(0, column);
gradeList.add(column);
}
if ("职等名称".equals(column)) {
levelList.add(1, column);
}
if ("职等说明".equals(column)) {
levelList.add(column);
}
if ("职级编号".equals(column)) {
gradeList.add(0, column);
}
if ("职级名称".equals(column)) {
gradeList.add(1, column);
}
if ("职级说明".equals(column)) {
gradeList.add(column);
if ("joblevel".equals(importType)) {
if ("方案编号".equals(column)) {
schemeList.add(column);
levelList.add(column);
gradeList.add(column);
}
if ("方案名称".equals(column)) {
schemeList.add(column);
}
if ("方案说明".equals(column)) {
schemeList.add(column);
}
if ("职等编号".equals(column)) {
levelList.add(0, column);
gradeList.add(column);
}
if ("职等名称".equals(column)) {
levelList.add(1, column);
}
if ("职等说明".equals(column)) {
levelList.add(column);
}
if ("职级编号".equals(column)) {
gradeList.add(0, column);
}
if ("职级名称".equals(column)) {
gradeList.add(1, column);
}
if ("职级说明".equals(column)) {
gradeList.add(column);
}
}
}
if (StringUtils.isNotBlank(departmentColumn.toString())) {

3
src/com/engine/organization/util/saveimport/ResourceImport.java
View File

@ -57,6 +57,9 @@ public class ResourceImport {
hfm.getCustomFields();
while (hfm.next()) {
String fieldName = hfm.getFieldname();
if (-1 != cusTreeForm.getId()) {
fieldName = cusTreeForm.getId() + fieldName;
}
String fieldLabel = SystemEnv.getHtmlLabelNames(hfm.getLable(), user.getLanguage());
importFields.add(HrmFormFieldPO.builder().fieldName(fieldName).labelName(fieldLabel).build());
}