From a80f66417520095066dfb1f6386292a00bdc98b0 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Mon, 6 May 2024 16:00:15 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=BA=E8=83=9C=E7=BB=84=E7=BB=871=E6=9E=B6?= =?UTF-8?q?=E6=9E=84=E5=9B=BE=E9=9C=80=E6=B1=82=E5=BC=80=E5=8F=91=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=81=8C=E7=AD=89=20=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=AD=89=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/entity/chart/ChartPO.java | 11 +++++-- .../service/impl/ChartServiceImpl.java | 29 ++++++++++++++----- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/src/com/engine/organization/entity/chart/ChartPO.java b/src/com/engine/organization/entity/chart/ChartPO.java index 47f3378c..ce8538d5 100644 --- a/src/com/engine/organization/entity/chart/ChartPO.java +++ b/src/com/engine/organization/entity/chart/ChartPO.java @@ -36,11 +36,13 @@ public class ChartPO { private Integer colorCheck; - // 人员主次账号 + //人员主次账号 private String belongto; - // 人员工龄 + + //人员工龄 private String companyWorkYear; - // 人员头像 + + //人员头像 private String fleaderimg; private String jobTitle; @@ -49,6 +51,9 @@ public class ChartPO { private String managerId; + private String level; + + private String id; private String key; diff --git a/src/com/engine/organization/service/impl/ChartServiceImpl.java b/src/com/engine/organization/service/impl/ChartServiceImpl.java index 34202cc7..bb819fc4 100644 --- a/src/com/engine/organization/service/impl/ChartServiceImpl.java +++ b/src/com/engine/organization/service/impl/ChartServiceImpl.java @@ -307,10 +307,12 @@ public class ChartServiceImpl extends Service implements ChartService { departmentChartPO.setFleader(getDepartmentLeader(fLeader)); } - dataList.add(departmentChartPO); } + String propValue = new BaseBean().getPropValue("hrmOrganization", "levelFieldId"); + String levelFieldId = "field"+propValue; + if (showJob) { // 查询部门下的岗位 if (isRealTime) { @@ -335,7 +337,7 @@ public class ChartServiceImpl extends Service implements ChartService { // 遍历岗位、查询对应岗位下的人员 if (isRealTime) { if (isRealDimension) { - sql = "select a.id,a.lastname as name ,a.belongto ,a.companyworkyear from hrmresource a where a.status < 4 and a.departmentid = ? and a.jobtitle = ?"; + sql = "select a.id,a.lastname as name ,a.belongto ,a.companyworkyear,b."+levelFieldId+" as levelvalue from hrmresource a left join cus_fielddata b on a.id = b.id and scopeid = 3 where a.status < 4 and a.departmentid = ? and a.jobtitle = ?"; } else { sql = "select a.id,a.lastname as name ,a.belongto ,a.companyworkyear from hrmresource a inner join hrmresourcevirtual b on a.id = b.resourceid where a.status < 4 and b.departmentid = ? and a.jobtitle = ?"; } @@ -347,7 +349,7 @@ public class ChartServiceImpl extends Service implements ChartService { rs.executeQuery(sql, departmentId, jobTitlePO.getFobjid()); String parentId = departmentId + "_" + jobTitlePO.getFobjid(); while (rs.next()) { - ChartPO chartPO = getResourceChartPO(rs.getString("id"), rs.getString("name"), parentId, rs.getString("belongto"), rs.getString("companyworkyear"),isRealDimension); + ChartPO chartPO = getResourceChartPO(rs.getString("id"), rs.getString("name"), parentId, rs.getString("belongto"), rs.getString("companyworkyear"),isRealDimension,rs.getString("levelvalue")); resourceNum++; dataList.add(chartPO); } @@ -357,12 +359,13 @@ public class ChartServiceImpl extends Service implements ChartService { } departmentChartPO.setHasChildren(CollectionUtils.isNotEmpty(jobTitleList) ? "1" : "0"); } else { - // 直接查询岗位下的人员 + // 直接查询部门下的人员 if (isRealTime) { if (isRealDimension) { - sql = "select a.id,a.lastname as name ,a.belongto ,a.companyworkyear,a.managerid from hrmresource a where a.status < 4 and a.departmentid = ? "; + sql = "select a.id,a.lastname as name ,a.belongto ,a.companyworkyear,a.managerid,b."+levelFieldId+" as levelvalue from hrmresource a left join cus_fielddata b on a.id = b.id and scopeid = 3 where a.status < 4 and a.departmentid = ? "; } else { - sql = "select a.id,a.lastname as name ,a.belongto ,a.companyworkyear,a.managerid from hrmresource a inner join hrmresourcevirtual b on a.id = b.resourceid where a.status < 4 and b.departmentid = ? "; + sql = "select a.id,a.lastname as name ,a.belongto ,a.companyworkyear,a.managerid,c."+levelFieldId+" as levelvalue from hrmresource a inner join hrmresourcevirtual b on a.id = b.resourceid " + + " left join cus_fielddata c on b.resourceid = c.id and scopeid = 3 where a.status < 4 and b.departmentid = ? "; } } else { sql = "select a.resourceid as id,a.lastname as name ,a.belongto ,a.companyworkyear,a.manager from jcl_chart_resource a where a.status < 4 and a.departmentid = ? and versionid = " + versionId; @@ -377,7 +380,7 @@ public class ChartServiceImpl extends Service implements ChartService { }else { managerId = Util.null2String(rs.getString("manager")); } - ChartPO chartPO = getResourceChartPO(rs.getString("id"), rs.getString("name"), rootId, rs.getString("belongto"), rs.getString("companyworkyear"),isRealDimension); + ChartPO chartPO = getResourceChartPO(rs.getString("id"), rs.getString("name"), rootId, rs.getString("belongto"), rs.getString("companyworkyear"),isRealDimension,rs.getString("levelvalue")); chartPO.setManagerId(managerId); personList.add(chartPO); departmentOnJob++; @@ -426,8 +429,9 @@ public class ChartServiceImpl extends Service implements ChartService { * @return */ @SneakyThrows - private ChartPO getResourceChartPO(String id, String name, String parentId, String belongTo, String companyWorkYear, boolean isRealDimension) { + private ChartPO getResourceChartPO(String id, String name, String parentId, String belongTo, String companyWorkYear, boolean isRealDimension,String levelValue) { ChartPO chartPO = new ChartPO(); + RecordSet rs = new RecordSet(); ResourceComInfo comInfo = new ResourceComInfo(); JobTitlesComInfo jobInfo = new JobTitlesComInfo(); chartPO.setFtype("4"); @@ -442,6 +446,13 @@ public class ChartServiceImpl extends Service implements ChartService { chartPO.setCompanyWorkYear(companyWorkYear); chartPO.setJobTitle(jobInfo.getJobTitlesname(comInfo.getJobTitle(id))); chartPO.setJobResponsibility(jobInfo.getJobresponsibility(comInfo.getJobTitle(id))); + String propValue = new BaseBean().getPropValue("hrmOrganization", "levelFieldId"); + if (StringUtils.isNotEmpty(levelValue)) { + rs.executeQuery("select selectname from cus_selectitem where fieldid = ? and selectvalue = ?",propValue,levelValue); + if (rs.next()) { + chartPO.setLevel(Util.null2String(rs.getString("selectname"))); + } + } try { chartPO.setFleaderimg(new ResourceComInfo().getMessagerUrls(chartPO.getId())); } catch (Exception e) { @@ -450,6 +461,8 @@ public class ChartServiceImpl extends Service implements ChartService { return chartPO; } + + /** * 获取历史顶部元素sql *