|
@@ -652,51 +652,51 @@ public class JyProjectService {
|
|
|
}
|
|
|
}
|
|
|
BeanUtils.copyProperties(info, jyProjectDTO);
|
|
|
-
|
|
|
- }
|
|
|
- // 查询联系人列表
|
|
|
- ArrayList<JyWorkClientLinkman> jyWorkClientLinkmen = new ArrayList<>();
|
|
|
- JyWorkClientLinkman jyWorkClientLinkman = jyWorkClientLinkmanMapper.selectByClientId(info.getClient());
|
|
|
- if (ObjectUtil.isNotEmpty(jyWorkClientLinkman)){
|
|
|
- jyWorkClientLinkmen.add(jyWorkClientLinkman);
|
|
|
- jyProjectDTO.setClientList(jyWorkClientLinkmen);
|
|
|
- }else {
|
|
|
- JyWorkClientLinkman jyWorkClientLinkman1=jyWorkClientLinkmanMapper.selectByClientName(info.getClientName());
|
|
|
- if (ObjectUtil.isNotEmpty(jyWorkClientLinkman1)){
|
|
|
- jyWorkClientLinkmen.add(jyWorkClientLinkman1);
|
|
|
+// 查询联系人列表
|
|
|
+ ArrayList<JyWorkClientLinkman> jyWorkClientLinkmen = new ArrayList<>();
|
|
|
+ JyWorkClientLinkman jyWorkClientLinkman = jyWorkClientLinkmanMapper.selectByClientId(info.getClient());
|
|
|
+ if (ObjectUtil.isNotEmpty(jyWorkClientLinkman)){
|
|
|
+ jyWorkClientLinkmen.add(jyWorkClientLinkman);
|
|
|
jyProjectDTO.setClientList(jyWorkClientLinkmen);
|
|
|
+ }else {
|
|
|
+ JyWorkClientLinkman jyWorkClientLinkman1=jyWorkClientLinkmanMapper.selectByClientName(info.getClientName());
|
|
|
+ if (ObjectUtil.isNotEmpty(jyWorkClientLinkman1)){
|
|
|
+ jyWorkClientLinkmen.add(jyWorkClientLinkman1);
|
|
|
+ jyProjectDTO.setClientList(jyWorkClientLinkmen);
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- // 查询成员列表
|
|
|
- LambdaQueryWrapper<JyProjectMembers> memberWrapper = new LambdaQueryWrapper<>();
|
|
|
- memberWrapper.eq(JyProjectMembers::getProjectId, id);
|
|
|
- memberWrapper.eq(JyProjectMembers::getDelFlag, 0);
|
|
|
- List<JyProjectMembers> members = jyProjectMemberMapper.selectList(memberWrapper);
|
|
|
-
|
|
|
- List<JyProjectMembersDTO> list=new ArrayList<>();
|
|
|
- if (CollectionUtils.isNotEmpty(members)) {
|
|
|
- List<String> collect = members.stream().distinct().map(JyProjectMembers::getUserId).collect(Collectors.toList());
|
|
|
- for (String member : collect) {
|
|
|
- if (StringUtils.isNotBlank(member)) {
|
|
|
- JyProjectMembersDTO jyProjectMembers = new JyProjectMembersDTO();
|
|
|
- jyProjectMembers.setUserId(member);
|
|
|
- jyProjectMembers.setStatus("0");
|
|
|
- list.add(jyProjectMembers);
|
|
|
+ // 查询成员列表
|
|
|
+ LambdaQueryWrapper<JyProjectMembers> memberWrapper = new LambdaQueryWrapper<>();
|
|
|
+ memberWrapper.eq(JyProjectMembers::getProjectId, id);
|
|
|
+ memberWrapper.eq(JyProjectMembers::getDelFlag, 0);
|
|
|
+ List<JyProjectMembers> members = jyProjectMemberMapper.selectList(memberWrapper);
|
|
|
+
|
|
|
+ List<JyProjectMembersDTO> list=new ArrayList<>();
|
|
|
+ if (CollectionUtils.isNotEmpty(members)) {
|
|
|
+ List<String> collect = members.stream().distinct().map(JyProjectMembers::getUserId).collect(Collectors.toList());
|
|
|
+ for (String member : collect) {
|
|
|
+ if (StringUtils.isNotBlank(member)) {
|
|
|
+ JyProjectMembersDTO jyProjectMembers = new JyProjectMembersDTO();
|
|
|
+ jyProjectMembers.setUserId(member);
|
|
|
+ jyProjectMembers.setStatus("0");
|
|
|
+ list.add(jyProjectMembers);
|
|
|
+ }
|
|
|
}
|
|
|
+ jyProjectDTO.setProjectMembers(list);
|
|
|
}
|
|
|
- jyProjectDTO.setProjectMembers(list);
|
|
|
- }
|
|
|
|
|
|
|
|
|
|
|
|
- // 查询附件信息
|
|
|
- List<WorkAttachmentInfo> files = jyWorkContractInfoMapper.findDtos(id);
|
|
|
- if (CollectionUtils.isNotEmpty(files)) {
|
|
|
- for (WorkAttachmentInfo i : files) {
|
|
|
- i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
|
|
|
+ // 查询附件信息
|
|
|
+ List<WorkAttachmentInfo> files = jyWorkContractInfoMapper.findDtos(id);
|
|
|
+ if (CollectionUtils.isNotEmpty(files)) {
|
|
|
+ for (WorkAttachmentInfo i : files) {
|
|
|
+ i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
|
|
|
+ }
|
|
|
+ jyProjectDTO.setFiles(files);
|
|
|
}
|
|
|
- jyProjectDTO.setFiles(files);
|
|
|
}
|
|
|
+
|
|
|
return jyProjectDTO;
|
|
|
}
|
|
|
|