|
@@ -13277,8 +13277,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
//需要统计的部门
|
|
//需要统计的部门
|
|
|
List<Integer> targetDeptIds=new ArrayList<>();
|
|
List<Integer> targetDeptIds=new ArrayList<>();
|
|
|
targetDeptIds.add(7458);
|
|
targetDeptIds.add(7458);
|
|
|
- targetDeptIds.add(7459);
|
|
|
|
|
- targetDeptIds.add(7460);
|
|
|
|
|
|
|
+ targetDeptIds.add(8696);
|
|
|
|
|
+ targetDeptIds.add(8695);
|
|
|
//需要统计的分组名称
|
|
//需要统计的分组名称
|
|
|
List<String> targetGroupNameList=new ArrayList<>();
|
|
List<String> targetGroupNameList=new ArrayList<>();
|
|
|
targetGroupNameList.add("生产部电气");
|
|
targetGroupNameList.add("生产部电气");
|
|
@@ -13309,8 +13309,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
if(user.getCompanyId()==3092){
|
|
if(user.getCompanyId()==3092){
|
|
|
List<String> nameString=new ArrayList<>();
|
|
List<String> nameString=new ArrayList<>();
|
|
|
nameString.add("4");
|
|
nameString.add("4");
|
|
|
- nameString.add("12");
|
|
|
|
|
- nameString.add("14");
|
|
|
|
|
|
|
+ nameString.add("46");
|
|
|
|
|
+ nameString.add("45");
|
|
|
List<Department> departmentList = departmentMapper.selectList(new LambdaQueryWrapper<Department>().eq(Department::getCompanyId, user.getCompanyId()).in(Department::getDepartmentName, nameString));
|
|
List<Department> departmentList = departmentMapper.selectList(new LambdaQueryWrapper<Department>().eq(Department::getCompanyId, user.getCompanyId()).in(Department::getDepartmentName, nameString));
|
|
|
List<Integer> theCollect = departmentList.stream().map(dm -> dm.getDepartmentId()).distinct().collect(Collectors.toList());
|
|
List<Integer> theCollect = departmentList.stream().map(dm -> dm.getDepartmentId()).distinct().collect(Collectors.toList());
|
|
|
theCollect.add(-1);
|
|
theCollect.add(-1);
|
|
@@ -13351,7 +13351,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
String departmentName = department.get().getDepartmentName();
|
|
String departmentName = department.get().getDepartmentName();
|
|
|
List<Integer> subDeptIds;
|
|
List<Integer> subDeptIds;
|
|
|
switch (deptId){
|
|
switch (deptId){
|
|
|
- case 7459:
|
|
|
|
|
|
|
+ case 8696:
|
|
|
//获取此部门下的子部门id列表
|
|
//获取此部门下的子部门id列表
|
|
|
subDeptIds = getBranchDepartment(deptId, allDeptList);
|
|
subDeptIds = getBranchDepartment(deptId, allDeptList);
|
|
|
groupNames=new ArrayList<>();
|
|
groupNames=new ArrayList<>();
|
|
@@ -13406,7 +13406,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
itemList.add(item);
|
|
itemList.add(item);
|
|
|
}
|
|
}
|
|
|
break;
|
|
break;
|
|
|
- case 7460:
|
|
|
|
|
|
|
+ case 8695:
|
|
|
//获取此部门下的子部门id列表
|
|
//获取此部门下的子部门id列表
|
|
|
subDeptIds = getBranchDepartment(deptId, allDeptList);
|
|
subDeptIds = getBranchDepartment(deptId, allDeptList);
|
|
|
groupNames=new ArrayList<>();
|
|
groupNames=new ArrayList<>();
|
Min