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

Merge pull request '多语言支持' (#257) from feature/dxf into develop 

Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/257
This commit is contained in:
dxfeng 2024-06-17 10:27:46 +08:00
parent acad79705b 2c7b0fe355
commit 268b7eb0e6
5 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java
View File

@ -35,16 +35,16 @@ public class EmployeeTableVO {
//@OrganizationTableColumn(column = "id", display = false)
private Long id;
@OrganizationTableColumn(text = "姓名", width = "25%", column = "lastname")
@OrganizationTableColumn(labelId = 547329, text = "姓名", width = "25%", column = "lastname")
private String lastname;
@OrganizationTableColumn(text = "性别", width = "25%", column = "sex",transmethod = "com.engine.organization.transmethod.JobTransMethod.getSexName")
@OrganizationTableColumn(labelId = 547330, text = "性别", width = "25%", column = "sex",transmethod = "com.engine.organization.transmethod.JobTransMethod.getSexName")
private String sex;
@OrganizationTableColumn(text = "手机", width = "25%", column = "mobile")
@OrganizationTableColumn(labelId = 547334, text = "手机", width = "25%", column = "mobile")
private String mobile;
@OrganizationTableColumn(text = "入职日期", width = "25%", column = "companystartdate")
@OrganizationTableColumn(labelId = 547669, text = "入职日期", width = "25%", column = "companystartdate")
private String companystartdate;

7
src/com/engine/organization/entity/resume/po/PersonnelResumePO.java
View File

@ -5,6 +5,7 @@ import net.coobird.thumbnailator.Thumbnails;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.util.IOUtils;
import weaver.file.ImageFileManager;
import weaver.general.BaseBean;
import weaver.general.GCONST;
import weaver.general.Util;
@ -78,8 +79,10 @@ public class PersonnelResumePO {
imageStr = "data:image/" + manager.getImageFileType() + ";base64," + Base64.getEncoder().encodeToString(IOUtils.toByteArray(fileInputStream));
// 删除文件
f.delete();
} catch (IOException e) {
throw new RuntimeException(e);
} catch (Exception e) {
new BaseBean().writeLog(e);
//throw new RuntimeException(e);
}
return imageStr;
}

17
src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
View File

@ -517,15 +517,16 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
private List<ResourceListColumns> getTableColumns() {
List<ResourceListColumns> list = new ArrayList<>();
list.add(ResourceListColumns.builder().title("序号").dataIndex("id").key("id").build());
list.add(ResourceListColumns.builder().title("工号").dataIndex("workCode").key("workCode").build());
list.add(ResourceListColumns.builder().title("姓名").dataIndex("lastName").key("lastName").build());
list.add(ResourceListColumns.builder().title("性别").dataIndex("sex").key("sex").build());
list.add(ResourceListColumns.builder().title("部门").dataIndex("departmentName").key("departmentName").build());
list.add(ResourceListColumns.builder().title("分部").dataIndex("subcompanyName").key("subcompanyName").build());
list.add(ResourceListColumns.builder().title("岗位").dataIndex("jobTitle").key("jobTitle").build());
int language = user.getLanguage();
list.add(ResourceListColumns.builder().title(SystemEnv.getHtmlLabelName(547327,language)).dataIndex("id").key("id").build());
list.add(ResourceListColumns.builder().title(SystemEnv.getHtmlLabelName(547328,language)).dataIndex("workCode").key("workCode").build());
list.add(ResourceListColumns.builder().title(SystemEnv.getHtmlLabelName(547329,language)).dataIndex("lastName").key("lastName").build());
list.add(ResourceListColumns.builder().title(SystemEnv.getHtmlLabelName(547330,language)).dataIndex("sex").key("sex").build());
list.add(ResourceListColumns.builder().title(SystemEnv.getHtmlLabelName(547331,language)).dataIndex("departmentName").key("departmentName").build());
list.add(ResourceListColumns.builder().title(SystemEnv.getHtmlLabelName(547332,language)).dataIndex("subcompanyName").key("subcompanyName").build());
list.add(ResourceListColumns.builder().title(SystemEnv.getHtmlLabelName(547333,language)).dataIndex("jobTitle").key("jobTitle").build());
//list.add(ResourceListColumns.builder().title("状态").dataIndex("status").key("status").build());
list.add(ResourceListColumns.builder().title("手机号").dataIndex("mobile").key("mobile").build());
list.add(ResourceListColumns.builder().title(SystemEnv.getHtmlLabelName(547334,language)).dataIndex("mobile").key("mobile").build());
return list;

2
src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java
View File

@ -804,7 +804,7 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu
if (null != resourcePO.getDepartmentid()) {
sql += " and t.ec_department = '" + resourcePO.getDepartmentid() + "'";
}
if (null != resourcePO.getDepartmentid()) {
if (null == resourcePO.getDepartmentid()) {
sql += " and t.ec_department is null";
}
if (null != resourcePO.getJobtitle()) {

2
src/com/engine/organization/service/impl/StaffServiceImpl.java
View File

@ -341,7 +341,7 @@ public class StaffServiceImpl extends Service implements StaffService {
}
addGroups.add(new SearchConditionGroup("基本信息", true, selectItems));
addGroups.add(new SearchConditionGroup(SystemEnv.getHtmlLabelName(547175,user.getLanguage()), true, selectItems));
apiDatas.put("condition", addGroups);
return apiDatas;
}