liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feature: 组织架构异步数据v1.0

This commit is contained in:
MustangDeng 2022-07-21 11:01:36 +08:00
parent 7df8602e97
commit 0a1e6c6e7d
4 changed files with 219 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/engine/organization/service/OrgChartService.java
View File

@ -16,4 +16,8 @@ public interface OrgChartService {
Map<String, Object> getCompanyData(Map<String, Object> request2Map, User user);
Map<String, Object> getUserData(Map<String, Object> request2Map, User user);
Map<String, Object> asyncUserData(Map<String, Object> request2Map, User user);
Map<String, Object> asyncCompanyData(Map<String, Object> request2Map, User user);
}

167
src/com/engine/organization/service/impl/OrgChartServiceImpl.java
View File

@ -17,6 +17,9 @@ import java.util.*;
* @description: 组织架构图ServiceImpl
**/
public class OrgChartServiceImpl extends Service implements OrgChartService {
private RecordSet grs = new RecordSet();
@Override
public Map<String, Object> getOptionCondition(Map<String, Object> request2Map, User user) {
RecordSet rs = new RecordSet();
@ -83,6 +86,8 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
whereSql += " and fisvitual in (0, 1) ";
}
whereSql += " and ftype in (0 , 1 ,2) ";
String whereItemSql = " ";
if("0".equals(root)) { // 集团的情况
whereItemSql += " and ftype = 0 ";
@ -90,6 +95,8 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
whereItemSql += " and id = '" + root +"' ";
}
// 获取根节点
RecordSet rs = new RecordSet();
rs.executeQuery("select id, fname, ftype, fparentid from jcl_org_map " + whereSql + whereItemSql);
@ -102,12 +109,14 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
item.put("fname", rs.getString("fname"));
item.put("ftype", rs.getString("ftype"));
item.put("parentId", null);
item.put("expand", "1");
item.put("hasChildren", hasChildren(rs.getString("id"), true));
list.add(item);
}
int currentLevel = 1;
if(currentLevel + 1 <= Integer.parseInt(level)) {
findCompanyItemByParantId(id, currentLevel + 1, level, rs, list, whereSql);
findCompanyItemByParantId(id, currentLevel + 1, level, rs, list, whereSql, true);
}
Map<String, Object> result = new HashMap<>();
@ -116,7 +125,7 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
return result;
}
private void findCompanyItemByParantId(String id, int currentLevel, String level, RecordSet rs, List<Map<String, Object>> list, String whereSql) {
private void findCompanyItemByParantId(String id, int currentLevel, String level, RecordSet rs, List<Map<String, Object>> list, String whereSql, boolean expand) {
rs.executeQuery("select id, fname, ftype, fparentid from jcl_org_map " + whereSql + " and fparentid = " + id);
List<Map<String, Object>> currentList = new ArrayList<>();
while(rs.next()) {
@ -125,6 +134,8 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
item.put("fname", rs.getString("fname"));
item.put("ftype", rs.getString("ftype"));
item.put("parentId", rs.getString("fparentid"));
item.put("expand", expand ? "1" : "0");
item.put("hasChildren", hasChildren(rs.getString("id"), true));
currentList.add(item);
}
@ -132,7 +143,9 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
for (Map<String, Object> stringObjectMap : currentList) {
if(currentLevel + 1 <= Integer.parseInt(level)) {
findCompanyItemByParantId((String) stringObjectMap.get("id"), currentLevel + 1, level, rs, list, whereSql);
findCompanyItemByParantId((String) stringObjectMap.get("id"), currentLevel + 1, level, rs, list, whereSql, true);
} else if(currentLevel == Integer.parseInt(level)) {
findCompanyItemByParantId((String) stringObjectMap.get("id"), currentLevel + 1, level, rs, list, whereSql, false);
}
}
@ -191,12 +204,14 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
item.put("fleaderjob", rs.getString("fleaderjob"));
item.put("fplan", rs.getString("fplan"));
item.put("fonjob", rs.getString("fonjob"));
item.put("hasChildren", hasChildren(rs.getString("id"), false));
item.put("expand", "1");
list.add(item);
}
int currentLevel = 1;
if(currentLevel + 1 <= Integer.parseInt(level)) {
findUserItemByParantId(id, currentLevel + 1, level, rs, list, whereSql);
findUserItemByParantId(id, currentLevel + 1, level, rs, list, whereSql, true);
}
Map<String, Object> result = new HashMap<>();
@ -205,7 +220,131 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
return result;
}
private void findUserItemByParantId(String id, int currentLevel, String level, RecordSet rs, List<Map<String, Object>> list, String whereSql) {
@Override
public Map<String, Object> asyncUserData(Map<String, Object> request2Map, User user) {
String ids = (String) request2Map.get("ids");
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 level = (String) request2Map.get("level"); // 显示层级
if(StringUtils.isBlank(level)) {
level = "3";
}
String fisvitual = (String) request2Map.get("fisvitual"); // 是否显示虚拟组织
if(StringUtils.isBlank(fisvitual)) {
fisvitual = "0";
}
String whereSql = " where 1 = 1 ";
whereSql += " and ((t.fdatebegin <= '"+ date +"' and t.fdateend >= '"+ date +"') or (t.fdatebegin <= '"+ date +"' and t.fdateend is null )) ";
whereSql += " and t.fclass = " + fclass +" ";
if("0".equals(fisvitual)) {
whereSql += " and t.fisvitual = 0 ";
}else {
whereSql += " and t.fisvitual in (0, 1) ";
}
whereSql += " and fparentid in (" +ids+ ") ";
RecordSet rs = new RecordSet();
rs.executeQuery("select t.id, t.fname, t.ftype, t.fparentid, t.fleadername, t.fleaderimg, t.fleaderjob, t.fplan, t.fonjob, t.fnumber from jcl_org_map t " + whereSql );
List<Map<String, Object>> currentList = new ArrayList<>();
while(rs.next()) {
Map<String, Object> item = new HashMap<>();
item.put("id", rs.getString("id"));
item.put("fname", rs.getString("fname"));
item.put("ftype", rs.getString("ftype"));
item.put("parentId", rs.getString("fparentid"));
item.put("fleadername", rs.getString("fleadername"));
item.put("fleaderimg", rs.getString("fleaderimg"));
item.put("fleaderjob", rs.getString("fleaderjob"));
item.put("fplan", rs.getString("fplan"));
item.put("fonjob", rs.getString("fonjob"));
item.put("fnumber", rs.getString("fnumber"));
item.put("hasChildren", hasChildren(rs.getString("id"), false));
currentList.add(item);
}
for (Map<String, Object> stringObjectMap : currentList) {
if ("4".equals(stringObjectMap.get("ftype"))) { // 员工信息
rs.executeQuery("select id, mobile, homeaddress from hrmresource where id = ? ", stringObjectMap.get("fnumber"));
if (rs.next()) {
stringObjectMap.put("mobile", rs.getString("mobile"));
stringObjectMap.put("address", rs.getString("homeaddress"));
}
rs.executeQuery("select departmentname from hrmresource hrm \n" +
"left join hrmdepartment d\n" +
"on hrm.departmentid = d.id\n" +
"where hrm.id = ? ", stringObjectMap.get("fnumber"));
if (rs.next()) {
stringObjectMap.put("department", rs.getString("departmentname"));
}
}
}
Map<String, Object> result = new HashMap<>();
result.put("api_status", true);
result.put("data", currentList);
return result;
}
@Override
public Map<String, Object> asyncCompanyData(Map<String, Object> request2Map, User user) {
String ids = (String) request2Map.get("ids");
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 root = (String) request2Map.get("root"); // 根节点
String level = (String) request2Map.get("level"); // 显示层级
if(StringUtils.isBlank(level)) {
level = "3";
}
String fisvitual = (String) request2Map.get("fisvitual"); // 是否显示虚拟组织
if(StringUtils.isBlank(fisvitual)) {
fisvitual = "0";
}
String whereSql = " where 1 = 1 ";
whereSql += " and ((fdatebegin <= '"+ date +"' and fdateend >= '"+ date +"') or (fdatebegin <= '"+ date +"' and fdateend is null )) ";
whereSql += " and fclass = " + fclass +" ";
if("0".equals(fisvitual)) {
whereSql += " and fisvitual = 0 ";
}else {
whereSql += " and fisvitual in (0, 1) ";
}
whereSql += " and fparentid in (" +ids+ ") ";
RecordSet rs = new RecordSet();
rs.executeQuery("select id, fname, ftype, fparentid from jcl_org_map " + whereSql);
List<Map<String, Object>> currentList = new ArrayList<>();
while(rs.next()) {
Map<String, Object> item = new HashMap<>();
item.put("id", rs.getString("id"));
item.put("fname", rs.getString("fname"));
item.put("ftype", rs.getString("ftype"));
item.put("parentId", rs.getString("fparentid"));
item.put("hasChildren", hasChildren(rs.getString("id"), true));
currentList.add(item);
}
Map<String, Object> result = new HashMap<>();
result.put("api_status", true);
result.put("data", currentList);
return result;
}
private void findUserItemByParantId(String id, int currentLevel, String level, RecordSet rs, List<Map<String, Object>> list, String whereSql, boolean expand) {
rs.executeQuery("select t.id, t.fname, t.ftype, t.fparentid, t.fleadername, t.fleaderimg, t.fleaderjob, t.fplan, t.fonjob, t.fnumber from jcl_org_map t " + whereSql + " and t.fparentid = " + id);
List<Map<String, Object>> currentList = new ArrayList<>();
while(rs.next()) {
@ -220,6 +359,8 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
item.put("fplan", rs.getString("fplan"));
item.put("fonjob", rs.getString("fonjob"));
item.put("fnumber", rs.getString("fnumber"));
item.put("expand", expand ? "1" : "0");
item.put("hasChildren", hasChildren(rs.getString("id"), false));
currentList.add(item);
}
@ -240,10 +381,24 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
}
if(currentLevel + 1 <= Integer.parseInt(level)) {
findUserItemByParantId((String) stringObjectMap.get("id"), currentLevel + 1, level, rs, list, whereSql);
findUserItemByParantId((String) stringObjectMap.get("id"), currentLevel + 1, level, rs, list, whereSql, true);
} else if(currentLevel == Integer.parseInt(level) ) { // 多查一层
findUserItemByParantId((String) stringObjectMap.get("id"), currentLevel + 1, level, rs, list, whereSql, false);
}
}
list.addAll(currentList);
}
private boolean hasChildren(String id, boolean isCompany) {
String whereSql = " where fparentid = " + id + " ";
if(isCompany) {
whereSql += " and ftype in (0, 1, 2) ";
}
grs.executeQuery("select count(1) as count from jcl_org_map " + whereSql);
String count = "0";
if(grs.next()) {
count = grs.getString("count");
}
return !"0".equals(count);
}
}

46
src/com/engine/organization/web/OrgChartController.java
View File

@ -97,4 +97,50 @@ public class OrgChartController {
return JSONObject.toJSONString(apidatas);
}
/**
* 异步人员数据
*/
@GET
@Path("/asyncUserData")
@Produces(MediaType.APPLICATION_JSON)
public String asyncUserData(@Context HttpServletRequest request, @Context HttpServletResponse
response){
Map<String,Object> apidatas = new HashMap<String,Object>();
try{
User user = HrmUserVarify.getUser(request, response);
//实例化Service 并调用业务类处理
apidatas = getOrgChartWrapper(user).asyncUserData(ParamUtil.request2Map(request), user);
}catch(Exception e){
//异常处理
e.printStackTrace();
apidatas.put("api_status", false);
apidatas.put("api_errormsg", "catch exception : " + e.getMessage());
}
//数据转换
return JSONObject.toJSONString(apidatas);
}
/**
* 异步组织数据
*/
@GET
@Path("/asyncCompanyData")
@Produces(MediaType.APPLICATION_JSON)
public String asyncCompanyData(@Context HttpServletRequest request, @Context HttpServletResponse
response){
Map<String,Object> apidatas = new HashMap<String,Object>();
try{
User user = HrmUserVarify.getUser(request, response);
//实例化Service 并调用业务类处理
apidatas = getOrgChartWrapper(user).asyncCompanyData(ParamUtil.request2Map(request), user);
}catch(Exception e){
//异常处理
e.printStackTrace();
apidatas.put("api_status", false);
apidatas.put("api_errormsg", "catch exception : " + e.getMessage());
}
//数据转换
return JSONObject.toJSONString(apidatas);
}
}

8
src/com/engine/organization/wrapper/OrgChartWrapper.java
View File

@ -31,4 +31,12 @@ public class OrgChartWrapper extends Service {
public Map<String, Object> getUserData(Map<String, Object> request2Map, User user) {
return getOrgChartService(user).getUserData(request2Map, user);
}
public Map<String, Object> asyncUserData(Map<String, Object> request2Map, User user) {
return getOrgChartService(user).asyncUserData(request2Map, user);
}
public Map<String, Object> asyncCompanyData(Map<String, Object> request2Map, User user) {
return getOrgChartService(user).asyncCompanyData(request2Map, user);
}
}