|
@@ -100,6 +100,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
IUserService userService;
|
|
|
@Autowired
|
|
|
ISceneMoveLogService sceneMoveLogService;
|
|
|
+ @Autowired
|
|
|
+ IProjectNumService projectNumService;
|
|
|
|
|
|
@Override
|
|
|
public Long getCountByUserIds(List<Long> userIds) {
|
|
@@ -145,6 +147,11 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
numList = tmContractorNumService.getNumListByCompanyId(user.getCompanyId());
|
|
|
param.setCooperateSceneCodes(numList);
|
|
|
}
|
|
|
+ if(param.getProjectId() != null){
|
|
|
+ List<ProjectNum> projectNumList = projectNumService.getByProjectId(Arrays.asList(param.getProjectId()));
|
|
|
+ List<String> projectNums = projectNumList.stream().map(ProjectNum::getNum).collect(Collectors.toList());
|
|
|
+ param.setProjectNums(projectNums);
|
|
|
+ }
|
|
|
|
|
|
Page<SceneVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
|
|
|
List<String> sceneNumList = page.getRecords().stream().map(SceneVo::getNum).collect(Collectors.toList());
|