Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper into master

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

@@ -3252,11 +3252,26 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             headList.add("项目级别");
             headList.add("合同金额");
         }
+        if(company.getId()==936){
+            headList.add("合同编号");
+            headList.add("质保开始时间");
+            headList.add("质保截止时间");
+            headList.add("项目类别");
+            headList.add("所属大区");
+            headList.add("所属BU");
+            headList.add("项目状态");
+            headList.add("项目阶段");
+        }
         List<List<String>> allList = new ArrayList<List<String>>();
         allList.add(headList);
         String[] levelArray = new String[]{"正常","紧急","重要","重要且紧急","低风险","中风险","高风险"};
         DateTimeFormatter sdf =DateTimeFormatter.ofPattern("yyyy-MM-dd");
         DecimalFormat df = new DecimalFormat("##0.0#");
+        //获取项目子表 数据
+        List<Integer> collect = projectVOList.stream().distinct().map(pv -> pv.getId()).collect(Collectors.toList());
+        //防止空数据
+        collect.add(-1);
+        List<ProjectSeparate> projectSeparateList= projectSeparateMapper.selectList(new QueryWrapper<ProjectSeparate>().in("id", collect));
         for (ProjectVO projectVO : projectVOList) {
             List<String> rowData = new ArrayList<>();
             rowData.add(projectVO.getProjectCode());
@@ -3311,6 +3326,42 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 rowData.add(levelArray[level-1]);
                 rowData.add(df.format((Double)projectVO.getContractAmount()));
             }
+            if(company.getId()==936){
+                Optional<ProjectSeparate> first = projectSeparateList.stream().filter(ps -> ps.getId().equals(projectVO.getId())).findFirst();
+                if(first.isPresent()){
+                    DateTimeFormatter dfs=DateTimeFormatter.ofPattern("yyyy-MM-dd");
+                    ProjectSeparate projectSeparate = first.get();
+                    rowData.add(projectSeparate.getContractCode()==null?"":projectSeparate.getContractCode());
+                    rowData.add(projectSeparate.getWarrantyStartDate()==null?"":dfs.format(projectSeparate.getWarrantyStartDate()));
+                    rowData.add(projectSeparate.getWarrantyEndDate()==null?"":dfs.format(projectSeparate.getWarrantyEndDate()));
+                    rowData.add(projectSeparate.getProjectCategorySub()==null?"":projectSeparate.getProjectCategorySub());
+                    rowData.add(projectSeparate.getRegion()==null?"":projectSeparate.getRegion());
+                    rowData.add(projectSeparate.getBu()==null?"":projectSeparate.getBu());
+                }else {
+                    rowData.add("");
+                    rowData.add("");
+                    rowData.add("");
+                    rowData.add("");
+                    rowData.add("");
+                    rowData.add("");
+                }
+                Integer status = projectVO.getStatus();
+                switch (status){
+                    case 0:rowData.add("全部");
+                        break;
+                    case 1:rowData.add("进行中");
+                        break;
+                    case 2:rowData.add("已完成");
+                        break;
+                    case 3:rowData.add("已撤销");
+                        break;
+                    case 4:rowData.add("暂停");
+                        break;
+                    default:rowData.add("");
+                    break;
+                }
+                rowData.add(projectVO.getCurrentStageName()==null?"":projectVO.getCurrentStageName());
+            }
             allList.add(rowData);
         }
 

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

@@ -1695,15 +1695,15 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             //指定查看某个部门下的,一个人可能负责多个部门
             List<Department> allMDeptList = departmentMapper.selectList(new QueryWrapper<Department>().eq("manager_id", token));
             List<DepartmentOtherManager> departmentOtherManagerList = departmentOtherManagerMapper.selectList(new QueryWrapper<DepartmentOtherManager>().eq("other_manager_id", curUser.getId()));
-            if (hasDeptWorktimePriv && curUser.getDepartmentId() != null) {
-                Department ownerDept = departmentMapper.selectById(curUser.getDepartmentId());
-                List<Integer> otherCollect = departmentOtherManagerList.stream().distinct().map(dom -> dom.getDepartmentId()).collect(Collectors.toList());
-                for (Integer integer : otherCollect) {
-                    Optional<Department> first = allDepartmentList.stream().filter(ad -> ad.getDepartmentId().equals(integer)).findFirst();
-                    if(first.isPresent()){
-                        allMDeptList.add(first.get());
-                    }
+            List<Integer> otherCollect = departmentOtherManagerList.stream().distinct().map(dom -> dom.getDepartmentId()).collect(Collectors.toList());
+            for (Integer integer : otherCollect) {
+                Optional<Department> first = allDepartmentList.stream().filter(ad -> ad.getDepartmentId().equals(integer)).findFirst();
+                if(first.isPresent()){
+                    allMDeptList.add(first.get());
                 }
+            }
+            if (hasDeptWorktimePriv && curUser.getDepartmentId() != null&& curUser.getDepartmentId()!=0) {
+                Department ownerDept = departmentMapper.selectById(curUser.getDepartmentId());
                 //要加上自己的部门，如果没有的话
                 if (!allMDeptList.stream().anyMatch(d->d.getDepartmentId().equals(ownerDept.getDepartmentId()))) {
                     allMDeptList.add(ownerDept);