|
@@ -15723,8 +15723,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
targetDeptIds.add(7458);//研发部
|
|
|
targetDeptIds.add(7459);//生产部
|
|
|
targetDeptIds.add(7460);//工程部
|
|
|
- targetDeptIds.add(9661);//运维
|
|
|
- targetDeptIds.add(9665);//外协
|
|
|
+// targetDeptIds.add(9661);//运维
|
|
|
+// targetDeptIds.add(9665);//外协
|
|
|
//需要统计的分组名称
|
|
|
List<String> targetGroupNameList=new ArrayList<>();
|
|
|
targetGroupNameList.add("生产部电气");
|
|
@@ -15776,23 +15776,25 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
String departmentName = department.get().getDepartmentName();
|
|
|
switch (deptId){
|
|
|
case 7459:
|
|
|
- groupNames=targetGroupNameList;
|
|
|
+ groupNames=new ArrayList<>();
|
|
|
+ groupNames.add("生产部电气");
|
|
|
+ groupNames.add("生产部车间");
|
|
|
extracted(project, groupNames, taskGroupList, corpwxDeptid, departmentName, resultList, percentFormat, itemList);
|
|
|
break;
|
|
|
case 7460:
|
|
|
- groupNames=targetGroupNameList;
|
|
|
+ groupNames=new ArrayList<>();
|
|
|
+ groupNames.add("工程部现场安装施工");
|
|
|
+ groupNames.add("工程部配合调试");
|
|
|
extracted(project, groupNames, taskGroupList, corpwxDeptid, departmentName, resultList, percentFormat, itemList);
|
|
|
break;
|
|
|
case 7458:
|
|
|
- groupNames=targetGroupNameList;
|
|
|
- extracted(project, groupNames, taskGroupList, corpwxDeptid, departmentName, resultList, percentFormat, itemList);
|
|
|
- break;
|
|
|
- case 9661:
|
|
|
- groupNames=targetGroupNameList;
|
|
|
- extracted(project, groupNames, taskGroupList, corpwxDeptid, departmentName, resultList, percentFormat, itemList);
|
|
|
- break;
|
|
|
- case 9665:
|
|
|
- groupNames=targetGroupNameList;
|
|
|
+ groupNames=new ArrayList<>();
|
|
|
+ groupNames.add("研发部工艺设计");
|
|
|
+ groupNames.add("研发部结构设计");
|
|
|
+ groupNames.add("研发部BIM设计");
|
|
|
+ groupNames.add("研发部电气设计");
|
|
|
+ groupNames.add("研发部工艺调试验收");
|
|
|
+ groupNames.add("研发部电气调试验收");
|
|
|
extracted(project, groupNames, taskGroupList, corpwxDeptid, departmentName, resultList, percentFormat, itemList);
|
|
|
break;
|
|
|
}
|