From 240bb21df236a8d719c972000be50335da95fdf3 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 13 Jun 2024 14:52:24 +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 --- .../entity/staff/vo/StaffPlanTableVO.java | 2 +- .../entity/staff/vo/StaffTableVO.java | 6 +++--- .../engine/organization/enums/ModuleTypeEnum.java | 8 ++++---- .../service/impl/StaffServiceImpl.java | 2 +- .../transmethod/StaffPlanTransMethod.java | 12 ++++++++++-- .../transmethod/StaffTransMethod.java | 15 +++++++++++++-- 6 files changed, 32 insertions(+), 13 deletions(-) diff --git a/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java b/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java index 94d41472..1eac8564 100644 --- a/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java +++ b/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java @@ -56,7 +56,7 @@ public class StaffPlanTableVO { /** * w维度 */ - @OrganizationTableColumn(labelId = 547293, text = "维度", width = "16%", column = "control_dimension",transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getControlDimension") + @OrganizationTableColumn(labelId = 547293, text = "维度", width = "16%", column = "control_dimension",transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getControlDimension" ,multiLanguage = true) private String controlDimension; /** * 年度 diff --git a/src/com/engine/organization/entity/staff/vo/StaffTableVO.java b/src/com/engine/organization/entity/staff/vo/StaffTableVO.java index f63c2b7f..4fe51cc1 100644 --- a/src/com/engine/organization/entity/staff/vo/StaffTableVO.java +++ b/src/com/engine/organization/entity/staff/vo/StaffTableVO.java @@ -25,7 +25,7 @@ import lombok.NoArgsConstructor; operates = { @OrganizationTableOperate(index = "0", labelId = 547132, text = "编辑"), @OrganizationTableOperate(index = "1", labelId = 547135, text = "删除"), - @OrganizationTableOperate(index = "2", text = "变更") + @OrganizationTableOperate(index = "2", labelId = 547176, text = "变更") }, tableType = WeaTableType.CHECKBOX ) @@ -48,7 +48,7 @@ public class StaffTableVO { /** * 维度 */ - @OrganizationTableColumn(labelId = 547293, text = "维度", width = "10%", column = "control_dimension", transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getControlDimension") + @OrganizationTableColumn(labelId = 547293, text = "维度", width = "10%", column = "control_dimension", transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getControlDimension", multiLanguage = true) private String controlDimension; /** * 分部 @@ -83,7 +83,7 @@ public class StaffTableVO { /** * 缺编状态 */ - @OrganizationTableColumn(labelId = 547348, text = "缺编状态", width = "10%", column = "lack_status", transmethod = "com.engine.organization.transmethod.StaffTransMethod.getLackSpan") + @OrganizationTableColumn(labelId = 547348, text = "缺编状态", width = "20%", column = "lack_status", transmethod = "com.engine.organization.transmethod.StaffTransMethod.getLackSpan",multiLanguage = true) private String lackStatus; /** * 编制描述 diff --git a/src/com/engine/organization/enums/ModuleTypeEnum.java b/src/com/engine/organization/enums/ModuleTypeEnum.java index 404fa62b..17b515d2 100644 --- a/src/com/engine/organization/enums/ModuleTypeEnum.java +++ b/src/com/engine/organization/enums/ModuleTypeEnum.java @@ -9,10 +9,10 @@ package com.engine.organization.enums; **/ public enum ModuleTypeEnum implements BaseEnum { - subcompanyfielddefined(1, "分部", -84967), - departmentfielddefined(2, "部门", -84967), - jobfielddefined(3, "岗位", -84967), - resourcefielddefined(4, "人员", -84967); + subcompanyfielddefined(1, "分部", 547332), + departmentfielddefined(2, "部门", 547331), + jobfielddefined(3, "岗位", 547333), + resourcefielddefined(4, "人员", 547205); private int value; diff --git a/src/com/engine/organization/service/impl/StaffServiceImpl.java b/src/com/engine/organization/service/impl/StaffServiceImpl.java index c3d24820..f78a16a3 100644 --- a/src/com/engine/organization/service/impl/StaffServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffServiceImpl.java @@ -355,7 +355,7 @@ public class StaffServiceImpl extends Service implements StaffService { List addGroups = new ArrayList<>(); List selectItems = new ArrayList<>(); // 方案 - SearchConditionItem planIdItem = OrganizationFormItemUtil.browserItem(user, 4, 3, 2, false, 547459, "162", "planId", "staffPlanBrowser"); + SearchConditionItem planIdItem = OrganizationFormItemUtil.browserItem(user, 4, 6, 2, false, 547459, "162", "planId", "staffPlanBrowser"); planIdItem.setRules("required|string"); planIdItem.setHelpfulTip(SystemEnv.getHtmlLabelName(547343,user.getLanguage())); planIdItem.setLabelcol(2); diff --git a/src/com/engine/organization/transmethod/StaffPlanTransMethod.java b/src/com/engine/organization/transmethod/StaffPlanTransMethod.java index 494f1d1a..8d8c71fb 100644 --- a/src/com/engine/organization/transmethod/StaffPlanTransMethod.java +++ b/src/com/engine/organization/transmethod/StaffPlanTransMethod.java @@ -1,10 +1,12 @@ package com.engine.organization.transmethod; +import cn.hutool.core.convert.Convert; import com.engine.organization.entity.DeleteParam; import com.engine.organization.enums.ModuleTypeEnum; import com.engine.organization.mapper.staff.StaffPlanMapper; import com.engine.organization.util.db.MapperProxyFactory; import org.apache.commons.lang3.StringUtils; +import weaver.systeminfo.SystemEnv; import java.util.List; import java.util.Map; @@ -33,11 +35,17 @@ public class StaffPlanTransMethod { } - public static String getControlDimension(String controlDimension) { + public static String getControlDimension(String controlDimension, String languageId) { + Integer language = Convert.toInt(languageId, -1); + if (!"".equals(controlDimension)) { for (ModuleTypeEnum myEnum : ModuleTypeEnum.values()) { if (myEnum.getValue() == Integer.parseInt(controlDimension)) { - return myEnum.getDefaultLabel(); + if (-1 == language) { + return myEnum.getDefaultLabel(); + } + Integer labelId = myEnum.getLabelId(); + return SystemEnv.getHtmlLabelName(labelId, language); } } } diff --git a/src/com/engine/organization/transmethod/StaffTransMethod.java b/src/com/engine/organization/transmethod/StaffTransMethod.java index cc264738..f0e84c8f 100644 --- a/src/com/engine/organization/transmethod/StaffTransMethod.java +++ b/src/com/engine/organization/transmethod/StaffTransMethod.java @@ -1,5 +1,8 @@ package com.engine.organization.transmethod; +import cn.hutool.core.convert.Convert; +import weaver.systeminfo.SystemEnv; + /** * @description: * @author:dxfeng @@ -8,23 +11,31 @@ package com.engine.organization.transmethod; */ public class StaffTransMethod { - public static String getLackSpan(String lackStatus) { + public static String getLackSpan(String lackStatus, String languageId) { + Integer language = Convert.toInt(languageId, -1); String lackSpan = ""; + int labelId = -1; switch (lackStatus) { case "1": lackSpan = "缺编"; + labelId = 547351; break; case "2": lackSpan = "满员"; + labelId = 547350; break; case "3": lackSpan = "超编"; + labelId = 547352; break; default: break; } - return lackSpan; + if (-1 == language || -1 == labelId) { + return lackSpan; + } + return SystemEnv.getHtmlLabelName(labelId, language); } } From 2949a33d71d58193adee05965f059e2a1b535357 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 13 Jun 2024 15:23:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84?= =?UTF-8?q?=E5=9B=BE=EF=BC=8C=E5=B2=97=E4=BD=8D=E6=95=B0=E6=8D=AE=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/service/impl/ChartServiceImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/com/engine/organization/service/impl/ChartServiceImpl.java b/src/com/engine/organization/service/impl/ChartServiceImpl.java index cccadf74..284dc846 100644 --- a/src/com/engine/organization/service/impl/ChartServiceImpl.java +++ b/src/com/engine/organization/service/impl/ChartServiceImpl.java @@ -279,9 +279,13 @@ public class ChartServiceImpl extends Service implements ChartService { if (showJob) { // 查询部门下的岗位 if (isRealTime) { - sql = "select a.id,a.jobtitlename as name from hrmjobtitles a inner join jcl_org_job b on a.id = b.ec_jobtitle and (b.delete_type is null or b.delete_type = 0) where b.ec_department = '" + departmentId + "'"; + String subcompanyid1 = new DepartmentComInfo().getSubcompanyid1(departmentId); + sql = "select a.id,a.jobtitlename as name from hrmjobtitles a inner join jcl_org_job b on a.id = b.ec_jobtitle and (b.delete_type is null or b.delete_type = 0) where b.ec_department = '" + departmentId + "' and b.ec_company='" + subcompanyid1 + "'"; } else { - sql = "select jobid as id ,jobname as name from jcl_chart_job where departmentid = '" + departmentId + "' and versionid = " + versionId; + rs.executeQuery("select subcompanyid from jcl_chart_department where departmentid = '" + departmentId + "' and versionid = " + versionId); + rs.next(); + String subcompanyid = rs.getString("subcompanyid"); + sql = "select jobid as id ,jobname as name from jcl_chart_job where departmentid = '" + departmentId + "' and subcompanyid = '" + subcompanyid + "' and versionid = " + versionId; } rs.executeQuery(sql); while (rs.next()) {