|
@@ -513,24 +513,6 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
|
|
|
}
|
|
|
list.add(departmentMasterVO);
|
|
|
}
|
|
|
- //当前部门下的直属人员工时统计
|
|
|
- if (parentDeptId != null) {
|
|
|
- List<Integer> curDeptIds = new ArrayList<>();
|
|
|
- curDeptIds.add(parentDeptId);
|
|
|
- List<Map<String, Object>> userTimeList = departmentMapper.getCostByUserSum(curDeptIds, startDate, endDate, companyId);
|
|
|
- for (Map<String, Object> map : userTimeList) {
|
|
|
- DepartmentMasterVO departmentMasterVO = new DepartmentMasterVO();
|
|
|
- departmentMasterVO.setSeq(0);
|
|
|
- departmentMasterVO.setDepartmentName((String)map.get("user"));
|
|
|
- departmentMasterVO.setCostTime((Double)map.get("time"));
|
|
|
- BigDecimal money = map == null ? new BigDecimal(0) : (BigDecimal) map.get("money");
|
|
|
- departmentMasterVO.setCostMoney(money);
|
|
|
- departmentMasterVO.setType("userName");
|
|
|
- departmentMasterVO.setHasSubDept(false);
|
|
|
- list.add(departmentMasterVO);
|
|
|
- totalCostMoney = totalCostMoney.add(money);
|
|
|
- }
|
|
|
- }
|
|
|
//对部门排序
|
|
|
list.sort(Comparator.comparing(l->l.getSeq()));
|
|
|
resultMap.put("totalCostMoney", totalCostMoney);
|