转译

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

@@ -7566,6 +7566,12 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 }
             }
         }
+        WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", targetUser.getCompanyId()));
+        if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
+            for (Map<String, Object> map : resultList) {
+                map.put("name","$userName="+(map.get("corwxUserId")==null?"":map.get("corwxUserId"))+"$");
+            }
+        }
         Map<String,Object> map=new HashMap<>();
         map.put("result",resultList);
         map.put("total",total);
@@ -7603,7 +7609,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         for (Map<String, Object> map : resultList) {
             List<String> item=new ArrayList<>();
             if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                item.add("$userName="+(map.get("corwxUserId")==null?"":map.get("corwxUserId"))+"$");
+                item.add((String) map.get("name"));
                 item.add("$deprtmentName="+(map.get("corpwxDeptId")==null?"":map.get("corpwxDeptId"))+"$");
             }else {
                 item.add((String) map.get("name"));
@@ -7637,7 +7643,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
     //递归获取所有子部门
     private List<Department> getSubDepts(Department dp, List<Department> list) {
-        List<Department> collect = list.stream().filter(l -> dp.getDepartmentId().equals(l.getSuperiorId())).collect(Collectors.toList());;
+        List<Department> collect = list.stream().filter(l -> dp.getDepartmentId().equals(l.getSuperiorId())).collect(Collectors.toList());
         List<Department> allList = new ArrayList<>();
         allList.addAll(collect);
         if (collect.size() > 0) {
@@ -7741,10 +7747,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             int dayCount = Integer.parseInt(businessTrip.get("dayCount").toString());
                             businessTrip.put("dayCount",dayCount-day);
                         }
-                        System.err.println(stringObjectMap.get("deptId"));
-                        System.err.print(tripStart);
-                        System.err.println(tripEnd);
-                        System.err.println(businessTrip.get("dayCount"));
                     }
                     Integer dayCount = businessTrips.stream().collect(Collectors.summingInt((b) -> Integer.parseInt(b.get("dayCount").toString())));
                     stringObjectMap.put("tripCount",dayCount==null?0:dayCount);
@@ -7765,7 +7767,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         return  httpRespMsg;
     }
 
-    //导出员工月度工时表
+    //导出部门参与项目情况表
     @Override
     public HttpRespMsg exportDeptPartInProjects(String month, Integer departmentId, HttpServletRequest request){
         HttpRespMsg msg=new HttpRespMsg();