日报待审核统表部门

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

@@ -6661,9 +6661,19 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         List<Map<String,Object>>  list=projectMapper.getWaitingReviewList(stateKey,user.getCompanyId(),userId,start,size,startDate,endDate,departmentId,deptIds);
         WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", user.getCompanyId()));
         for (Map<String, Object> map : list) {
+            Department dept = null;
+            Integer deptId = Integer.valueOf(map.get("deptId").toString());
+            for (Department department : allDeptList) {
+                if (deptId.equals(department.getDepartmentId())){
+                    dept = department;
+                }
+            }
             if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                String wxDeptName = map.get("wxDeptId") == null ? "" : map.get("wxDeptId").toString();
+                String wxDeptName = departmentService.getWxDepartment(dept, allDeptList);
                 map.put("departmentName",wxDeptName);
+            }else {
+                String deptName = departmentService.getSupDepartment(dept, allDeptList);
+                map.put("departmentName",deptName);
             }
         }
         long total=projectMapper.findCount(stateKey,user.getCompanyId(),userId,null,null,startDate,endDate,departmentId,deptIds);
@@ -6679,11 +6689,12 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         HttpRespMsg msg = getWaitingReviewList(request, stateKey, userId, null, null,startDate,endDate,null);
         Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
         WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", companyId));
+        List<Department> allDeptList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id", companyId));
         HashMap resultmap= (HashMap) msg.data;
         List<Map<String,Object>> list= (List<Map<String, Object>>) resultmap.get("result");
         List<List<String>> dataList=new ArrayList<>();
-        //String[] s={"人员", "待审核数量"};
-        String[] s={MessageUtils.message("entry.personnel"), MessageUtils.message("entry.quaAud")};
+        //String[] s={"人员","部门","待审核数量"};
+        String[] s={MessageUtils.message("entry.personnel"),MessageUtils.message("excel.department"), MessageUtils.message("entry.quaAud")};
         dataList.add(Arrays.asList(s));
         for (Map<String, Object> map : list) {
             List<String> item=new ArrayList<>();
@@ -6692,6 +6703,19 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             }else {
                 item.add(String.valueOf(map.get("userName")));
             }
+            Department dept = null;
+            Integer deptId = Integer.valueOf(map.get("deptId").toString());
+            for (Department department : allDeptList) {
+                if (deptId.equals(department.getDepartmentId())){
+                    dept = department;
+                }
+            }
+            if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
+                String wxDeptName = departmentService.exportWxDepartment(dept, allDeptList);
+                item.add(wxDeptName);
+            }else {
+                item.add(map.get("departmentName").toString());
+            }
             item.add(String.valueOf(map.get("num")));
             dataList.add(item);
         }

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ProjectMapper.xml

@@ -924,7 +924,7 @@
     <select id="getWaitingReviewList" resultType="java.util.Map">
         <choose>
             <when test="stateKey==0">
-                SELECT 	dept_manager.name as userName,`user`.corpwx_userid as corpwxUserId,department.department_name as departmentName,department.corpwx_deptid as wxDeptId,COUNT(1) as num
+                SELECT 	dept_manager.name as userName,`user`.corpwx_userid as corpwxUserId,department.department_id as deptId,department.corpwx_deptid as wxDeptId,COUNT(1) as num
                 FROM report AS a
                 left join user on user.id = a.creator_id
                 JOIN project AS b ON a.project_id=b.id
@@ -959,7 +959,7 @@
                 ORDER BY a.create_date desc, a.creator_id asc
             </when>
             <otherwise>
-                SELECT 	u.name as userName,u.corpwx_userid as corpwxUserId,dp.department_name as departmentName,dp.corpwx_deptid as wxDeptId,COUNT(1) as num
+                SELECT 	u.name as userName,u.corpwx_userid as corpwxUserId,dp.department_id as deptId,dp.corpwx_deptid as wxDeptId,COUNT(1) as num
                 FROM report AS a
                 left join user on user.id = a.creator_id
                 JOIN project AS b ON a.project_id=b.id