diff --git a/src/main/java/com/lz/modules/app/controller/ReportResultController.java b/src/main/java/com/lz/modules/app/controller/ReportResultController.java index 00b5eb2c..a43ac4cf 100644 --- a/src/main/java/com/lz/modules/app/controller/ReportResultController.java +++ b/src/main/java/com/lz/modules/app/controller/ReportResultController.java @@ -54,19 +54,20 @@ public class ReportResultController extends AbstractController{ @RequestMapping("chart") - public R reportChart(String monthTime,String departmentId){ - if(StringUtil.isBlank(monthTime)){ - monthTime = YearMonth.now().toString(); + public R reportChart(String selectMonthTime,String departmentId){ + if(StringUtil.isBlank(selectMonthTime)){ + selectMonthTime = YearMonth.now().toString(); } ReportChartResp data = new ReportChartResp(); //月初目标 - List start = chartService.resultProgressDistribution(ResultRecordTypeEnum.TARGET.getType(),monthTime,departmentId); + List start = chartService.resultProgressDistribution(ResultRecordTypeEnum.TARGET.getType(),selectMonthTime,departmentId); //月末结果 - List end = chartService.resultProgressDistribution(ResultRecordTypeEnum.RESULT.getType(),monthTime,departmentId); + List end = chartService.resultProgressDistribution(ResultRecordTypeEnum.RESULT.getType(),selectMonthTime,departmentId); //人员等级分布 List allDeparmentIds = staffService.selectAllDeparmentIdsByDepartmentParentId(departmentId); - int total = staffService.countStaffByAllDeparmentIds(allDeparmentIds); - List staffLevels = resultRecordService.staffDistribution(monthTime); + List strings = staffService.staffsByAllDeparmentIds(allDeparmentIds); + int total = strings.size(); + List staffLevels = resultRecordService.staffDistribution(selectMonthTime,strings); List names = new ArrayList<>(); List datas = new ArrayList<>(); int konwn = 0; @@ -90,7 +91,6 @@ public class ReportResultController extends AbstractController{ barDto.setDatas(datas); barDto.setTotal(total); data.setStaffDistribution(barDto); - data.setMonthTime(YearMonth.now().toString()); return R.ok().put("data",data); } diff --git a/src/main/java/com/lz/modules/app/service/StaffService.java b/src/main/java/com/lz/modules/app/service/StaffService.java index 45946fb8..13b88aab 100644 --- a/src/main/java/com/lz/modules/app/service/StaffService.java +++ b/src/main/java/com/lz/modules/app/service/StaffService.java @@ -80,8 +80,8 @@ public interface StaffService extends IService { //查询部门下的所有子部门 List selectAllDeparmentIdsByDepartmentParentId(String departmentId); - //统计部门下的人数 - int countStaffByAllDeparmentIds(List deparmentIds); + //统计部门下的人 + List staffsByAllDeparmentIds(List deparmentIds); List selectAll(); } diff --git a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java index a26c12c5..656c36de 100644 --- a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java +++ b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java @@ -404,9 +404,9 @@ public class StaffServiceImpl extends ServiceImpl impleme @Override - public int countStaffByAllDeparmentIds(List deparmentIds) { + public List staffsByAllDeparmentIds(List deparmentIds) { if(CollectionUtils.isEmpty(deparmentIds)){ - return 0; + return Lists.newArrayList(); } //获取所有子部门 List list = departmentsStaffRelateService.list(new QueryWrapper() @@ -414,12 +414,12 @@ public class StaffServiceImpl extends ServiceImpl impleme .eq("is_delete", 0) .in("department_id", deparmentIds)); if(CollectionUtils.isEmpty(list)){ - return 0; + return Lists.newArrayList(); } //获取人员个数去重 List staffs = list.stream().map(e -> e.getStaffId() + "").collect(Collectors.toList()); List staffdistincts = staffs.stream().distinct().collect(Collectors.toList()); - return staffdistincts.size(); + return staffdistincts; } diff --git a/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java b/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java index 1aa9fdb7..a33d5298 100644 --- a/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java +++ b/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java @@ -54,7 +54,7 @@ public interface ResultRecordMapper extends BaseMapper { List ownResult(@Param("userId") Long userId, @Param("status") int status); - List staffDistribution(@Param("monthTime") String monthTime); + List staffDistribution(@Param("monthTime") String monthTime,@Param("staffIds") List staffIds); ResultRecord selectResultRecordByStaffIdStatus(@Param("staffId") Long staffId, @Param("status") int status); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java b/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java index d0bdb858..0e332903 100644 --- a/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java +++ b/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java @@ -78,7 +78,7 @@ public interface ResultRecordService extends IService { * @param monthTime * @return */ - List staffDistribution(String monthTime); + List staffDistribution(String monthTime,List staffIds); Map> getStringListMap(List tDepartments); diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ChartServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ChartServiceImpl.java index a306d089..ec65b14d 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ChartServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ChartServiceImpl.java @@ -30,7 +30,7 @@ public class ChartServiceImpl implements ChartService { List dtos = new ArrayList<>(); //获取所有人员总数 List allDeparmentIds = staffService.selectAllDeparmentIdsByDepartmentParentId(departmentId); - int total = staffService.countStaffByAllDeparmentIds(allDeparmentIds); + int total = staffService.staffsByAllDeparmentIds(allDeparmentIds).size(); //已提交 int commit = resultRecordService.count(new QueryWrapper() .eq("is_delete", 0) diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java index e9cad637..a11e08e0 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java @@ -678,7 +678,8 @@ public class ResultRecordServiceImpl extends ServiceImpl staffDistribution(String monthTime) { - return resultRecordMapper.staffDistribution(monthTime); + public List staffDistribution(String monthTime,List staffIds) { + + return resultRecordMapper.staffDistribution(monthTime,staffIds); } } diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml index 606855a9..a6099e7e 100644 --- a/src/main/resources/mapper/app/ResultRecordMapper.xml +++ b/src/main/resources/mapper/app/ResultRecordMapper.xml @@ -259,7 +259,13 @@