|
@@ -69,6 +69,7 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
|
|
List<ProjectNum> numList = projectNumService.getListByProjectIds(projectIds);
|
|
List<ProjectNum> numList = projectNumService.getListByProjectIds(projectIds);
|
|
Integer projectCount = 0;
|
|
Integer projectCount = 0;
|
|
Long overCount = 0L;
|
|
Long overCount = 0L;
|
|
|
|
+ Long bimCount = 0L;
|
|
if(projectIds.size() >0){
|
|
if(projectIds.size() >0){
|
|
LambdaQueryWrapper<Project> wrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<Project> wrapper = new LambdaQueryWrapper<>();
|
|
wrapper.in(Project::getProjectId,projectIds);
|
|
wrapper.in(Project::getProjectId,projectIds);
|
|
@@ -79,11 +80,12 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
|
|
overCount ++;
|
|
overCount ++;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ LambdaQueryWrapper<ProjectBim> bimWr = new LambdaQueryWrapper<>();
|
|
|
|
+ bimWr.in(ProjectBim::getProjectId,projectIds);
|
|
|
|
+ bimCount = projectBimService.count(bimWr);
|
|
}
|
|
}
|
|
-
|
|
|
|
userData.setProjectCount(Long.valueOf(projectCount));
|
|
userData.setProjectCount(Long.valueOf(projectCount));
|
|
- userData.setProjectSceneCount((long) numList.size());
|
|
|
|
|
|
+ userData.setProjectSceneCount((long) numList.size() + bimCount);
|
|
userData.setProjectOverCount(overCount);
|
|
userData.setProjectOverCount(overCount);
|
|
return userData;
|
|
return userData;
|
|
}
|
|
}
|