seimin 1 月之前
父节点
当前提交
5ae2c92b0f

+ 2 - 2
src/app/views/new-statistics/distribution-inspection-statistics/date-quality-control-statistics/date-quality-control-statistics.component.ts

@@ -107,7 +107,7 @@ export class DateQualityControlStatisticsComponent implements OnInit, AfterViewI
107
       sum: this.pageSize,
107
       sum: this.pageSize,
108
       startDate: this.dateRange[0] || undefined,
108
       startDate: this.dateRange[0] || undefined,
109
       endDate: this.dateRange[1] || undefined,
109
       endDate: this.dateRange[1] || undefined,
110
-      hosId: this.hosId || undefined,
110
+      hosId: this.getHosId,
111
       statisticsTypeId: this.statisticsTypeId || undefined,
111
       statisticsTypeId: this.statisticsTypeId || undefined,
112
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
112
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
113
       userId: this.fieldConfig.fields.userId || undefined,
113
       userId: this.fieldConfig.fields.userId || undefined,
@@ -169,7 +169,7 @@ export class DateQualityControlStatisticsComponent implements OnInit, AfterViewI
169
     let postData:any = {
169
     let postData:any = {
170
       startDate: this.dateRange[0] || undefined,
170
       startDate: this.dateRange[0] || undefined,
171
       endDate: this.dateRange[1] || undefined,
171
       endDate: this.dateRange[1] || undefined,
172
-      hosId: this.hosId || undefined,
172
+      hosId: this.getHosId,
173
       statisticsTypeId: this.statisticsTypeId || undefined,
173
       statisticsTypeId: this.statisticsTypeId || undefined,
174
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
174
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
175
       userId: this.fieldConfig.fields.userId || undefined,
175
       userId: this.fieldConfig.fields.userId || undefined,

+ 2 - 2
src/app/views/new-statistics/distribution-inspection-statistics/department-quality-control-statistics/department-quality-control-statistics.component.ts

@@ -115,7 +115,7 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
115
       sum: this.pageSize,
115
       sum: this.pageSize,
116
       startDate: this.dateRange[0] || undefined,
116
       startDate: this.dateRange[0] || undefined,
117
       endDate: this.dateRange[1] || undefined,
117
       endDate: this.dateRange[1] || undefined,
118
-      hosId: this.hosId || undefined,
118
+      hosId: this.getHosId,
119
       buildingId: this.buildingId || undefined,
119
       buildingId: this.buildingId || undefined,
120
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
120
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
121
       userId: this.fieldConfig.fields.userId || undefined,
121
       userId: this.fieldConfig.fields.userId || undefined,
@@ -176,7 +176,7 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
176
     let postData:any = {
176
     let postData:any = {
177
       startDate: this.dateRange[0] || undefined,
177
       startDate: this.dateRange[0] || undefined,
178
       endDate: this.dateRange[1] || undefined,
178
       endDate: this.dateRange[1] || undefined,
179
-      hosId: this.hosId || undefined,
179
+      hosId: this.getHosId,
180
       buildingId: this.buildingId || undefined,
180
       buildingId: this.buildingId || undefined,
181
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
181
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
182
       userId: this.fieldConfig.fields.userId || undefined,
182
       userId: this.fieldConfig.fields.userId || undefined,

+ 2 - 2
src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-evaluate-statistics/distribution-department-evaluate-statistics.component.ts

@@ -115,7 +115,7 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
115
       sum: this.pageSize,
115
       sum: this.pageSize,
116
       startDate: this.dateRange[0] || undefined,
116
       startDate: this.dateRange[0] || undefined,
117
       endDate: this.dateRange[1] || undefined,
117
       endDate: this.dateRange[1] || undefined,
118
-      hosId: this.hosId || undefined,
118
+      hosId: this.getHosId,
119
       buildingId: this.buildingId || undefined,
119
       buildingId: this.buildingId || undefined,
120
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
120
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
121
       userId: this.fieldConfig.fields.userId || undefined,
121
       userId: this.fieldConfig.fields.userId || undefined,
@@ -176,7 +176,7 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
176
     let postData:any = {
176
     let postData:any = {
177
       startDate: this.dateRange[0] || undefined,
177
       startDate: this.dateRange[0] || undefined,
178
       endDate: this.dateRange[1] || undefined,
178
       endDate: this.dateRange[1] || undefined,
179
-      hosId: this.hosId || undefined,
179
+      hosId: this.getHosId,
180
       buildingId: this.buildingId || undefined,
180
       buildingId: this.buildingId || undefined,
181
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
181
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
182
       userId: this.fieldConfig.fields.userId || undefined,
182
       userId: this.fieldConfig.fields.userId || undefined,

+ 2 - 2
src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-source-statistics/distribution-department-source-statistics.component.ts

@@ -115,7 +115,7 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
115
       sum: this.pageSize,
115
       sum: this.pageSize,
116
       startDate: this.dateRange[0] || undefined,
116
       startDate: this.dateRange[0] || undefined,
117
       endDate: this.dateRange[1] || undefined,
117
       endDate: this.dateRange[1] || undefined,
118
-      hosId: this.hosId || undefined,
118
+      hosId: this.getHosId,
119
       buildingId: this.buildingId || undefined,
119
       buildingId: this.buildingId || undefined,
120
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
120
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
121
       userId: this.fieldConfig.fields.userId || undefined,
121
       userId: this.fieldConfig.fields.userId || undefined,
@@ -176,7 +176,7 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
176
     let postData:any = {
176
     let postData:any = {
177
       startDate: this.dateRange[0] || undefined,
177
       startDate: this.dateRange[0] || undefined,
178
       endDate: this.dateRange[1] || undefined,
178
       endDate: this.dateRange[1] || undefined,
179
-      hosId: this.hosId || undefined,
179
+      hosId: this.getHosId,
180
       buildingId: this.buildingId || undefined,
180
       buildingId: this.buildingId || undefined,
181
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
181
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
182
       userId: this.fieldConfig.fields.userId || undefined,
182
       userId: this.fieldConfig.fields.userId || undefined,

+ 2 - 2
src/app/views/new-statistics/distribution-inspection-statistics/source-statistics/source-statistics.component.ts

@@ -115,7 +115,7 @@ export class SourceStatisticsComponent implements OnInit, AfterViewInit {
115
       sum: this.pageSize,
115
       sum: this.pageSize,
116
       startDate: this.dateRange[0] || undefined,
116
       startDate: this.dateRange[0] || undefined,
117
       endDate: this.dateRange[1] || undefined,
117
       endDate: this.dateRange[1] || undefined,
118
-      hosId: this.hosId || undefined,
118
+      hosId: this.getHosId,
119
       deptId: this.deptId || undefined,
119
       deptId: this.deptId || undefined,
120
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
120
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
121
       userId: this.fieldConfig.fields.userId || undefined,
121
       userId: this.fieldConfig.fields.userId || undefined,
@@ -177,7 +177,7 @@ export class SourceStatisticsComponent implements OnInit, AfterViewInit {
177
     let postData:any = {
177
     let postData:any = {
178
       startDate: this.dateRange[0] || undefined,
178
       startDate: this.dateRange[0] || undefined,
179
       endDate: this.dateRange[1] || undefined,
179
       endDate: this.dateRange[1] || undefined,
180
-      hosId: this.hosId || undefined,
180
+      hosId: this.getHosId,
181
       deptId: this.deptId || undefined,
181
       deptId: this.deptId || undefined,
182
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
182
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
183
       userId: this.fieldConfig.fields.userId || undefined,
183
       userId: this.fieldConfig.fields.userId || undefined,

+ 2 - 2
src/app/views/new-statistics/distribution-inspection-statistics/user-quality-control-statistics/user-quality-control-statistics.component.ts

@@ -115,7 +115,7 @@ export class UserQualityControlStatisticsComponent implements OnInit, AfterViewI
115
       sum: this.pageSize,
115
       sum: this.pageSize,
116
       startDate: this.dateRange[0] || undefined,
116
       startDate: this.dateRange[0] || undefined,
117
       endDate: this.dateRange[1] || undefined,
117
       endDate: this.dateRange[1] || undefined,
118
-      hosId: this.hosId || undefined,
118
+      hosId: this.getHosId,
119
       groupId: this.groupId || undefined,
119
       groupId: this.groupId || undefined,
120
       buildingId: this.fieldConfig.fields.buildingId || undefined,
120
       buildingId: this.fieldConfig.fields.buildingId || undefined,
121
       deptId: this.fieldConfig.fields.deptId || undefined,
121
       deptId: this.fieldConfig.fields.deptId || undefined,
@@ -174,7 +174,7 @@ export class UserQualityControlStatisticsComponent implements OnInit, AfterViewI
174
     let postData:any = {
174
     let postData:any = {
175
       startDate: this.dateRange[0] || undefined,
175
       startDate: this.dateRange[0] || undefined,
176
       endDate: this.dateRange[1] || undefined,
176
       endDate: this.dateRange[1] || undefined,
177
-      hosId: this.hosId || undefined,
177
+      hosId: this.getHosId,
178
       groupId: this.groupId || undefined,
178
       groupId: this.groupId || undefined,
179
       buildingId: this.fieldConfig.fields.buildingId || undefined,
179
       buildingId: this.fieldConfig.fields.buildingId || undefined,
180
       deptId: this.fieldConfig.fields.deptId || undefined,
180
       deptId: this.fieldConfig.fields.deptId || undefined,