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 c51289e..76c0333 100644 --- a/src/main/java/com/weaver/seconddev/portal/controller/LeaderCockpitController.java +++ b/src/main/java/com/weaver/seconddev/portal/controller/LeaderCockpitController.java @@ -31,7 +31,7 @@ public class LeaderCockpitController { } @PostMapping("/getLaborCost") - private WeaResult> getLaborCost(@RequestBody Map params) { + private WeaResult> getLaborCost(@RequestBody Map params) { return leaderCockpitService.getLaborCost(params); } @@ -46,8 +46,8 @@ public class LeaderCockpitController { } @PostMapping("/getFullStaffingRate") - private WeaResult> getFullStaffingRate(@RequestHeader Map header,@RequestBody Map params) { - return leaderCockpitService.getFullStaffingRate(header,params); + private WeaResult> getFullStaffingRate(@RequestHeader Map header, @RequestBody Map params) { + return leaderCockpitService.getFullStaffingRate(header, params); } @PostMapping("/getEmploymentStatus") diff --git a/src/main/java/com/weaver/seconddev/portal/mapper/portal/LeaderCockpitMapper.java b/src/main/java/com/weaver/seconddev/portal/mapper/portal/LeaderCockpitMapper.java index 9b9466d..99d7834 100644 --- a/src/main/java/com/weaver/seconddev/portal/mapper/portal/LeaderCockpitMapper.java +++ b/src/main/java/com/weaver/seconddev/portal/mapper/portal/LeaderCockpitMapper.java @@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param; import java.util.Collection; import java.util.List; +import java.util.Map; import java.util.Set; /** @@ -112,4 +113,9 @@ public interface LeaderCockpitMapper { */ Set getTopDepartmentIds(@Param("param") SearchConditionParam param); + /** + * 人力成本 + */ + Map getLaborCost(SearchConditionParam param); + } 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 5929f6d..50e5979 100644 --- a/src/main/java/com/weaver/seconddev/portal/service/LeaderCockpitService.java +++ b/src/main/java/com/weaver/seconddev/portal/service/LeaderCockpitService.java @@ -29,7 +29,7 @@ public interface LeaderCockpitService { * @param params * @return */ - WeaResult> getLaborCost(Map params); + WeaResult> getLaborCost(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 d40f778..25489e0 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 @@ -57,8 +57,13 @@ public class LeaderCockpitServiceImpl implements LeaderCockpitService { } @Override - public WeaResult> getLaborCost(Map params) { - return null; + public WeaResult > getLaborCost(Map params) { + SearchConditionParam searchConditionParam = new SearchConditionParam(); + initSearchConditionParam(searchConditionParam, params, null); + log.error("searchConditionParam===" + JSON.toJSONString(searchConditionParam)); + + Map laborCost = leaderCockpitMapper.getLaborCost(searchConditionParam); + return WeaResult.success(laborCost); } @Override diff --git a/src/main/resources/mapper/portal/LeaderCockpitMapper.xml b/src/main/resources/mapper/portal/LeaderCockpitMapper.xml index 4d7f641..1c8aeb4 100644 --- a/src/main/resources/mapper/portal/LeaderCockpitMapper.xml +++ b/src/main/resources/mapper/portal/LeaderCockpitMapper.xml @@ -146,4 +146,10 @@ and t1.status = 1 and t1.tenant_key = #{param.tenantKey} + +