From 78c94a84d6bb68671d6eadcdfb1b31329bddcf73 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Fri, 14 Jun 2024 18:01:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E6=94=AF?= =?UTF-8?q?=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/entity/employee/vo/EmployeeTableVO.java | 8 ++++---- .../organization/entity/resume/po/PersonnelResumePO.java | 7 +++++-- .../service/impl/PersonnelResumeServiceImpl.java | 2 +- .../organization/service/impl/StaffServiceImpl.java | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java b/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java index 1aa76b92..8d57168b 100644 --- a/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java +++ b/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java @@ -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; diff --git a/src/com/engine/organization/entity/resume/po/PersonnelResumePO.java b/src/com/engine/organization/entity/resume/po/PersonnelResumePO.java index 392a4e7b..863276b1 100644 --- a/src/com/engine/organization/entity/resume/po/PersonnelResumePO.java +++ b/src/com/engine/organization/entity/resume/po/PersonnelResumePO.java @@ -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; } diff --git a/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java b/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java index f47b0286..c25bc783 100644 --- a/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java +++ b/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java @@ -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()) { diff --git a/src/com/engine/organization/service/impl/StaffServiceImpl.java b/src/com/engine/organization/service/impl/StaffServiceImpl.java index f78a16a3..5256289f 100644 --- a/src/com/engine/organization/service/impl/StaffServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffServiceImpl.java @@ -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; } From 5faffc13b6a764f027a9dc498d1299725a7d1b08 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 17 Jun 2024 10:23:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E6=94=AF?= =?UTF-8?q?=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/HrmResourceServiceImpl.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index 890535bd..6c664d03 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -517,15 +517,16 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic private List getTableColumns() { List 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;