generated from dxfeng/secondev-wugang-dxfeng
refactor(门户): 修改在职人数接口返回类型
- 将 getOnJobNumber 接口的返回类型从 List<PortalPO>改为 Map<String, Object> - 新增 total 字段,用于统计在职人数总数
This commit is contained in:
parent
902e025c51
commit
172a53cca9
|
|
@ -29,7 +29,7 @@ public class LeaderCockpitController {
|
|||
LeaderCockpitService leaderCockpitService;
|
||||
|
||||
@PostMapping("/getOnJobNumber")
|
||||
private WeaResult<List<PortalPO>> getOnJobNumber(@RequestBody Map<String, String> params) {
|
||||
private WeaResult<Map<String, Object>> getOnJobNumber(@RequestBody Map<String, String> params) {
|
||||
return leaderCockpitService.getOnJobNumber(params);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -24,6 +24,10 @@ public class BaseParam {
|
|||
* 岗位自定义表
|
||||
*/
|
||||
private String table_job_cus = "ft_1155455711525494797";
|
||||
///**
|
||||
// * 员工自定义表
|
||||
// */
|
||||
//private String table_emp_cus = "ft_1152026012537184302";
|
||||
/**
|
||||
* 租户标识
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ public interface LeaderCockpitService {
|
|||
* @param params
|
||||
* @return
|
||||
*/
|
||||
WeaResult<List<PortalPO>> getOnJobNumber(Map<String, String> params);
|
||||
WeaResult<Map<String, Object>> getOnJobNumber(Map<String, String> params);
|
||||
|
||||
/**
|
||||
* 获取人工成本
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package com.weaver.seconddev.portal.service.impl;
|
||||
|
||||
import cn.hutool.core.convert.Convert;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.weaver.common.base.entity.result.WeaResult;
|
||||
import com.weaver.common.hrm.dao.HrmCommonEmployeeDao;
|
||||
|
|
@ -41,12 +42,15 @@ public class LeaderCockpitServiceImpl implements LeaderCockpitService {
|
|||
DepartMentService departMentService;
|
||||
|
||||
@Override
|
||||
public WeaResult<List<PortalPO>> getOnJobNumber(Map<String, String> params) {
|
||||
public WeaResult<Map<String, Object>> getOnJobNumber(Map<String, String> params) {
|
||||
SearchConditionParam searchConditionParam = new SearchConditionParam();
|
||||
initSearchConditionParam(searchConditionParam, params, null);
|
||||
log.error("searchConditionParam===" + JSON.toJSONString(searchConditionParam));
|
||||
List<PortalPO> onJobNumber = leaderCockpitMapper.getOnJobNumber(searchConditionParam);
|
||||
return WeaResult.success(onJobNumber);
|
||||
Map<String, Object> returnMap = new HashMap<>();
|
||||
returnMap.put("data", onJobNumber);
|
||||
returnMap.put("total", onJobNumber.stream().mapToInt(item -> Convert.toInt(item.getValue(), 0)).sum());
|
||||
return WeaResult.success(returnMap);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
Loading…
Reference in New Issue