bugfix

src/app/views/new-statistics/components/search-more/search-more.component.ts

@@ -109,9 +109,11 @@ export class SearchMoreComponent implements OnInit {
       fields.floorDTO = this.floorList.find(item => item.id == this.validateForm.value.floorId);
     }
     if(this.fieldConfig.config.company){
+      fields.companyId = this.validateForm.value.companyId;
       fields.companyDTO = this.companyList.find(item => item.id == this.validateForm.value.companyId);
     }
     if(this.fieldConfig.config.repairDept){
+      fields.repairDeptId = this.validateForm.value.repairDeptId;
       fields.repairDeptDTO = this.repairDeptList.find(item => item.id == this.validateForm.value.repairDeptId);
     }
     this.submitEvent.emit(fields);

src/app/views/new-statistics/maintenance-statistics/building-statistics/building-statistics.component.ts

@@ -109,6 +109,7 @@ export class BuildingStatisticsComponent implements OnInit, AfterViewInit {
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
     };
     if (field && sort) {
       postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
@@ -168,6 +169,7 @@ export class BuildingStatisticsComponent implements OnInit, AfterViewInit {
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
     };
     if (this.sortCurrentKey && this.sortCurrentValue) {
       postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`

src/app/views/new-statistics/maintenance-statistics/category-source-statistics/category-source-statistics.component.ts

@@ -111,6 +111,7 @@ export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
     };
@@ -174,6 +175,7 @@ export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
     };

src/app/views/new-statistics/maintenance-statistics/consumable-statistics/consumable-statistics.component.ts

@@ -122,6 +122,7 @@ export class ConsumableStatisticsComponent implements OnInit, AfterViewInit {
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
       companyId: this.fieldConfig.fields.companyId || undefined,
@@ -187,6 +188,7 @@ export class ConsumableStatisticsComponent implements OnInit, AfterViewInit {
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
       companyId: this.fieldConfig.fields.companyId || undefined,

src/app/views/new-statistics/maintenance-statistics/department-evaluate-statistics/department-evaluate-statistics.component.ts

@@ -114,6 +114,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
     };
@@ -178,6 +179,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
     };

src/app/views/new-statistics/maintenance-statistics/department-incident-statistics/department-incident-statistics.component.ts

@@ -114,6 +114,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
     };
@@ -178,6 +179,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
     };

src/app/views/new-statistics/maintenance-statistics/department-source-statistics/department-source-statistics.component.ts

@@ -114,6 +114,7 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
     };
@@ -178,6 +179,7 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
     };

src/app/views/new-statistics/maintenance-statistics/floor-statistics/floor-statistics.component.ts

@@ -120,6 +120,7 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
       parentDutyId: this.parentDutyId || undefined,
       buildingId: this.buildingId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
     };
     if (field && sort) {
       postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
@@ -180,6 +181,7 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
       parentDutyId: this.parentDutyId || undefined,
       buildingId: this.buildingId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
     };
     if (this.sortCurrentKey && this.sortCurrentValue) {
       postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
@@ -214,7 +216,7 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
 		this.sortCurrent = {};
     this.dateRange = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')]
     this.buildingId = undefined;
-    this.fieldConfig.fields = {category123: true};
+    this.fieldConfig.fields = {categoryId: undefined};
     this.search();
   }
 

src/app/views/new-statistics/maintenance-statistics/group-statistics/group-statistics.component.ts

@@ -109,6 +109,7 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
     };
@@ -170,6 +171,7 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
     };

src/app/views/new-statistics/maintenance-statistics/tripartite-company-statistics/tripartite-company-statistics.component.ts

@@ -120,6 +120,7 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
       parentDutyId: this.parentDutyId || undefined,
       repairDeptId: this.repairDeptId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
     };
@@ -182,6 +183,7 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
       parentDutyId: this.parentDutyId || undefined,
       repairDeptId: this.repairDeptId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
     };

src/app/views/new-statistics/maintenance-statistics/user-statistics/user-statistics.component.ts

@@ -122,6 +122,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.buildingId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
     };
     if (field && sort) {
       postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
@@ -184,6 +185,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.buildingId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
     };
     if (this.sortCurrentKey && this.sortCurrentValue) {
       postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`

src/app/views/new-statistics/maintenance-statistics/work-hour-statistics/work-hour-statistics.component.ts

@@ -122,6 +122,7 @@ export class WorkHourStatisticsComponent implements OnInit, AfterViewInit {
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
       companyId: this.fieldConfig.fields.companyId || undefined,
@@ -187,6 +188,7 @@ export class WorkHourStatisticsComponent implements OnInit, AfterViewInit {
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
       companyId: this.fieldConfig.fields.companyId || undefined,