|
|
@@ -3168,10 +3168,13 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
}
|
|
|
}
|
|
|
System.out.println("参与搜素的人员列表"+userNameList);
|
|
|
- HttpRespMsg respMsg = wxCorpInfoService.getBatchSearchUserInfo(wxCorpInfo, userNameList);
|
|
|
- if(respMsg.code.equals("0")){
|
|
|
- msg.setError("姓名为["+String.valueOf(respMsg.data)+"]的人员存在重复,请使用工号!");
|
|
|
- return msg;
|
|
|
+ HttpRespMsg respMsg=new HttpRespMsg();
|
|
|
+ if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
|
|
|
+ respMsg = wxCorpInfoService.getBatchSearchUserInfo(wxCorpInfo, userNameList);
|
|
|
+ if(respMsg.code.equals("0")){
|
|
|
+ msg.setError("姓名为["+String.valueOf(respMsg.data)+"]的人员存在重复,请使用工号!");
|
|
|
+ return msg;
|
|
|
+ }
|
|
|
}
|
|
|
List<User> targetUserList= (List<User>) respMsg.data;
|
|
|
int importCount = 0;
|
|
|
@@ -3561,10 +3564,13 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
}
|
|
|
}
|
|
|
System.out.println("参与搜素的人员列表"+userNameList);
|
|
|
- HttpRespMsg respMsg = wxCorpInfoService.getBatchSearchUserInfo(wxCorpInfo, userNameList);
|
|
|
- if(respMsg.code.equals("0")){
|
|
|
- msg.setError("姓名为["+String.valueOf(respMsg.data)+"]的人员存在重复,请使用工号!");
|
|
|
- return msg;
|
|
|
+ HttpRespMsg respMsg=new HttpRespMsg();
|
|
|
+ if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
|
|
|
+ respMsg = wxCorpInfoService.getBatchSearchUserInfo(wxCorpInfo, userNameList);
|
|
|
+ if(respMsg.code.equals("0")){
|
|
|
+ msg.setError("姓名为["+String.valueOf(respMsg.data)+"]的人员存在重复,请使用工号!");
|
|
|
+ return msg;
|
|
|
+ }
|
|
|
}
|
|
|
List<User> targetUserList= (List<User>) respMsg.data;
|
|
|
List<String> existCodeList = new ArrayList<>();
|
|
|
@@ -4683,6 +4689,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
// headList.add("创建日期");
|
|
|
if(timeType.getMainProjectState()==1){
|
|
|
headList.add(MessageUtils.message("entry.mainProject"));
|
|
|
+ headList.add(MessageUtils.message("entry.mainProjectCode"));
|
|
|
}
|
|
|
headList.add(MessageUtils.message("entry.projectId"));
|
|
|
headList.add(MessageUtils.message("entry.projectType"));
|
|
|
@@ -4758,13 +4765,22 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
collect.add(-1);
|
|
|
List<ProjectSeparate> projectSeparateList= projectSeparateMapper.selectList(new QueryWrapper<ProjectSeparate>().in("id", collect));
|
|
|
List<ProjectKeyNodes> nodesList = projectKeyNodesMapper.selectList(new QueryWrapper<ProjectKeyNodes>().in("project_id", collect));
|
|
|
+ List<ProjectMain> projectMainList = projectMainMapper.selectList(new QueryWrapper<ProjectMain>().eq("company_id", company.getId()));
|
|
|
LocalDateTime d=LocalDateTime.now();
|
|
|
Duration between1 = Duration.between(c, d);
|
|
|
System.out.println("此处耗时----------------"+between1.toMillis());
|
|
|
for (ProjectVO projectVO : projectVOList) {
|
|
|
List<String> rowData = new ArrayList<>();
|
|
|
if(timeType.getMainProjectState()==1){
|
|
|
- rowData.add(projectVO.getProjectMainName());
|
|
|
+ Optional<ProjectMain> first = projectMainList.stream().filter(pl -> pl.getId().equals(projectVO.getProjectMainId())).findFirst();
|
|
|
+ if(first.isPresent()){
|
|
|
+ rowData.add(first.get().getName());
|
|
|
+ rowData.add(first.get().getCode());
|
|
|
+ }else {
|
|
|
+ rowData.add("");
|
|
|
+ rowData.add("");
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
rowData.add(projectVO.getProjectCode());
|
|
|
rowData.add(projectVO.getCategoryName());
|
ggooalice