项目分类工时导出修改

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -8987,6 +8987,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 List<String> headList = new ArrayList<String>();
                 //headList.add("人员");
                 headList.add(MessageUtils.message("entry.personnel"));
+                //部门
+                headList.add(MessageUtils.message("excel.department"));
                 projectCategoryNameS.forEach(pc->{
                     if ("hours".equals(exportContent) && functionTimeList.size()>0){
                         //headList.add(String.valueOf(pc)+"/工时");
@@ -9032,12 +9034,28 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     double costTime = 0;
                     List<Map<String, Object>> mapList = membList.stream().filter(mb -> mb.get("creatorId").equals(user.getId())).collect(Collectors.toList());
                     List<String> membRowData=new ArrayList<>();
+                    Optional<Department> first = allDepartmentList.stream().filter(d -> d.getDepartmentId().equals(user.getDepartmentId())).findFirst();
                     if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                         membRowData.add("$userName"+(user.getCorpwxUserid()==null?"":user.getCorpwxUserid())+"$");
+                        if (first.isPresent()){
+                            membRowData.add((String)("$departmentName="+first.get().getCorpwxDeptid()+"$"));
+                        }else {
+                            membRowData.add("");
+                        }
                     }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                         membRowData.add("$userName"+(user.getName()==null?"":user.getName())+"$");
+                        if (first.isPresent()){
+                            membRowData.add((String)("$departmentName="+first.get().getDdDeptid()+"$"));
+                        }else {
+                            membRowData.add("");
+                        }
                     }else {
                         membRowData.add(user.getName());
+                        if (first.isPresent()){
+                            membRowData.add(first.get().getDepartmentName());
+                        }else {
+                            membRowData.add("");
+                        }
                     }
                     for(Object i:projectCategorys){
                         List<Map<String, Object>> resultList = mapList.stream().filter(mp -> mp.get("category").equals(i)).collect(Collectors.toList());