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

回溯人员架构图接口开发

This commit is contained in:
dxfeng 2023-02-01 11:27:33 +08:00
parent e20d1d57ce
commit abb3d04953
4 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/engine/organization/service/DanikorResourceBackService.java
View File

@ -1,5 +1,6 @@
package com.engine.organization.service;
import com.engine.organization.entity.danikor.param.ChartParam;
import com.engine.organization.util.MenuBtn;
import javax.servlet.http.HttpServletRequest;
@ -57,5 +58,5 @@ public interface DanikorResourceBackService {
* @param params
* @return
*/
String getResourceChartData(Map<String, Object> params);
List<ChartParam> getResourceChartData(Map<String, Object> params);
}

7
src/com/engine/organization/service/impl/DanikorResourceBackServiceImpl.java
View File

@ -1,6 +1,5 @@
package com.engine.organization.service.impl;
import com.alibaba.fastjson.JSON;
import com.api.browser.bean.SearchConditionGroup;
import com.api.browser.bean.SearchConditionItem;
import com.cloudstore.eccom.constant.WeaBoolAttr;
@ -243,7 +242,7 @@ public class DanikorResourceBackServiceImpl extends Service implements DanikorRe
}
@Override
public String getResourceChartData(Map<String, Object> params) {
public List<ChartParam> getResourceChartData(Map<String, Object> params) {
String syncDate = Util.null2String(params.get("date"));
List<ChartParam> chartParamList = new ArrayList<>();
// 查询安全级别大于等于40的人员
@ -264,7 +263,7 @@ public class DanikorResourceBackServiceImpl extends Service implements DanikorRe
ChartParam chartParam = new ChartParam();
chartParam.setId(rs.getString("id"));
chartParam.setPid(managerId);
chartParam.setType(StringUtils.isBlank(managerId) ? "company" : "subcompany");
chartParam.setType((StringUtils.isBlank(managerId) || "0".equals(managerId)) ? "company" : "subcompany");
chartParam.setName(StringUtils.isBlank(jobTitleName) ? lastName : lastName + "(" + jobTitleName + ")");
chartParam.setTitle(chartParam.getName());
chartParam.setNum("0");
@ -279,7 +278,7 @@ public class DanikorResourceBackServiceImpl extends Service implements DanikorRe
chartParamList.add(chartParam);
}
return JSON.toJSONString(chartParamList);
return chartParamList;
}
}

27
src/com/engine/organization/web/DanikorResourceBackController.java
View File

@ -1,9 +1,12 @@
package com.engine.organization.web;
import com.alibaba.fastjson.JSON;
import com.engine.common.util.ParamUtil;
import com.engine.common.util.ServiceUtil;
import com.engine.organization.entity.danikor.param.ChartParam;
import com.engine.organization.util.response.ReturnResult;
import com.engine.organization.wrapper.DanikorResourceBackWrapper;
import org.apache.commons.collections.CollectionUtils;
import weaver.hrm.HrmUserVarify;
import weaver.hrm.User;
@ -15,6 +18,8 @@ import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
@ -88,26 +93,36 @@ public class DanikorResourceBackController {
@POST
@Path("/getOrgChartData")
@Produces(MediaType.APPLICATION_JSON)
public ReturnResult getOrgChartData(@Context HttpServletRequest request, @Context HttpServletResponse response) {
public Map<String, Object> getOrgChartData(@Context HttpServletRequest request, @Context HttpServletResponse response) {
Map<String, Object> returnMap = new HashMap<>();
try {
User user = HrmUserVarify.getUser(request, response);
Map<String, Object> map = ParamUtil.request2Map(request);
return ReturnResult.successed(getDanikorResourceBackWrapper(user).getOrgChartData(request, map));
String orgChartData = getDanikorResourceBackWrapper(user).getOrgChartData(request, map);
returnMap.put("data", orgChartData);
returnMap.put("status", "1");
} catch (Exception e) {
return ReturnResult.exceptionHandle(e);
returnMap.put("status", "-1");
returnMap.put("message", "发生未知错误，请与管理员联系");
}
return returnMap;
}
@POST
@Path("/getResourceChartData")
@Produces(MediaType.APPLICATION_JSON)
public ReturnResult getResourceChartData(@Context HttpServletRequest request, @Context HttpServletResponse response) {
public Map<String, Object> getResourceChartData(@Context HttpServletRequest request, @Context HttpServletResponse response) {
Map<String, Object> returnMap = new HashMap<>();
try {
User user = HrmUserVarify.getUser(request, response);
Map<String, Object> map = ParamUtil.request2Map(request);
return ReturnResult.successed(getDanikorResourceBackWrapper(user).getResourceChartData(map));
List<ChartParam> resourceChartData = getDanikorResourceBackWrapper(user).getResourceChartData(map);
returnMap.put("data", CollectionUtils.isEmpty(resourceChartData) ? null : JSON.toJSONString(resourceChartData));
returnMap.put("status", "1");
} catch (Exception e) {
return ReturnResult.exceptionHandle(e);
returnMap.put("status", "-1");
returnMap.put("message", "发生未知错误，请与管理员联系");
}
return returnMap;
}
}

3
src/com/engine/organization/wrapper/DanikorResourceBackWrapper.java
View File

@ -1,6 +1,7 @@
package com.engine.organization.wrapper;
import com.engine.common.util.ServiceUtil;
import com.engine.organization.entity.danikor.param.ChartParam;
import com.engine.organization.service.DanikorResourceBackService;
import com.engine.organization.service.impl.DanikorResourceBackServiceImpl;
import com.engine.organization.util.MenuBtn;
@ -42,7 +43,7 @@ public class DanikorResourceBackWrapper extends OrganizationWrapper {
return getDanikorResourceBackService(user).getOrgChartData(request, params);
}
public String getResourceChartData(Map<String, Object> params) {
public List<ChartParam> getResourceChartData(Map<String, Object> params) {
return getDanikorResourceBackService(user).getResourceChartData(params);
}
}