From 7f40a215bd009ccdadb7b318c0e0b85c8b7bf4a0 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Thu, 1 Aug 2024 14:42:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=81=E6=B3=A2=E7=B2=BE=E5=8D=8E=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E6=9E=B6=E6=9E=84=E5=9B=BE=E4=BA=8C=E5=BC=80=E7=AC=AC?= =?UTF-8?q?=E4=BA=8C=E7=89=88=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/jhsecond/entity/vo/OrganizationChartVo.java | 5 +++++ .../jhsecond/service/impl/OrganizationChartServiceImpl.java | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/com/engine/jhsecond/entity/vo/OrganizationChartVo.java b/src/com/engine/jhsecond/entity/vo/OrganizationChartVo.java index b0cecb4..a285198 100644 --- a/src/com/engine/jhsecond/entity/vo/OrganizationChartVo.java +++ b/src/com/engine/jhsecond/entity/vo/OrganizationChartVo.java @@ -38,6 +38,11 @@ public class OrganizationChartVo { */ private String addLine; + /** + * 延长层级 + */ + private String addCount; + /** * 0关联 1未关联 */ diff --git a/src/com/engine/jhsecond/service/impl/OrganizationChartServiceImpl.java b/src/com/engine/jhsecond/service/impl/OrganizationChartServiceImpl.java index 418cb68..4cc7858 100644 --- a/src/com/engine/jhsecond/service/impl/OrganizationChartServiceImpl.java +++ b/src/com/engine/jhsecond/service/impl/OrganizationChartServiceImpl.java @@ -85,8 +85,9 @@ public class OrganizationChartServiceImpl extends Service implements Organizatio String halfId = bb.getPropValue("jhsecond", "halfId"); String jobId = bb.getPropValue("jhsecond", "jobId"); + //1.获取建模组织架构图数据 - rs.executeQuery("select a.gwszbm,a.zzjggw,b.zzjgtgw,a.zzjggwsj,a.sfbj,a.gjsx,a.sfycx from uf_zzjgdygx a left join uf_zzjggw b on a.zzjggw = b.id"); + rs.executeQuery("select a.gwszbm,a.zzjggw,b.zzjgtgw,a.zzjggwsj,a.sfbj,a.gjsx,a.sfycx,a.yccj from uf_zzjgdygx a left join uf_zzjggw b on a.zzjggw = b.id"); List voList = new ArrayList<>(); while (rs.next()) { PersonInfoVo personInfoVo = selectPersonInfo(Util.null2String(rs.getString("zzjggw")), jobId); @@ -99,6 +100,7 @@ public class OrganizationChartServiceImpl extends Service implements Organizatio .pId(Util.getIntValue(rs.getString("zzjggwsj"))) .orderId(Util.getIntValue(rs.getString("gjsx"),999)) .addLine("0".equals(Util.null2String(rs.getString("sfycx"))) ? "true" : "false") + .addCount(Util.null2String(rs.getString("yccj"))) .type("0".equals(Util.null2String(rs.getString("sfbj"))) ? "tag" : "") .show(personInfoVo.getLastName() == null ? 1 : 0) .build(); @@ -111,6 +113,8 @@ public class OrganizationChartServiceImpl extends Service implements Organizatio .findFirst() .orElse(null); + + //3.设置半节点存在下级属性值并获取下级 voList.stream() .filter(vo -> vo.getId() == Integer.parseInt(halfId))