|
@@ -1,8 +1,8 @@
|
|
|
package com.persagy.fm.department.service.impl;
|
|
|
|
|
|
import com.persagy.fm.common.response.FmResponseContent;
|
|
|
-import com.persagy.fm.department.model.vo.ManagerVO;
|
|
|
-import com.persagy.fm.department.model.vo.ProjectVO;
|
|
|
+import com.persagy.fm.department.model.vo.ManagerSimpleObjVO;
|
|
|
+import com.persagy.fm.saas.project.model.vo.ProjectSimpleObjVO;
|
|
|
import com.persagy.fm.department.service.IDepTranslator;
|
|
|
import com.persagy.fm.person.model.Person;
|
|
|
import com.persagy.fm.person.service.IPersonService;
|
|
@@ -33,25 +33,21 @@ public class DepTranslatorImpl implements IDepTranslator {
|
|
|
SaasProjectClient saasProjectClient;
|
|
|
|
|
|
@Override
|
|
|
- public List<ManagerVO> getManagerVOList(String managers) {
|
|
|
- String separator = ",";
|
|
|
- if (StringUtils.isBlank(managers)) {
|
|
|
+ public List<ManagerSimpleObjVO> getManagerVOList(List<String> managerIds) {
|
|
|
+ if (CollectionUtils.isEmpty(managerIds)) {
|
|
|
return Lists.newArrayList();
|
|
|
}
|
|
|
- String[] managersArr = managers.split(separator);
|
|
|
- List<String> managerIdList = Lists.newArrayList();
|
|
|
- managerIdList.addAll(Arrays.asList(managersArr));
|
|
|
- List<Person> people = personService.queryByIds(managerIdList);
|
|
|
+ List<Person> people = personService.queryByIds(managerIds);
|
|
|
return people.stream().map(person -> {
|
|
|
- ManagerVO managerVO = new ManagerVO();
|
|
|
- managerVO.setId(person.getId().toString());
|
|
|
- managerVO.setName(person.getName());
|
|
|
- return managerVO;
|
|
|
+ ManagerSimpleObjVO managerSimpleObjVO = new ManagerSimpleObjVO();
|
|
|
+ managerSimpleObjVO.setId(person.getId().toString());
|
|
|
+ managerSimpleObjVO.setName(person.getName());
|
|
|
+ return managerSimpleObjVO;
|
|
|
}).collect(Collectors.toList());
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public List<ProjectVO> getProjectVOList(List<String> projectIds) {
|
|
|
+ public List<ProjectSimpleObjVO> getProjectVOList(List<String> projectIds) {
|
|
|
if (CollectionUtils.isEmpty(projectIds)) {
|
|
|
return Lists.newArrayList();
|
|
|
}
|
|
@@ -61,7 +57,7 @@ public class DepTranslatorImpl implements IDepTranslator {
|
|
|
FmResponseContent<List<SaasProject>> listFmResponseContent = saasProjectClient.queryProjectList(querySaasProjectDTO);
|
|
|
List<SaasProject> saasProjects = listFmResponseContent.getContent();
|
|
|
return saasProjects.stream().map(saasProject -> {
|
|
|
- ProjectVO projectVO = new ProjectVO();
|
|
|
+ ProjectSimpleObjVO projectVO = new ProjectSimpleObjVO();
|
|
|
projectVO.setId(saasProject.getProjectId());
|
|
|
projectVO.setName(saasProject.getProjectName());
|
|
|
return projectVO;
|