diff --git a/src/com/engine/organization/entity/chart/ChartPO.java b/src/com/engine/organization/entity/chart/ChartPO.java index da8b4d17..7d385060 100644 --- a/src/com/engine/organization/entity/chart/ChartPO.java +++ b/src/com/engine/organization/entity/chart/ChartPO.java @@ -41,6 +41,10 @@ public class ChartPO { // 人员头像 private String fleaderimg; + private String jobTitle; + + private String jobResponsibility; + 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 bb9755b2..33387242 100644 --- a/src/com/engine/organization/service/impl/ChartServiceImpl.java +++ b/src/com/engine/organization/service/impl/ChartServiceImpl.java @@ -26,6 +26,7 @@ import weaver.general.Util; import weaver.hrm.User; import weaver.hrm.company.DepartmentComInfo; import weaver.hrm.company.SubCompanyComInfo; +import weaver.hrm.job.JobTitlesComInfo; import weaver.hrm.resource.ResourceComInfo; import java.time.LocalDate; @@ -311,7 +312,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")); + ChartPO chartPO = getResourceChartPO(rs.getString("id"), rs.getString("name"), parentId, rs.getString("belongto"), rs.getString("companyworkyear"),isRealDimension); resourceNum++; dataList.add(chartPO); } @@ -333,7 +334,7 @@ public class ChartServiceImpl extends Service implements ChartService { } rs.executeQuery(sql, departmentId); while (rs.next()) { - ChartPO chartPO = getResourceChartPO(rs.getString("id"), rs.getString("name"), rootId, rs.getString("belongto"), rs.getString("companyworkyear")); + ChartPO chartPO = getResourceChartPO(rs.getString("id"), rs.getString("name"), rootId, rs.getString("belongto"), rs.getString("companyworkyear"),isRealDimension); dataList.add(chartPO); departmentOnJob++; } @@ -365,18 +366,23 @@ public class ChartServiceImpl extends Service implements ChartService { * @param companyWorkYear 司龄 * @return */ - private ChartPO getResourceChartPO(String id, String name, String parentId, String belongTo, String companyWorkYear) { + @SneakyThrows + private ChartPO getResourceChartPO(String id, String name, String parentId, String belongTo, String companyWorkYear, boolean isRealDimension) { ChartPO chartPO = new ChartPO(); + ResourceComInfo comInfo = new ResourceComInfo(); + JobTitlesComInfo jobInfo = new JobTitlesComInfo(); chartPO.setFtype("4"); chartPO.setFobjid(id); chartPO.setId(chartPO.getFobjid()); chartPO.setFname(name); // 岗位处理后的ID chartPO.setParentId(parentId); - chartPO.setExpand("0"); + chartPO.setExpand(isRealDimension ? "0" : "1"); chartPO.setHasChildren("0"); chartPO.setBelongto(Util.null2String(belongTo)); chartPO.setCompanyWorkYear(companyWorkYear); + chartPO.setJobTitle(jobInfo.getJobTitlesname(comInfo.getJobTitle(id))); + chartPO.setJobResponsibility(jobInfo.getJobresponsibility(comInfo.getJobTitle(id))); try { chartPO.setFleaderimg(new ResourceComInfo().getMessagerUrls(chartPO.getId())); } catch (Exception e) {