From 3cbb2100f3d2793687545511245b767f53fa47c4 Mon Sep 17 00:00:00 2001 From: Administrator <704728292@qq.com> Date: Wed, 21 Feb 2024 16:54:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84=E5=9B=BE?= =?UTF-8?q?=E6=A0=B9=E8=8A=82=E7=82=B9=E6=9F=A5=E8=AF=A2=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E4=BD=93=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/sship/entity/DropTreeDataVO.java | 27 +++++++++++++++++++ .../engine/sship/service/OrgChartService.java | 2 +- .../service/impl/OrgChartServiceImpl.java | 20 +++++++------- .../engine/sship/web/OrgChartController.java | 2 +- 4 files changed, 40 insertions(+), 11 deletions(-) create mode 100644 src/com/engine/sship/entity/DropTreeDataVO.java diff --git a/src/com/engine/sship/entity/DropTreeDataVO.java b/src/com/engine/sship/entity/DropTreeDataVO.java new file mode 100644 index 0000000..cdc028e --- /dev/null +++ b/src/com/engine/sship/entity/DropTreeDataVO.java @@ -0,0 +1,27 @@ +package com.engine.sship.entity; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + + +/** + * @author xxy + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class DropTreeDataVO { + + private String id; + + private String label; + + private List childrens; + + +} diff --git a/src/com/engine/sship/service/OrgChartService.java b/src/com/engine/sship/service/OrgChartService.java index eb76d15..e5d311a 100644 --- a/src/com/engine/sship/service/OrgChartService.java +++ b/src/com/engine/sship/service/OrgChartService.java @@ -94,7 +94,7 @@ public interface OrgChartService { * @param: [virtualType] * @return: java.util.List */ - TreeDataVO selectVirtualTopTwo(String virtualType); + List selectVirtualTopTwo(String virtualType); /** diff --git a/src/com/engine/sship/service/impl/OrgChartServiceImpl.java b/src/com/engine/sship/service/impl/OrgChartServiceImpl.java index 8186317..32bb274 100644 --- a/src/com/engine/sship/service/impl/OrgChartServiceImpl.java +++ b/src/com/engine/sship/service/impl/OrgChartServiceImpl.java @@ -177,14 +177,13 @@ public class OrgChartServiceImpl extends Service implements OrgChartService { return voList; } - private List getVirtualSubDeptData(String supdepid,String virtualType) { + private List getVirtualSubDeptData(String supdepid,String virtualType) { RecordSet rs = new RecordSet(); - List voList = new ArrayList<>(); + List voList = new ArrayList<>(); rs.executeQuery("select id,departmentmark from hrmdepartmentvirtual where supdepid <> '' and supdepid = ? and virtualtype = ? order by showorder",supdepid,virtualType); while (rs.next()) { String id = Util.null2String(rs.getString("id")); - ChartChildrensVO build = ChartChildrensVO.builder() - .pid(supdepid) + DropTreeDataVO build = DropTreeDataVO.builder() .id(getRandomData()+id) .label(Util.null2String(rs.getString("departmentmark"))) .build(); @@ -268,10 +267,11 @@ public class OrgChartServiceImpl extends Service implements OrgChartService { } @Override -public TreeDataVO selectVirtualTopTwo(String virtualType) { +public List selectVirtualTopTwo(String virtualType) { RecordSet rs = new RecordSet(); BaseBean bb = new BaseBean(); - TreeDataVO build; + List dataVOS = new ArrayList<>(); + DropTreeDataVO build; String roleId = bb.getPropValue("sship", "roleId"); String rolelevel = bb.getPropValue("sship", "rolelevel"); boolean isExsit = selectIdsByRole(roleId, rolelevel); @@ -280,13 +280,14 @@ public TreeDataVO selectVirtualTopTwo(String virtualType) { rs.executeQuery("select id,departmentmark from hrmdepartmentvirtual where supdepid = 0 and virtualtype = ? order by showorder",virtualType); rs.next(); String id = Util.null2String(rs.getString("id")); - build = TreeDataVO.builder() + build = DropTreeDataVO.builder() .id(getRandomData()+id) .label(Util.null2String(rs.getString("departmentmark"))) .build(); if (isVirtualSubDepartment(id,virtualType)) { build.setChildrens(getVirtualSubDeptData(id,virtualType)); } + dataVOS.add(build); } else { //获取当前部门 @@ -295,16 +296,17 @@ public TreeDataVO selectVirtualTopTwo(String virtualType) { String departmentId = Util.null2String(rs.getString("departmentid")); rs.executeQuery("select departmentmark from hrmdepartmentvirtual where id = ? and virtualtype = ? order by showorder",departmentId,virtualType); rs.next(); - build = TreeDataVO.builder() + build = DropTreeDataVO.builder() .id(getRandomData()+departmentId) .label(Util.null2String(rs.getString("departmentmark"))) .build(); if (isVirtualSubDepartment(departmentId,virtualType)) { build.setChildrens(getVirtualSubDeptData(departmentId,virtualType)); } + dataVOS.add(build); } - return build; + return dataVOS; } @Override diff --git a/src/com/engine/sship/web/OrgChartController.java b/src/com/engine/sship/web/OrgChartController.java index 9716341..48df2ca 100644 --- a/src/com/engine/sship/web/OrgChartController.java +++ b/src/com/engine/sship/web/OrgChartController.java @@ -82,7 +82,7 @@ public class OrgChartController { @Produces(MediaType.APPLICATION_JSON) public String selectVirtualTopTwo(@Context HttpServletRequest request, @Context HttpServletResponse response,@QueryParam("virtualType") String virtualType) { User user = HrmUserVarify.getUser(request, response); - return new ResponseResult(user).run(getOrgChartService(user) :: selectVirtualTopTwo,virtualType); + return new ResponseResult>(user).run(getOrgChartService(user) :: selectVirtualTopTwo,virtualType); } @GET @Path("/virtual-top-three")