diff --git a/src/main/java/com/weaver/seconddev/portal/controller/LeaderCockpitController.java b/src/main/java/com/weaver/seconddev/portal/controller/LeaderCockpitController.java index 34dd006..9d7c652 100644 --- a/src/main/java/com/weaver/seconddev/portal/controller/LeaderCockpitController.java +++ b/src/main/java/com/weaver/seconddev/portal/controller/LeaderCockpitController.java @@ -29,7 +29,7 @@ public class LeaderCockpitController { LeaderCockpitService leaderCockpitService; @PostMapping("/getOnJobNumber") - private WeaResult> getOnJobNumber(@RequestBody Map params) { + private WeaResult> getOnJobNumber(@RequestBody Map params) { return leaderCockpitService.getOnJobNumber(params); } diff --git a/src/main/java/com/weaver/seconddev/portal/entity/param/BaseParam.java b/src/main/java/com/weaver/seconddev/portal/entity/param/BaseParam.java index 3f95e65..ca91eab 100644 --- a/src/main/java/com/weaver/seconddev/portal/entity/param/BaseParam.java +++ b/src/main/java/com/weaver/seconddev/portal/entity/param/BaseParam.java @@ -24,6 +24,10 @@ public class BaseParam { * 岗位自定义表 */ private String table_job_cus = "ft_1155455711525494797"; + ///** + // * 员工自定义表 + // */ + //private String table_emp_cus = "ft_1152026012537184302"; /** * 租户标识 */ diff --git a/src/main/java/com/weaver/seconddev/portal/service/LeaderCockpitService.java b/src/main/java/com/weaver/seconddev/portal/service/LeaderCockpitService.java index f53c836..99556b8 100644 --- a/src/main/java/com/weaver/seconddev/portal/service/LeaderCockpitService.java +++ b/src/main/java/com/weaver/seconddev/portal/service/LeaderCockpitService.java @@ -21,7 +21,7 @@ public interface LeaderCockpitService { * @param params * @return */ - WeaResult> getOnJobNumber(Map params); + WeaResult> getOnJobNumber(Map params); /** * 获取人工成本 diff --git a/src/main/java/com/weaver/seconddev/portal/service/impl/LeaderCockpitServiceImpl.java b/src/main/java/com/weaver/seconddev/portal/service/impl/LeaderCockpitServiceImpl.java index 588f19d..0502cb9 100644 --- a/src/main/java/com/weaver/seconddev/portal/service/impl/LeaderCockpitServiceImpl.java +++ b/src/main/java/com/weaver/seconddev/portal/service/impl/LeaderCockpitServiceImpl.java @@ -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> getOnJobNumber(Map params) { + public WeaResult> getOnJobNumber(Map params) { SearchConditionParam searchConditionParam = new SearchConditionParam(); initSearchConditionParam(searchConditionParam, params, null); log.error("searchConditionParam===" + JSON.toJSONString(searchConditionParam)); List onJobNumber = leaderCockpitMapper.getOnJobNumber(searchConditionParam); - return WeaResult.success(onJobNumber); + Map 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