|
@@ -102,11 +102,15 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
|
|
|
lambdaQueryWrapper.eq(Project::getMtCompanyId, mtCompanyId);
|
|
|
List<Project> projects = list(lambdaQueryWrapper);
|
|
|
Map<String, Long> collect = projects.stream().collect(Collectors.groupingBy(Project::getProjectStatus, Collectors.counting()));
|
|
|
- Map<String, Integer> totalMap = new HashMap<>();
|
|
|
- totalMap.put("notStart", collect.get(CommonEnum.ProjectStatus.NOT_START.getCode()).intValue());
|
|
|
- totalMap.put("inService", collect.get(CommonEnum.ProjectStatus.IN_SERVICE.getCode()).intValue());
|
|
|
- totalMap.put("stopService", collect.get(CommonEnum.ProjectStatus.STOP_SERVICE.getCode()).intValue());
|
|
|
- totalMap.put("overdue", collect.get(CommonEnum.ProjectStatus.OVERDUE.getCode()).intValue());
|
|
|
+ Map<String, Long> totalMap = new HashMap<>();
|
|
|
+ Long notStart = collect.get(CommonEnum.ProjectStatus.NOT_START.getCode());
|
|
|
+ Long inService = collect.get(CommonEnum.ProjectStatus.IN_SERVICE.getCode());
|
|
|
+ Long stopService = collect.get(CommonEnum.ProjectStatus.STOP_SERVICE.getCode());
|
|
|
+ Long overdue = collect.get(CommonEnum.ProjectStatus.OVERDUE.getCode());
|
|
|
+ totalMap.put("notStart", notStart == null ? 0 : notStart);
|
|
|
+ totalMap.put("inService", inService == null ? 0 : inService);
|
|
|
+ totalMap.put("stopService", stopService == null ? 0 : stopService);
|
|
|
+ totalMap.put("overdue", overdue == null ? 0 : overdue);
|
|
|
int projectCount = count(mtCompanyId, projectStatus);
|
|
|
int liftCount = projectLiftRelevanceService.count(mtCompanyId, projectStatus);
|
|
|
int stopLiftCount = platformCompanyService.count(mtCompanyId, projectStatus);
|
|
@@ -201,7 +205,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
|
|
|
*/
|
|
|
public Map<String, Object> detail(Long id) {
|
|
|
Project project = getOne(id);
|
|
|
- List<ProjectUserResponse> userList = projectUserService.getUserList(id);
|
|
|
+ List<ProjectUserResponse> userList = projectUserService.getUserList(id, null);
|
|
|
Map<String, Object> resultMap = new HashMap<>();
|
|
|
resultMap.put("project", project);
|
|
|
resultMap.put("userList", userList);
|