增加人员筛选

src/app/views/new-statistics/distribution-inspection-statistics/distribution-synthesize-statistics/distribution-synthesize-statistics.component.html

@@ -155,7 +155,7 @@
               </nz-option>
             </nz-select>
           </div>
-          <div class="more" *ngIf="showMore('dateQualityControlStatistics')" (click)="toPath('/newStatistics/distributionInspectionStatistics/dateQualityControlStatistics')">更多></div>
+          <div class="more" *ngIf="showMore(activeIndex == 'hour' ? 'hourQualityControlStatistics' : 'dateQualityControlStatistics')" (click)="toPath(activeIndex == 'hour' ? '/newStatistics/distributionInspectionStatistics/hourQualityControlStatistics' : '/newStatistics/distributionInspectionStatistics/dateQualityControlStatistics')">更多></div>
         </div>
         <div class="echarts-repairs">
           <div echarts class="echarts" [options]='trendOptions'></div>

src/app/views/new-statistics/distribution-inspection-statistics/user-business-statistics/user-business-statistics.component.html

@@ -6,10 +6,10 @@
       </nz-range-picker>
     </div>
     <div class="searchDataItem">
-      <span class="label">分组</span>：
-      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeGroupInp($event)" nzAllowClear nzPlaceHolder="请选择分组" [(ngModel)]="groupId" (nzOpenChange)="openChangeGroup($event)">
-        <ng-container *ngFor="let option of groupList">
-          <nz-option *ngIf="!isLoading" [nzLabel]="option.groupName" [nzValue]="option.id"></nz-option>
+      <span class="label">人员</span>：
+      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeUserInp($event)" nzAllowClear nzPlaceHolder="请选择人员" [(ngModel)]="userId" (nzOpenChange)="openChangeUser($event)">
+        <ng-container *ngFor="let option of userList">
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
         </ng-container>
         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -24,7 +24,8 @@
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>
   </div>
 </div>
-<div class="moreFilter" *ngIf="fieldConfig.fields.buildingDTO || fieldConfig.fields.deptDTO">
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.deptDTO">
+  <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
   <span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
   <span>{{fieldConfig.fields.deptDTO?.dept}}</span>
 </div>

src/app/views/new-statistics/distribution-inspection-statistics/user-business-statistics/user-business-statistics.component.ts

@@ -27,7 +27,7 @@ export class UserBusinessStatisticsComponent implements OnInit, AfterViewInit {
   listLength: number = 0; //表格总数据量
   widthConfig: any[] = [];
 
-  groupId;//分组id
+  userId;//人员id
 
   searchTimerSubject = new Subject();
 
@@ -63,7 +63,7 @@ export class UserBusinessStatisticsComponent implements OnInit, AfterViewInit {
   }
 
   get getMoreFilter(){
-    let flag = this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.deptDTO;
+    let flag = this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.deptDTO || this.fieldConfig.fields.groupDTO;
     return flag ? 37 : 0;
   }
 
@@ -127,8 +127,9 @@ export class UserBusinessStatisticsComponent implements OnInit, AfterViewInit {
         endDate: this.dateRange[1] || undefined,
         hosId: this.getHosId,
         buildingId: this.fieldConfig.fields.buildingId || undefined,
+        groupId: this.fieldConfig.fields.groupId || undefined,
         deptId: this.fieldConfig.fields.deptId || undefined,
-        groupId: this.groupId || undefined,
+        userId: this.userId || undefined,
       };
       if (field && sort) {
         postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
@@ -187,8 +188,9 @@ export class UserBusinessStatisticsComponent implements OnInit, AfterViewInit {
       endDate: this.dateRange[1] || undefined,
       hosId: this.getHosId,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
+      groupId: this.fieldConfig.fields.groupId || undefined,
       deptId: this.fieldConfig.fields.deptId || undefined,
-      groupId: this.groupId || undefined,
+      userId: this.userId || undefined,
     };
     if (this.sortCurrentKey && this.sortCurrentValue) {
       postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
@@ -222,14 +224,14 @@ export class UserBusinessStatisticsComponent implements OnInit, AfterViewInit {
 		this.sortCurrentValue = "";
 		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.groupId = undefined;
-    this.fieldConfig.fields = {buildingId: undefined, deptId: undefined};
+    this.userId = undefined;
+    this.fieldConfig.fields = {buildingId: undefined, deptId: undefined, groupId: undefined};
     this.search();
   }
 
-  // 分组搜索
-  changeGroupInp(e) {
-    this.searchTimer(this.getGroupList, e);
+  // 人员搜索
+  changeUserInp(e) {
+    this.searchTimer(this.getUserList, e);
   }
 
   // 防抖
@@ -239,35 +241,35 @@ export class UserBusinessStatisticsComponent implements OnInit, AfterViewInit {
     this.searchTimerSubject.next([fun, e]);
   }
 
-  openChangeGroup(flag){
-    flag && this.getGroupList();
+  openChangeUser(flag){
+    flag && this.getUserList();
   }
 
-  // 获取分组列表
-  groupList:any[] = [];
-  getGroupList(keyword?) {
-    let data = {
-      group2: {
-        statisticalHosId: this.getHosId,
-        groupName: keyword,
-        type: 1,
-      },
+  // 获取人员列表
+  userList:any[] = [];
+  getUserList(keyword?) {
+    let postData: any = {
       idx: 0,
       sum: 20,
+      user: {
+        name: keyword,
+        simpleQuery: true,
+        statisticalHosId: this.getHosId,
+      },
     };
     this.isLoading = true;
     this.mainService
-      .getFetchDataList("data", "group2", data)
+      .getFetchDataList("simple/data", "user", postData)
       .subscribe((data) => {
         this.isLoading = false;
-        this.groupList = data.list;
+        this.userList = data.list;
       });
   }
 
   // 详细搜索
   fieldConfig:any = {
-    fields: {buildingId: undefined, deptId: undefined},
-    config: {building: true, dept: true},
+    fields: {buildingId: undefined, deptId: undefined, groupId: undefined},
+    config: {building: true, dept: true, group: undefined},
   }
   showSearchMore:boolean = false;
   showMore(){

src/app/views/new-statistics/distribution-inspection-statistics/user-quality-control-statistics/user-quality-control-statistics.component.html

@@ -6,10 +6,10 @@
       </nz-range-picker>
     </div>
     <div class="searchDataItem">
-      <span class="label">分组</span>：
-      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeGroupInp($event)" nzAllowClear nzPlaceHolder="请选择分组" [(ngModel)]="groupId" (nzOpenChange)="openChangeGroup($event)">
-        <ng-container *ngFor="let option of groupList">
-          <nz-option *ngIf="!isLoading" [nzLabel]="option.groupName" [nzValue]="option.id"></nz-option>
+      <span class="label">人员</span>：
+      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeUserInp($event)" nzAllowClear nzPlaceHolder="请选择人员" [(ngModel)]="userId" (nzOpenChange)="openChangeUser($event)">
+        <ng-container *ngFor="let option of userList">
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
         </ng-container>
         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -24,7 +24,8 @@
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>
   </div>
 </div>
-<div class="moreFilter" *ngIf="fieldConfig.fields.buildingDTO || fieldConfig.fields.deptDTO">
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.deptDTO">
+  <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
   <span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
   <span>{{fieldConfig.fields.deptDTO?.dept}}</span>
 </div>

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

@@ -25,7 +25,7 @@ export class UserQualityControlStatisticsComponent implements OnInit, AfterViewI
   pageSize: number = 30; //表格每页展示条数
   listLength: number = 0; //表格总数据量
 
-  groupId;//分组id
+  userId;//人员id
 
   searchTimerSubject = new Subject();
 
@@ -61,7 +61,7 @@ export class UserQualityControlStatisticsComponent implements OnInit, AfterViewI
   }
 
   get getMoreFilter(){
-    let flag = this.fieldConfig.fields.userDTO || this.fieldConfig.fields.deptDTO || this.fieldConfig.fields.buildingDTO;
+    let flag = this.fieldConfig.fields.userDTO || this.fieldConfig.fields.deptDTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.groupDTO;
     return flag ? 37 : 0;
   }
 
@@ -116,8 +116,9 @@ export class UserQualityControlStatisticsComponent implements OnInit, AfterViewI
       startDate: this.dateRange[0] || undefined,
       endDate: this.dateRange[1] || undefined,
       hosId: this.getHosId,
-      groupId: this.groupId || undefined,
+      userId: this.userId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
+      groupId: this.fieldConfig.fields.groupId || undefined,
       deptId: this.fieldConfig.fields.deptId || undefined,
     };
     if (field && sort) {
@@ -175,8 +176,9 @@ export class UserQualityControlStatisticsComponent implements OnInit, AfterViewI
       startDate: this.dateRange[0] || undefined,
       endDate: this.dateRange[1] || undefined,
       hosId: this.getHosId,
-      groupId: this.groupId || undefined,
+      userId: this.userId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
+      groupId: this.fieldConfig.fields.groupId || undefined,
       deptId: this.fieldConfig.fields.deptId || undefined,
     };
     if (this.sortCurrentKey && this.sortCurrentValue) {
@@ -211,14 +213,14 @@ export class UserQualityControlStatisticsComponent implements OnInit, AfterViewI
 		this.sortCurrentValue = "";
 		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.groupId = undefined;
-    this.fieldConfig.fields = {buildingId: undefined, deptId: undefined};
+    this.userId = undefined;
+    this.fieldConfig.fields = {buildingId: undefined, deptId: undefined, groupId: undefined};
     this.search();
   }
 
-  // 楼栋搜索
-  changeGroupInp(e) {
-    this.searchTimer(this.getGroupList, e);
+  // 人员搜索
+  changeUserInp(e) {
+    this.searchTimer(this.getUserList, e);
   }
 
   // 防抖
@@ -228,35 +230,35 @@ export class UserQualityControlStatisticsComponent implements OnInit, AfterViewI
     this.searchTimerSubject.next([fun, e]);
   }
 
-  openChangeGroup(flag){
-    flag && this.getGroupList();
+  openChangeUser(flag){
+    flag && this.getUserList();
   }
 
-  // 获取分组列表
-  groupList:any[] = [];
-  getGroupList(keyword?) {
-    let data = {
-      group2: {
-        statisticalHosId: this.getHosId,
-        groupName: keyword,
-        type: 1,
-      },
+  // 获取人员列表
+  userList:any[] = [];
+  getUserList(keyword?) {
+    let postData: any = {
       idx: 0,
       sum: 20,
+      user: {
+        name: keyword,
+        simpleQuery: true,
+        statisticalHosId: this.getHosId,
+      },
     };
     this.isLoading = true;
     this.mainService
-      .getFetchDataList("data", "group2", data)
+      .getFetchDataList("simple/data", "user", postData)
       .subscribe((data) => {
         this.isLoading = false;
-        this.groupList = data.list;
+        this.userList = data.list;
       });
   }
 
   // 详细搜索
   fieldConfig:any = {
-    fields: {buildingId: undefined, deptId: undefined},
-    config: {building: true, dept: true},
+    fields: {buildingId: undefined, deptId: undefined, groupId: undefined},
+    config: {building: true, dept: true, group: true},
   }
   showSearchMore:boolean = false;
   showMore(){

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

@@ -2,10 +2,10 @@
   <div class="searchData">
     <app-custom-change-date #customChangeDate [isShowType]="false"></app-custom-change-date>
     <div class="searchDataItem">
-      <span class="label">维修分组</span>：
-      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeGroupInp($event)" nzAllowClear nzPlaceHolder="请选择维修分组" [(ngModel)]="groupId" (nzOpenChange)="openChangeGroup($event)">
-        <ng-container *ngFor="let option of groupList">
-          <nz-option *ngIf="!isLoading" [nzLabel]="option.groupName" [nzValue]="option.id"></nz-option>
+      <span class="label">维修人员</span>：
+      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeUserInp($event)" nzAllowClear nzPlaceHolder="请选择维修人员" [(ngModel)]="userId" (nzOpenChange)="openChangeUser($event)">
+        <ng-container *ngFor="let option of userList">
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
         </ng-container>
         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -20,7 +20,8 @@
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>
   </div>
 </div>
-<div class="moreFilter" *ngIf="fieldConfig.fields.buildingDTO || fieldConfig.fields.floorDTO || fieldConfig.fields.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO">
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.floorDTO || fieldConfig.fields.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO">
+  <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
   <span>{{fieldConfig.fields.category1DTO?.category}}</span>
   <span>{{fieldConfig.fields.category2DTO?.category}}</span>
   <span>{{fieldConfig.fields.category3DTO?.category}}</span>

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

@@ -26,7 +26,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
   pageSize: number = 30; //表格每页展示条数
   listLength: number = 0; //表格总数据量
 
-  groupId;//维修分组id
+  userId;//维修人员id
 
   searchTimerSubject = new Subject();
 
@@ -65,7 +65,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
   }
 
   get getMoreFilter(){
-    let flag = this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO;
+    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO;
     return flag ? 37 : 0;
   }
 
@@ -122,11 +122,12 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
-      groupId: this.groupId || undefined,
+      userId: this.userId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
       hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+      groupId: this.fieldConfig.fields.groupId || undefined,
     };
     if (field && sort) {
       postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
@@ -173,11 +174,12 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
-      groupId: this.groupId || undefined,
+      userId: this.userId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
       hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+      groupId: this.fieldConfig.fields.groupId || undefined,
     };
     if (this.sortCurrentKey && this.sortCurrentValue) {
       postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
@@ -211,15 +213,15 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
     this.dateRange = []
-    this.groupId = undefined;
-    this.fieldConfig.fields = {buildingId: undefined, floorId: undefined, categoryId: undefined};
+    this.userId = undefined;
+    this.fieldConfig.fields = {buildingId: undefined, floorId: undefined, categoryId: undefined, groupId: undefined};
     this.customChangeDateComponent.resetByDate();
     this.search();
   }
 
-  // 维修分组搜索
-  changeGroupInp(e) {
-    this.searchTimer(this.getGroupList, e);
+  // 维修人员搜索
+  changeUserInp(e) {
+    this.searchTimer(this.getUserList, e);
   }
 
   // 防抖
@@ -229,35 +231,37 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
     this.searchTimerSubject.next([fun, e]);
   }
 
-  openChangeGroup(flag){
-    flag && this.getGroupList();
+  openChangeUser(flag){
+    flag && this.getUserList();
   }
 
-  // 获取维修分组列表
-  groupList:any[] = [];
-  getGroupList(keyword?) {
+  // 获取维修人员列表
+  userList:any[] = [];
+  getUserList(keyword?) {
     let data = {
-      group2: {
+      user: {
+        name: keyword,
+        simpleQuery: true,
         statisticalHosId: this.getHosId,
-        groupName: keyword,
-        type: 3,
+        roleCodes: 'first-line support,second-line support,incident manager',
+        engineer: 1,
       },
       idx: 0,
       sum: 20,
     };
     this.isLoading = true;
     this.mainService
-      .getFetchDataList("data", "group2", data)
+      .getFetchDataList("simple/data", "user", data)
       .subscribe((data) => {
         this.isLoading = false;
-        this.groupList = data.list;
+        this.userList = data.list;
       });
   }
 
   // 详细搜索
   fieldConfig:any = {
-    fields: {buildingId: undefined, floorId: undefined, categoryId: undefined},
-    config: {buildingAndFloor: true, category123: true},
+    fields: {buildingId: undefined, floorId: undefined, categoryId: undefined, groupId: undefined},
+    config: {buildingAndFloor: true, category123: true, group: true},
   }
   showSearchMore:boolean = false;
   showMore(){