From 35d7a045e200d9f4465113ca980bfa1367c1041e Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Mon, 26 Jun 2023 17:00:12 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84=E5=9B=BEV3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/web/OrgChartController.java | 7 +-- .../organization/service/OrgChartService.java | 44 +++++++++++++++++++ .../service/impl/OrgChartServiceImpl.java | 42 +++++++++++------- .../organization/web/OrgChartController.java | 7 +-- 4 files changed, 72 insertions(+), 28 deletions(-) diff --git a/src/com/api/organization/web/OrgChartController.java b/src/com/api/organization/web/OrgChartController.java index eb1742da..6ff5877e 100644 --- a/src/com/api/organization/web/OrgChartController.java +++ b/src/com/api/organization/web/OrgChartController.java @@ -2,12 +2,7 @@ package com.api.organization.web; import javax.ws.rs.Path; -/** - * @className: OrgChartController - * @author: dengjp - * @date: 2022/7/7 - * @description: 组织架构图 - **/ + @Path("/bs/hrmorganization/orgchart") public class OrgChartController extends com.engine.organization.web.OrgChartController { } diff --git a/src/com/engine/organization/service/OrgChartService.java b/src/com/engine/organization/service/OrgChartService.java index 0a4042b0..8c013c9c 100644 --- a/src/com/engine/organization/service/OrgChartService.java +++ b/src/com/engine/organization/service/OrgChartService.java @@ -11,16 +11,60 @@ import java.util.Map; * @description: 组织架构图Service **/ public interface OrgChartService { + + /** + * @Description: 高级搜索 + * @Author: liang.cheng + * @Date: 2023/6/26 3:18 PM + * @param: [request2Map, user] + * @return: java.util.Map + */ Map getOptionCondition(Map request2Map, User user); + /** + * @Description: 组织架构图 + * @Author: liang.cheng + * @Date: 2023/6/26 3:19 PM + * @param: [request2Map, user] + * @return: java.util.Map + */ Map getCompanyData(Map request2Map, User user); + /** + * @Description: 组织透视图 + * @Author: liang.cheng + * @Date: 2023/6/26 3:20 PM + * @param: [request2Map, user] + * @return: java.util.Map + */ Map getUserData(Map request2Map, User user); + /** + * @Description: 异步获取 + * @Author: liang.cheng + * @Date: 2023/6/26 3:21 PM + * @param: [request2Map, user] + * @return: java.util.Map + */ Map asyncUserData(Map request2Map, User user); + /** + * @Description: 异步获取 + * @Author: liang.cheng + * @Date: 2023/6/26 3:21 PM + * @param: [request2Map, user] + * @return: java.util.Map + */ Map asyncCompanyData(Map request2Map, User user); + + /** + * @Description: 同步数据 + * @Author: liang.cheng + * @Date: 2023/6/26 3:22 PM + * @param: [request2Map, user] + * @return: java.lang.String + */ String synchronousData(Map request2Map, User user); } diff --git a/src/com/engine/organization/service/impl/OrgChartServiceImpl.java b/src/com/engine/organization/service/impl/OrgChartServiceImpl.java index 762dd1af..25350f40 100644 --- a/src/com/engine/organization/service/impl/OrgChartServiceImpl.java +++ b/src/com/engine/organization/service/impl/OrgChartServiceImpl.java @@ -42,15 +42,17 @@ public class OrgChartServiceImpl extends Service implements OrgChartService { public Map getOptionCondition(Map request2Map, User user) { Map result = new HashMap<>(); RecordSet rs = new RecordSet(); - rs.executeQuery("select id, companyname from HrmCompanyVirtual order by id"); List> fclasslist = new ArrayList<>(); Map defaultItem = new HashMap<>(); + int fkey = 0; + defaultItem.put("key",fkey++); defaultItem.put("id", "0"); defaultItem.put("companyname", "行政维度"); fclasslist.add(defaultItem); while (rs.next()) { Map item = new HashMap<>(); + item.put("key",fkey++); item.put("id", rs.getString("id")); item.put("companyname", rs.getString("companyname")); fclasslist.add(item); @@ -69,8 +71,10 @@ public class OrgChartServiceImpl extends Service implements OrgChartService { } rs.executeQuery(sql + " and fdateend > " + DBType.get(new RecordSet().getDBType()).currentDate() + " order by ftype , id,fdateend desc "); Set companySet = new HashSet<>(); + int ckey = 0; while (rs.next()) { OrgSelectItem item = new OrgSelectItem(); + item.setKey(ckey++); item.setId(rs.getString("id")); item.setFnumber(rs.getString("fnumber")); item.setFname(rs.getString("fname")); @@ -83,15 +87,12 @@ public class OrgChartServiceImpl extends Service implements OrgChartService { } private String companyDateWhereSql(Map request2Map) { - String date = (String) request2Map.get("date"); // 数据日期 + String date = (String) request2Map.get("date"); if (StringUtils.isBlank(date)) { date = DateUtil.format(DateUtil.offset(new Date(), DateField.DAY_OF_MONTH, 1), "yyyy-MM-dd"); } - - String fclass = (String) request2Map.get("fclass"); // 维度 - - - String fisvitual = (String) request2Map.get("fisvitual"); // 是否显示虚拟组织 + String fclass = (String) request2Map.get("fclass"); + String fisvitual = (String) request2Map.get("fisvitual"); if (StringUtils.isBlank(fisvitual)) { fisvitual = "0"; } @@ -123,15 +124,15 @@ public class OrgChartServiceImpl extends Service implements OrgChartService { return result; } - String root = (String) request2Map.get("root"); // 根节点 - String level = (String) request2Map.get("level"); // 显示层级 + String root = (String) request2Map.get("root"); + String level = (String) request2Map.get("level"); if (StringUtils.isBlank(level)) { level = "3"; } String whereSql = companyDateWhereSql(request2Map); String whereItemSql = " "; - if ("0".equals(root)) { // 集团的情况 + if ("0".equals(root)) { whereItemSql += " and ftype = 0 "; } else { whereItemSql += " and id = '" + root + "' "; @@ -211,14 +212,14 @@ public class OrgChartServiceImpl extends Service implements OrgChartService { } private String userWhereSql(Map request2Map) { - String date = (String) request2Map.get("date"); // 数据日期 + String date = (String) request2Map.get("date"); if (StringUtils.isBlank(date)) { date = DateUtil.format(DateUtil.offset(new Date(), DateField.DAY_OF_MONTH, 1), "yyyy-MM-dd"); } - String fclass = (String) request2Map.get("fclass"); // 维度 + String fclass = (String) request2Map.get("fclass"); - String fisvitual = (String) request2Map.get("fisvitual"); // 是否显示虚拟组织 + String fisvitual = (String) request2Map.get("fisvitual"); if (StringUtils.isBlank(fisvitual)) { fisvitual = "0"; } @@ -247,8 +248,8 @@ public class OrgChartServiceImpl extends Service implements OrgChartService { if (!hasRight) { return result; } - String root = (String) request2Map.get("root"); // 根节点 - String level = (String) request2Map.get("level"); // 显示层级 + String root = (String) request2Map.get("root"); + String level = (String) request2Map.get("level"); if (StringUtils.isBlank(level)) { level = "3"; } @@ -256,7 +257,7 @@ public class OrgChartServiceImpl extends Service implements OrgChartService { String whereSql = userWhereSql(request2Map); String whereItemSql = " "; - if ("0".equals(root)) { // 集团的情况 + if ("0".equals(root)) { whereItemSql += " and t.ftype = 0 "; } else { whereItemSql += " and t.id = '" + root + "' "; @@ -618,10 +619,19 @@ public class OrgChartServiceImpl extends Service implements OrgChartService { } static class OrgSelectItem { + private Integer key; private String id; private String fnumber; private String fname; + public Integer getKey() { + return key; + } + + public void setKey(Integer key) { + this.key = key; + } + public String getId() { return id; } diff --git a/src/com/engine/organization/web/OrgChartController.java b/src/com/engine/organization/web/OrgChartController.java index abb3166e..e17d79af 100644 --- a/src/com/engine/organization/web/OrgChartController.java +++ b/src/com/engine/organization/web/OrgChartController.java @@ -18,12 +18,7 @@ import javax.ws.rs.core.MediaType; import java.util.HashMap; import java.util.Map; -/** - * @className: OrgChartController - * @author: dengjp - * @date: 2022/7/7 - * @description: 组织架构图 - **/ + public class OrgChartController { public OrgChartWrapper getOrgChartWrapper(User user) { return ServiceUtil.getService(OrgChartWrapper.class, user); -- 2.40.0.windows.1