新增统计

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

@@ -4,6 +4,20 @@
     </div>
     <div class="content">
       <form nz-form [formGroup]="validateForm" class="addForm">
+        <nz-form-item [hidden]="!fieldConfig.config.group">
+          <nz-form-label [nzSpan]="6" nzFor="groupId">分<span style="visibility: hidden;">囧囧</span>组</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择分组!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeGroupInp($event)" formControlName="groupId" nzPlaceHolder="请选择分组" (nzOpenChange)="openChangeGroup($event)" (ngModelChange)="changeGroup($event)">
+              <ng-container *ngFor="let option of groupList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.groupName" [nzValue]="option.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+
         <nz-form-item [hidden]="!fieldConfig.config.groupAndUser">
           <nz-form-label [nzSpan]="6" nzFor="groupId">分<span style="visibility: hidden;">囧囧</span>组</nz-form-label>
           <nz-form-control [nzSpan]="18" nzErrorTip="请选择分组!">

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

@@ -66,6 +66,11 @@ export class DistributionSearchMoreComponent implements OnInit {
     if (this.validateForm.invalid) return;
 
     let fields:any = {}
+    if(this.fieldConfig.config.group){
+      fields.groupId = this.validateForm.value.groupId;
+      fields.groupDTO = this.groupList.find(item => item.id == this.validateForm.value.groupId);
+    }
+
     if(this.fieldConfig.config.groupAndUser){
       fields.groupId = this.validateForm.value.groupId;
       fields.groupDTO = this.groupList.find(item => item.id == this.validateForm.value.groupId);

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

@@ -4,6 +4,34 @@
     </div>
     <div class="content">
       <form nz-form [formGroup]="validateForm" class="addForm">
+        <nz-form-item [hidden]="!fieldConfig.config.workHourParent">
+          <nz-form-label [nzSpan]="6" nzFor="workHourParentId">工时大类</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择工时大类!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeWorkHourParentInp($event)" formControlName="workHourParentId" nzPlaceHolder="请选择工时大类" (nzOpenChange)="openChangeWorkHourParent($event)" (ngModelChange)="setIsSelecting(true)">
+              <ng-container *ngFor="let option of workHourParentList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.workName" [nzValue]="option.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+
+        <nz-form-item [hidden]="!fieldConfig.config.group">
+          <nz-form-label [nzSpan]="6" nzFor="groupId">维修分组</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择维修分组!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeGroupInp($event)" formControlName="groupId" nzPlaceHolder="请选择维修分组" (nzOpenChange)="openChangeGroup($event)" (ngModelChange)="changeGroup($event)">
+              <ng-container *ngFor="let option of groupList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.groupName" [nzValue]="option.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+
         <nz-form-item [hidden]="!fieldConfig.config.groupAndUser">
           <nz-form-label [nzSpan]="6" nzFor="groupId">维修分组</nz-form-label>
           <nz-form-control [nzSpan]="18" nzErrorTip="请选择维修分组!">
@@ -143,7 +171,7 @@
             </nz-select>
           </nz-form-control>
         </nz-form-item>
-				
+
 				<nz-form-item [hidden]="!fieldConfig.config.deptType">
 				  <nz-form-label [nzSpan]="6" nzFor="deptTypeId">科室类型</nz-form-label>
 				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择科室类型!">

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

@@ -50,9 +50,10 @@ export class SearchMoreComponent implements OnInit {
     this.buildingList = this.fieldConfig.fields.buildingDTO ? [this.fieldConfig.fields.buildingDTO] : [];
     this.floorList = this.fieldConfig.fields.floorDTO ? [this.fieldConfig.fields.floorDTO] : [];
     this.companyList = this.fieldConfig.fields.companyDTO ? [this.fieldConfig.fields.companyDTO] : [];
+    this.workHourParentList = this.fieldConfig.fields.workHourParentDTO ? [this.fieldConfig.fields.workHourParentDTO] : [];
     this.repairDeptList = this.fieldConfig.fields.repairDeptDTO ? [this.fieldConfig.fields.repairDeptDTO] : [];
 		this.deptTypeList = this.fieldConfig.fields.deptTypeDTO ? [this.fieldConfig.fields.deptTypeDTO] : [];
-		 
+
     this.validateForm = this.fb.group({
       groupId: [this.fieldConfig.fields.groupId || null],
       userId: [this.fieldConfig.fields.userId === undefined ? null : this.fieldConfig.fields.userId],
@@ -63,6 +64,7 @@ export class SearchMoreComponent implements OnInit {
       buildingId: [this.fieldConfig.fields.buildingId || null],
       floorId: [this.fieldConfig.fields.floorId === undefined ? null : this.fieldConfig.fields.floorId],
       companyId: [this.fieldConfig.fields.companyDTO ? this.fieldConfig.fields.companyDTO.id  : null],
+      workHourParentId: [this.fieldConfig.fields.workHourParentDTO ? this.fieldConfig.fields.workHourParentDTO.id  : null],
       repairDeptId: [this.fieldConfig.fields.repairDeptDTO ? this.fieldConfig.fields.repairDeptDTO.id  : null],
 			deptTypeId: [this.fieldConfig.fields.deptTypeId || null],
 		});
@@ -87,6 +89,11 @@ export class SearchMoreComponent implements OnInit {
       hierarchy = 1;
     }
     let fields:any = {}
+    if(this.fieldConfig.config.group){
+      fields.groupId = this.validateForm.value.groupId;
+      fields.groupDTO = this.groupList.find(item => item.id == this.validateForm.value.groupId);
+    }
+
     if(this.fieldConfig.config.groupAndUser){
       fields.groupId = this.validateForm.value.groupId;
       fields.groupDTO = this.groupList.find(item => item.id == this.validateForm.value.groupId);
@@ -114,6 +121,10 @@ export class SearchMoreComponent implements OnInit {
       fields.companyId = this.validateForm.value.companyId;
       fields.companyDTO = this.companyList.find(item => item.id == this.validateForm.value.companyId);
     }
+    if(this.fieldConfig.config.workHourParent){
+      fields.workHourParentId = this.validateForm.value.workHourParentId;
+      fields.workHourParentDTO = this.workHourParentList.find(item => item.id == this.validateForm.value.workHourParentId);
+    }
     if(this.fieldConfig.config.repairDept){
       fields.repairDeptId = this.validateForm.value.repairDeptId;
       fields.repairDeptDTO = this.repairDeptList.find(item => item.id == this.validateForm.value.repairDeptId);
@@ -122,7 +133,7 @@ export class SearchMoreComponent implements OnInit {
 		  fields.deptTypeId = this.validateForm.value.deptTypeId;
 		  fields.deptTypeDTO = this.deptTypeList.find(item => item.id == this.validateForm.value.deptTypeId);
 		}
-		
+
     this.submitEvent.emit(fields);
     this.hideModal();
   }
@@ -188,14 +199,14 @@ export class SearchMoreComponent implements OnInit {
     this.validateForm.controls.userId.setValue(null);
     this.getUserList();
   }
-	
+
 	// =================科室类型===================
-	
+
 	// 科室类型
 	openChangeDeptType(flag){
 	  flag && this.getDeptTypeList();
 	}
-	
+
 	// 获取科室类型列表
 	deptTypeList:any[] = [];
 	getDeptTypeList(keyword?) {
@@ -207,7 +218,7 @@ export class SearchMoreComponent implements OnInit {
 	      this.deptTypeList = data;
 	    });
 	}
-	
+
   // =================维修人员===================
 
   // 维修人员搜索
@@ -529,4 +540,38 @@ export class SearchMoreComponent implements OnInit {
     flag && this.setIsSelecting(false);
     flag && this.getRepairDeptList();
   }
+
+  // =================工时大类===================
+
+  // 工时大类搜索
+  changeWorkHourParentInp(e) {
+    this.searchTimer(this.getWorkHourParentList, e);
+  }
+
+  // 获取工时大类列表
+  workHourParentList:any[] = [];
+  getWorkHourParentList(keyword?){
+    let postData: any = {
+      idx: 0,
+      sum: 20,
+      workHourManagement: {
+        keyWords: keyword,
+        treeLevel: 1,
+        statisticalHosId: this.getHosId,
+      },
+    };
+    this.isLoading = true;
+    this.mainService.getFetchDataList("simple/data", "workHourManagement", postData).subscribe(result => {
+      this.isLoading = false;
+      if(result.status == 200){
+        this.workHourParentList = result.list || [];
+      }else{
+        this.workHourParentList = [];
+      }
+    });
+  }
+  openChangeWorkHourParent(flag){
+    flag && this.setIsSelecting(false);
+    flag && this.getWorkHourParentList();
+  }
 }

src/app/views/new-statistics/distribution-inspection-statistics/distribution-inspection-statistics-routing.module.ts

@@ -116,6 +116,24 @@ const routes: Routes = [
 			    title: '配-任务类型质控统计'
 			  }
 			},
+			{
+			  // 人员评价统计
+			  path: 'distributionUserEvaluateStatistics',
+			  loadChildren: () => import('./distribution-user-evaluate-statistics/distribution-user-evaluate-statistics.module').then(m => m.DistributionUserEvaluateStatisticsModule),
+			  data: {
+			    reuse: true,
+			    title: '配-人员评价统计'
+			  }
+			},
+      {
+			  // 24小时质控统计
+			  path: 'hourQualityControlStatistics',
+			  loadChildren: () => import('./hour-quality-control-statistics/hour-quality-control-statistics.module').then(m => m.HourQualityControlStatisticsModule),
+			  data: {
+			    reuse: true,
+			    title: '配-24小时质控统计'
+			  }
+			},
     ]
   }
 ];

src/app/views/new-statistics/distribution-inspection-statistics/distribution-user-evaluate-statistics/distribution-user-evaluate-statistics-routing.module.ts

@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { DistributionUserEvaluateStatisticsComponent } from './distribution-user-evaluate-statistics.component';
+
+
+const routes: Routes = [
+  { path: '', component: DistributionUserEvaluateStatisticsComponent }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class DistributionUserEvaluateStatisticsRoutingModule { }

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

@@ -0,0 +1,79 @@
+<div class="searchDataWrap">
+  <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)="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> 搜索中...
+        </nz-option>
+      </nz-select>
+    </div>
+  </div>
+  <div class="operation">
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
+    <button nz-button class="btn default" (click)="search()">查询</button>
+    <button nz-button class="btn default ml8" (click)="reset()">重置</button>
+    <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>
+  </div>
+</div>
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.deptDTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.taskTypeDTO || fieldConfig.fields.statisticsTypeDTO">
+  <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
+  <span>{{fieldConfig.fields.statisticsTypeDTO?.name}}</span>
+  <span>{{fieldConfig.fields.taskTypeDTO?.taskName}}</span>
+	<span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
+  <span>{{fieldConfig.fields.deptDTO?.dept}}</span>
+</div>
+<nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
+  <thead (nzSortChange)="sort($event)" nzSingleSort>
+    <tr>
+      <th nzWidth="12%">人员姓名(工号)</th>
+      <th nzWidth="11%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
+      <th nzWidth="11%" nzShowSort nzSortKey="evaCount" [(nzSort)]="sortCurrent.evaCount">评价总工单数</th>
+      <th nzWidth="11%" nzShowSort nzSortKey="eva1" [(nzSort)]="sortCurrent.eva1">一星评价数</th>
+      <th nzWidth="11%" nzShowSort nzSortKey="eva2" [(nzSort)]="sortCurrent.eva2">二星评价数</th>
+      <th nzWidth="11%" nzShowSort nzSortKey="eva3" [(nzSort)]="sortCurrent.eva3">三星评价数</th>
+      <th nzWidth="11%" nzShowSort nzSortKey="eva4" [(nzSort)]="sortCurrent.eva4">四星评价数</th>
+      <th nzWidth="11%" nzShowSort nzSortKey="eva5" [(nzSort)]="sortCurrent.eva5">五星评价数</th>
+      <th nzWidth="11%" nzShowSort nzSortKey="avgCount" [(nzSort)]="sortCurrent.avgCount">平均总星级</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr *ngFor="let data of listOfData">
+      <td>{{ data.userName }}<ng-container *ngIf="data.userAccount">({{ data.userAccount }})</ng-container></td>
+      <td>{{ data.totalCount }}</td>
+      <td>{{ data.evaCount }}</td>
+      <td>{{ data.eva1 }}</td>
+      <td>{{ data.eva2 }}</td>
+      <td>{{ data.eva3 }}</td>
+      <td>{{ data.eva4 }}</td>
+      <td>{{ data.eva5 }}</td>
+      <td>{{ data.avgCount }}</td>
+    </tr>
+  </tbody>
+  <ng-template #footerTpl>
+    <table class="footTable">
+      <tr *ngFor="let data of listOfDataEnd">
+        <td style="width: 12%">{{ data.userName }}</td>
+        <td style="width: 11%">{{ data.totalCount }}</td>
+        <td style="width: 11%">{{ data.evaCount }}</td>
+        <td style="width: 11%">{{ data.eva1 }}</td>
+        <td style="width: 11%">{{ data.eva2 }}</td>
+        <td style="width: 11%">{{ data.eva3 }}</td>
+        <td style="width: 11%">{{ data.eva4 }}</td>
+        <td style="width: 11%">{{ data.eva5 }}</td>
+        <td style="width: 11%">{{ data.avgCount }}</td>
+      </tr>
+    </table>
+  </ng-template>
+</nz-table>
+<div class="pagination">
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
+</div>
+
+<!-- 详细搜索 -->
+<app-distribution-search-more [fieldConfig]="fieldConfig" *ngIf="showSearchMore" [hosId]="hosId" [queryType]="queryType"  [dutyId]="dutyId"  [parentDutyId]="parentDutyId" (cancelEvent)="cancelEvent()" (submitEvent)="submitEvent($event)"></app-distribution-search-more>

src/app/views/new-statistics/distribution-inspection-statistics/distribution-user-evaluate-statistics/distribution-user-evaluate-statistics.component.less

@@ -0,0 +1,71 @@
+@import "../../../../../../src/theme.less";
+:host{
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  ::ng-deep .ant-table-footer{
+    padding: 16px 0;
+    width: calc(100% - 15px);
+    font-weight: bold;
+  }
+  tr, th{
+    text-align: center;
+  }
+  .searchDataWrap{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    .searchData{
+      padding: 16px;
+      display: flex;
+      align-items: center;
+      .searchDataItem{
+        margin-right: 24px;
+        .label{
+          font-size: 16px;
+        }
+        .selectItem{
+          width: 160px;
+        }
+      }
+    }
+    .operation{
+      margin-right: 16px;
+      display: flex;
+      align-items: center;
+      cursor: pointer;
+      .icon_transport{
+        margin-right: 16px;
+        font-size: 24px;
+      }
+      .btn{
+        &.default{
+          height: 32px;
+          line-height: 32px;
+          min-width: 70px;
+        }
+      }
+    }
+  }
+
+  .table{
+    margin: 0 8px;
+  }
+
+  .moreFilter{
+    margin-bottom: 16px;
+    span{
+      margin-left: 16px;
+      color: @primary-color;
+    }
+  }
+
+  .pagination{
+    padding: 16px;
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+  }
+}

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

@@ -0,0 +1,278 @@
+import { TabService } from './../../services/tab.service';
+import { debounceTime } from 'rxjs/operators';
+import { Subject } from 'rxjs';
+import { NzMessageService } from 'ng-zorro-antd/message';
+import { Component, OnInit, HostListener, AfterViewInit, ViewChild } from "@angular/core";
+import { MainService } from 'src/app/services/main.service';
+import { ActivatedRoute } from '@angular/router';
+import { ToolService } from "../../../../services/tool.service";
+import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
+@Component({
+  selector: "app-distribution-user-evaluate-statistics",
+  templateUrl: "./distribution-user-evaluate-statistics.component.html",
+  styleUrls: ["./distribution-user-evaluate-statistics.component.less"],
+})
+export class DistributionUserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
+  constructor(
+    private mainService: MainService,
+    private message: NzMessageService,
+    private route: ActivatedRoute,
+    private tabService: TabService,
+		private tool: ToolService,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+  listOfDataEnd: any[] = []; //表格合计
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 30; //表格每页展示条数
+  listLength: number = 0; //表格总数据量
+
+  userId;//人员id
+
+  searchTimerSubject = new Subject();
+
+  ngOnInit() {
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+  }
+
+  ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    setTimeout(() => {
+      this.search();
+    }, 0)
+    this.onResize();
+  }
+
+  tableHeight:number = 0;
+  @HostListener('window:resize')
+  onResize(): void {
+    setTimeout(() => {
+      this.tableHeight = window.innerHeight - (document.querySelector('.searchDataWrap') as HTMLElement).offsetHeight - 64 - 36 - 48 - 8 - (document.querySelector('.ant-table-header') as HTMLElement).offsetHeight - 55 - this.getMoreFilter + 14;
+
+    }, 0)
+  }
+
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
+    }
+  }
+
+  get getMoreFilter(){
+    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.deptDTO;
+    return flag ? 37 : 0;
+  }
+
+  // 初始化缓存数据
+  queryType:any;
+  hosId:any;
+  dutyId:any;
+  parentDutyId:any;
+  initSessionData(){
+    let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
+    let queryType:any = newStatistics.queryType;
+    let hosId:any = newStatistics.hospitalId;
+    let dutyId:any = newStatistics.dutyId;
+
+    queryType = queryType ? +queryType : undefined;
+    hosId = hosId ? +hosId : undefined;
+    dutyId = dutyId ? +dutyId : undefined;
+
+    this.queryType = queryType;
+    if(queryType == 1){
+      this.hosId = undefined;
+      this.dutyId = undefined;
+      this.parentDutyId = undefined;
+    }else if(queryType == 2){
+      this.hosId = hosId;
+      this.dutyId = undefined;
+      this.parentDutyId = undefined;
+    }else if(queryType == 3){
+      this.hosId = undefined;
+      this.dutyId = dutyId;
+      this.parentDutyId = undefined;
+    }else if(queryType == 4){
+      this.hosId = undefined;
+      this.dutyId = undefined;
+      this.parentDutyId = dutyId;
+    }
+  }
+
+  get getHosId(){
+    return this.parentDutyId || this.dutyId || this.hosId;
+  }
+
+  // 表格数据
+  loading1 = false;
+  getList(num?: number, field?: string, sort?: string) {
+    if (num !== undefined) {
+      this.pageIndex = num;
+    }
+    let postData:any = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+			userId: this.userId || undefined,
+			buildingId: this.fieldConfig.fields.buildingId || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
+      hosId: this.getHosId,
+      groupId: this.fieldConfig.fields.groupId || undefined,
+      deptId: this.fieldConfig.fields.deptId || undefined,
+      taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+      statisticsTypeId: this.fieldConfig.fields.statisticsTypeId || undefined,
+    };
+    if (field && sort) {
+      postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
+    }
+    this.loading1 = true;
+    this.mainService
+      .postCustom("itsm/report", "userDegreeTransOrder", postData)
+      .subscribe((result) => {
+        this.loading1 = false;
+        this.listOfData = result.dataList.filter((v, i) => { return i != result.dataList.length - 1 });
+        this.listOfDataEnd = result.dataList.filter((v, i) => { return i == result.dataList.length - 1 });
+        this.listLength = result.totalCount;
+      });
+  }
+
+  // 列表排序
+  sortCurrent:any = {};
+  sortCurrentKey: string = "";
+  sortCurrentValue: string | null = "";
+  sort(e) {
+    const { key, value } = e;
+    this.sortCurrentKey = key;
+    this.sortCurrentValue = value;
+    this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue);
+  }
+
+  // 搜索
+  search() {
+    this.getList(1, this.sortCurrentKey, this.sortCurrentValue);
+  }
+
+  // 日期选择
+  dateRange: any = [];
+
+  // 导出
+  excelExportLoading:any = false;
+  excelExport(){
+    this.excelExportLoading = this.message.loading("导出中..", {
+      nzDuration: 0,
+    }).messageId;
+    let postData:any = {
+			userId: this.userId || undefined,
+			buildingId: this.fieldConfig.fields.buildingId || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
+      hosId: this.getHosId,
+      groupId: this.fieldConfig.fields.groupId || undefined,
+      deptId: this.fieldConfig.fields.deptId || undefined,
+      taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+      statisticsTypeId: this.fieldConfig.fields.statisticsTypeId || undefined,
+    };
+    if (this.sortCurrentKey && this.sortCurrentValue) {
+      postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
+    }
+    this.mainService
+      .postExportCustom("itsm/export", "userDegreeTransOrder", postData)
+      .subscribe((data) => {
+        this.message.remove(this.excelExportLoading);
+        this.excelExportLoading = false;
+        this.message.success('导出成功');
+        var file = new Blob([data], {
+          type: "application/vnd.ms-excel",
+        });
+        //trick to download store a file having its URL
+        var fileURL = URL.createObjectURL(file);
+        var a = document.createElement("a");
+        a.href = fileURL;
+        a.target = "_blank";
+        a.download = `${this.route.parent.routeConfig.data.title}.xls`;
+        document.body.appendChild(a);
+        a.click();
+      },(err) => {
+        this.message.remove(this.excelExportLoading);
+        this.excelExportLoading = false;
+        this.message.error('导出失败');
+      });
+  }
+  // 重置
+  reset(){
+    this.sortCurrentKey = "";
+		this.sortCurrentValue = "";
+		this.sortCurrent = {};
+    this.dateRange = []
+    this.userId = undefined;
+    this.fieldConfig.fields = {groupId: undefined, deptId: undefined, buildingId: undefined, taskTypeId: undefined, statisticsTypeId: undefined};
+    this.customChangeDateComponent.resetByDate();
+    this.search();
+  }
+
+  // 人员搜索
+  changeUserInp(e) {
+    this.searchTimer(this.getUserList, e);
+  }
+
+  // 防抖
+  isLoading = false;
+  searchTimer(fun, e) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  openChangeUser(flag){
+    flag && this.getUserList();
+  }
+
+  // 获取人员列表
+  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("simple/data", "user", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.userList = data.list;
+      });
+  }
+
+  // 详细搜索
+  fieldConfig:any = {
+    fields: {groupId: undefined, deptId: undefined, buildingId: undefined, taskTypeId: undefined, statisticsTypeId: undefined},
+    config: {group: true, dept: true, building: true, taskType: true, statisticsType: true},
+  }
+  showSearchMore:boolean = false;
+  showMore(){
+    this.showSearchMore = true;
+  }
+
+  cancelEvent(){
+    this.showSearchMore = false;
+  }
+
+  submitEvent(fields){
+    this.showSearchMore = false;
+    this.fieldConfig.fields = fields;
+    console.log('this.fieldConfig.fields:', this.fieldConfig.fields)
+    this.search();
+    this.onResize();
+  }
+}

src/app/views/new-statistics/distribution-inspection-statistics/distribution-user-evaluate-statistics/distribution-user-evaluate-statistics.module.ts

@@ -0,0 +1,23 @@
+import { DistributionUserEvaluateStatisticsComponent } from './distribution-user-evaluate-statistics.component';
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { DistributionUserEvaluateStatisticsRoutingModule } from './distribution-user-evaluate-statistics-routing.module';
+import { ShareModule } from 'src/app/share/share.module';
+import { DistributionSearchMoreModule } from '../../components/distribution-search-more/distribution-search-more.module';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
+
+
+@NgModule({
+  declarations: [
+    DistributionUserEvaluateStatisticsComponent,
+  ],
+  imports: [
+    CommonModule,
+    DistributionUserEvaluateStatisticsRoutingModule,
+    ShareModule,
+    DistributionSearchMoreModule,
+    CustomChangeDateModule,
+  ]
+})
+export class DistributionUserEvaluateStatisticsModule { }

src/app/views/new-statistics/distribution-inspection-statistics/hour-quality-control-statistics/hour-quality-control-statistics-routing.module.ts

@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { HourQualityControlStatisticsComponent } from './hour-quality-control-statistics.component';
+
+
+const routes: Routes = [
+  { path: '', component: HourQualityControlStatisticsComponent }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class HourQualityControlStatisticsRoutingModule { }

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

@@ -0,0 +1,85 @@
+<div class="searchDataWrap">
+  <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" nzAllowClear nzPlaceHolder="请选择统计分类" [(ngModel)]="statisticsTypeId" (nzOpenChange)="openChangeStatisticsType($event)">
+        <ng-container *ngFor="let option of statisticsTypeList">
+          <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> 搜索中...
+        </nz-option>
+      </nz-select>
+    </div>
+  </div>
+  <div class="operation">
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
+    <button nz-button class="btn default" (click)="search()">查询</button>
+    <button nz-button class="btn default ml8" (click)="reset()">重置</button>
+    <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>
+  </div>
+</div>
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.deptDTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.taskTypeDTO">
+  <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
+  <span>{{fieldConfig.fields.userDTO?.name}}</span>
+	<span>{{fieldConfig.fields.taskTypeDTO?.taskName}}</span>
+	<span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
+  <span>{{fieldConfig.fields.deptDTO?.dept}}</span>
+</div>
+<nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
+  <thead (nzSortChange)="sort($event)" nzSingleSort>
+    <tr>
+      <th nzWidth="10%" nzShowSort nzSortKey="date" [(nzSort)]="sortCurrent.date">时</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgCount" [(nzSort)]="sortCurrent.avgCount">平均单量</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
+			<th nzWidth="9%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
+			<th nzWidth="9%" nzShowSort nzSortKey="arrive_time_num" [(nzSort)]="sortCurrent.arrive_time_num">平均到达时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时达标率</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr *ngFor="let data of listOfData">
+      <td>{{ data.date }}</td>
+      <td>{{ data.totalCount }}</td>
+      <td>{{ data.avgCount }}</td>
+      <td>{{ data.totalGrade }}</td>
+      <td>{{ data.response_time_num }}</td>
+      <td>{{ data.arrive_time_num }}</td>
+      <td>{{ data.execution_time_num }}</td>
+      <td>{{ data.aveper }}</td>
+      <td>{{ data.total_time }}</td>
+      <td>{{ data.five_count }}</td>
+      <td>{{ data.special_close }}</td>
+    </tr>
+  </tbody>
+  <ng-template #footerTpl>
+    <table class="footTable">
+      <tr *ngFor="let data of listOfDataEnd">
+        <td style="width: 10%">{{ data.date }}</td>
+        <td style="width: 9%">{{ data.totalCount }}</td>
+        <td style="width: 9%">{{ data.avgCount }}</td>
+        <td style="width: 9%">{{ data.totalGrade }}</td>
+        <td style="width: 9%">{{ data.response_time_num }}</td>
+        <td style="width: 9%">{{ data.arrive_time_num }}</td>
+        <td style="width: 9%">{{ data.execution_time_num }}</td>
+        <td style="width: 9%">{{ data.aveper }}</td>
+        <td style="width: 9%">{{ data.total_time }}</td>
+        <td style="width: 9%">{{ data.five_count }}</td>
+        <td style="width: 9%">{{ data.special_close }}</td>
+      </tr>
+    </table>
+  </ng-template>
+</nz-table>
+<div class="pagination">
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
+</div>
+
+<!-- 详细搜索 -->
+<app-distribution-search-more [fieldConfig]="fieldConfig" *ngIf="showSearchMore" [hosId]="hosId" [queryType]="queryType"  [dutyId]="dutyId"  [parentDutyId]="parentDutyId" (cancelEvent)="cancelEvent()" (submitEvent)="submitEvent($event)"></app-distribution-search-more>

src/app/views/new-statistics/distribution-inspection-statistics/hour-quality-control-statistics/hour-quality-control-statistics.component.less

@@ -0,0 +1,71 @@
+@import "../../../../../../src/theme.less";
+:host{
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  ::ng-deep .ant-table-footer{
+    padding: 16px 0;
+    width: calc(100% - 15px);
+    font-weight: bold;
+  }
+  tr, th{
+    text-align: center;
+  }
+  .searchDataWrap{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    .searchData{
+      padding: 16px;
+      display: flex;
+      align-items: center;
+      .searchDataItem{
+        margin-right: 24px;
+        .label{
+          font-size: 16px;
+        }
+        .selectItem{
+          width: 160px;
+        }
+      }
+    }
+    .operation{
+      margin-right: 16px;
+      display: flex;
+      align-items: center;
+      cursor: pointer;
+      .icon_transport{
+        margin-right: 16px;
+        font-size: 24px;
+      }
+      .btn{
+        &.default{
+          height: 32px;
+          line-height: 32px;
+          min-width: 70px;
+        }
+      }
+    }
+  }
+
+  .table{
+    margin: 0 8px;
+  }
+
+  .moreFilter{
+    margin-bottom: 16px;
+    span{
+      margin-left: 16px;
+      color: @primary-color;
+    }
+  }
+
+  .pagination{
+    padding: 16px;
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+  }
+}

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

@@ -0,0 +1,252 @@
+import { TabService } from './../../services/tab.service';
+import { NzMessageService } from 'ng-zorro-antd/message';
+import { Component, OnInit, HostListener, AfterViewInit, ViewChild } from "@angular/core";
+import { MainService } from 'src/app/services/main.service';
+import { ActivatedRoute } from '@angular/router';
+import { ToolService } from "../../../../services/tool.service";
+import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
+@Component({
+  selector: "app-hour-quality-control-statistics",
+  templateUrl: "./hour-quality-control-statistics.component.html",
+  styleUrls: ["./hour-quality-control-statistics.component.less"],
+})
+export class HourQualityControlStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
+  constructor(
+    private mainService: MainService,
+    private message: NzMessageService,
+    private route: ActivatedRoute,
+    private tabService: TabService,
+		private tool: ToolService,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+  listOfDataEnd: any[] = []; //表格合计
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 30; //表格每页展示条数
+  listLength: number = 0; //表格总数据量
+
+  statisticsTypeId;//统计分类id
+
+
+  ngOnInit() {}
+
+  ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    setTimeout(() => {
+      this.search();
+    }, 0)
+    this.onResize();
+  }
+
+  tableHeight:number = 0;
+  @HostListener('window:resize')
+  onResize(): void {
+    setTimeout(() => {
+      this.tableHeight = window.innerHeight - (document.querySelector('.searchDataWrap') as HTMLElement).offsetHeight - 64 - 36 - 48 - 8 - (document.querySelector('.ant-table-header') as HTMLElement).offsetHeight - 55 - this.getMoreFilter + 14;
+
+    }, 0)
+  }
+
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
+    }
+  }
+
+  get getMoreFilter(){
+    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.deptDTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.taskTypeDTO;
+    return flag ? 37 : 0;
+  }
+
+  // 初始化缓存数据
+  queryType:any;
+  hosId:any;
+  dutyId:any;
+  parentDutyId:any;
+  initSessionData(){
+    let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
+    let queryType:any = newStatistics.queryType;
+    let hosId:any = newStatistics.hospitalId;
+    let dutyId:any = newStatistics.dutyId;
+
+    queryType = queryType ? +queryType : undefined;
+    hosId = hosId ? +hosId : undefined;
+    dutyId = dutyId ? +dutyId : undefined;
+
+    this.queryType = queryType;
+    if(queryType == 1){
+      this.hosId = undefined;
+      this.dutyId = undefined;
+      this.parentDutyId = undefined;
+    }else if(queryType == 2){
+      this.hosId = hosId;
+      this.dutyId = undefined;
+      this.parentDutyId = undefined;
+    }else if(queryType == 3){
+      this.hosId = undefined;
+      this.dutyId = dutyId;
+      this.parentDutyId = undefined;
+    }else if(queryType == 4){
+      this.hosId = undefined;
+      this.dutyId = undefined;
+      this.parentDutyId = dutyId;
+    }
+  }
+
+  get getHosId(){
+    return this.parentDutyId || this.dutyId || this.hosId;
+  }
+
+  // 表格数据
+  loading1 = false;
+  getList(num?: number, field?: string, sort?: string) {
+    if (num !== undefined) {
+      this.pageIndex = num;
+    }
+    let postData:any = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+			statisticsTypeId: this.statisticsTypeId || undefined,
+			buildingId: this.fieldConfig.fields.buildingId || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
+      hosId: this.getHosId,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      userId: this.fieldConfig.fields.userId || undefined,
+      deptId: this.fieldConfig.fields.deptId || undefined,
+      taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+    };
+    if (field && sort) {
+      postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
+    }
+    this.loading1 = true;
+    this.mainService
+      .postCustom("itsm/report", "hourTransOrderQc", postData)
+      .subscribe((result) => {
+        this.loading1 = false;
+        this.listOfData = result.dataList.filter((v, i) => { return i != result.dataList.length - 1 });
+        this.listOfDataEnd = result.dataList.filter((v, i) => { return i == result.dataList.length - 1 });
+        this.listLength = result.totalCount;
+      });
+  }
+
+  // 列表排序
+  sortCurrent:any = {};
+  sortCurrentKey: string = "";
+  sortCurrentValue: string | null = "";
+  sort(e) {
+    const { key, value } = e;
+    this.sortCurrentKey = key;
+    this.sortCurrentValue = value;
+    this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue);
+  }
+
+  // 搜索
+  search() {
+    this.getList(1, this.sortCurrentKey, this.sortCurrentValue);
+  }
+
+  // 日期选择
+  dateRange: any = [];
+
+  // 导出
+  excelExportLoading:any = false;
+  excelExport(){
+    this.excelExportLoading = this.message.loading("导出中..", {
+      nzDuration: 0,
+    }).messageId;
+    let postData:any = {
+			statisticsTypeId: this.statisticsTypeId || undefined,
+			buildingId: this.fieldConfig.fields.buildingId || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
+      hosId: this.getHosId,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      userId: this.fieldConfig.fields.userId || undefined,
+      deptId: this.fieldConfig.fields.deptId || undefined,
+      taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+    };
+    if (this.sortCurrentKey && this.sortCurrentValue) {
+      postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
+    }
+    this.mainService
+      .postExportCustom("itsm/export", "hourTransOrderQc", postData)
+      .subscribe((data) => {
+        this.message.remove(this.excelExportLoading);
+        this.excelExportLoading = false;
+        this.message.success('导出成功');
+        var file = new Blob([data], {
+          type: "application/vnd.ms-excel",
+        });
+        //trick to download store a file having its URL
+        var fileURL = URL.createObjectURL(file);
+        var a = document.createElement("a");
+        a.href = fileURL;
+        a.target = "_blank";
+        a.download = `${this.route.parent.routeConfig.data.title}.xls`;
+        document.body.appendChild(a);
+        a.click();
+      },(err) => {
+        this.message.remove(this.excelExportLoading);
+        this.excelExportLoading = false;
+        this.message.error('导出失败');
+      });
+  }
+  // 重置
+  reset(){
+    this.sortCurrentKey = "";
+		this.sortCurrentValue = "";
+		this.sortCurrent = {};
+    this.dateRange = []
+    this.statisticsTypeId = undefined;
+    this.fieldConfig.fields = {groupId: undefined, userId: undefined, deptId: undefined, buildingId: undefined, taskTypeId: undefined};
+    this.customChangeDateComponent.resetByDate();
+    this.search();
+  }
+
+  // 防抖
+  isLoading = false;
+
+  openChangeStatisticsType(flag){
+    flag && this.getStatisticsTypeList();
+  }
+
+  // 获取统计分类列表
+  statisticsTypeList:any[] = [];
+  getStatisticsTypeList(keyword?) {
+    this.isLoading = true;
+    this.mainService
+      .getDictionary("list", "statistics_date_type")
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.statisticsTypeList = data;
+      });
+  }
+
+  // 详细搜索
+  fieldConfig:any = {
+    fields: {groupId: undefined, userId: undefined, deptId: undefined, buildingId: undefined, taskTypeId: undefined},
+    config: {groupAndUser: true, dept: true, building: true, taskType: true},
+  }
+  showSearchMore:boolean = false;
+  showMore(){
+    this.showSearchMore = true;
+  }
+
+  cancelEvent(){
+    this.showSearchMore = false;
+  }
+
+  submitEvent(fields){
+    this.showSearchMore = false;
+    this.fieldConfig.fields = fields;
+    console.log('this.fieldConfig.fields:', this.fieldConfig.fields)
+    this.search();
+    this.onResize();
+  }
+}

src/app/views/new-statistics/distribution-inspection-statistics/hour-quality-control-statistics/hour-quality-control-statistics.module.ts

@@ -0,0 +1,23 @@
+import { HourQualityControlStatisticsComponent } from './hour-quality-control-statistics.component';
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { HourQualityControlStatisticsRoutingModule } from './hour-quality-control-statistics-routing.module';
+import { ShareModule } from 'src/app/share/share.module';
+import { DistributionSearchMoreModule } from '../../components/distribution-search-more/distribution-search-more.module';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
+
+
+@NgModule({
+  declarations: [
+    HourQualityControlStatisticsComponent,
+  ],
+  imports: [
+    CommonModule,
+    HourQualityControlStatisticsRoutingModule,
+    ShareModule,
+    DistributionSearchMoreModule,
+    CustomChangeDateModule,
+  ]
+})
+export class HourQualityControlStatisticsModule { }

src/app/views/new-statistics/maintenance-statistics/maintenance-statistics-routing.module.ts

@@ -161,6 +161,15 @@ const routes: Routes = [
           title: '修-工时大类统计'
         }
       },
+      {
+        // 人员评价统计
+        path: 'userEvaluateStatistics',
+        loadChildren: () => import('./user-evaluate-statistics/user-evaluate-statistics.module').then(m => m.UserEvaluateStatisticsModule),
+        data: {
+          reuse: true,
+          title: '修-人员评价统计'
+        }
+      },
     ]
   }
 ];

src/app/views/new-statistics/maintenance-statistics/user-evaluate-statistics/user-evaluate-statistics-routing.module.ts

@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { UserEvaluateStatisticsComponent } from './user-evaluate-statistics.component';
+
+
+const routes: Routes = [
+  { path: '', component: UserEvaluateStatisticsComponent }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class UserEvaluateStatisticsRoutingModule { }

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

@@ -0,0 +1,84 @@
+<div class="searchDataWrap">
+  <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)="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> 搜索中...
+        </nz-option>
+      </nz-select>
+    </div>
+  </div>
+  <div class="operation">
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
+    <button nz-button class="btn default" (click)="search()">查询</button>
+    <button nz-button class="btn default ml8" (click)="reset()">重置</button>
+    <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>
+  </div>
+</div>
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.repairDeptDTO || 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>
+  <span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
+  <span>{{fieldConfig.fields.floorDTO?.floorName}}</span>
+  <span>{{fieldConfig.fields.repairDeptDTO?.dept}}</span>
+</div>
+<nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
+  <thead (nzSortChange)="sort($event)" nzSingleSort>
+    <tr>
+      <th nzWidth="10%">人员姓名(工号)</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="degreeCount" [(nzSort)]="sortCurrent.degreeCount">评价工单数</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="oneStar" [(nzSort)]="sortCurrent.oneStar">一星</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="twoStar" [(nzSort)]="sortCurrent.twoStar">二星</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="threeStar" [(nzSort)]="sortCurrent.threeStar">三星</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="fourStar" [(nzSort)]="sortCurrent.fourStar">四星</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="fiveStar" [(nzSort)]="sortCurrent.fiveStar">五星</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="totalStar" [(nzSort)]="sortCurrent.totalStar">评价总星数</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="avgStar" [(nzSort)]="sortCurrent.avgStar">平均总星数</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr *ngFor="let data of listOfData">
+      <td>{{ data.userName }}<ng-container *ngIf="data.userAccount">({{ data.userAccount }})</ng-container></td>
+      <td>{{ data.sum }}</td>
+      <td>{{ data.degreeCount }}</td>
+      <td>{{ data.oneStar }}</td>
+      <td>{{ data.twoStar }}</td>
+      <td>{{ data.threeStar }}</td>
+      <td>{{ data.fourStar }}</td>
+      <td>{{ data.fiveStar }}</td>
+      <td>{{ data.totalStar }}</td>
+      <td>{{ data.avgStar }}</td>
+    </tr>
+  </tbody>
+  <ng-template #footerTpl>
+    <table class="footTable">
+      <tr *ngFor="let data of listOfDataEnd">
+        <td style="width: 10%">{{ data.userName }}</td>
+        <td style="width: 10%">{{ data.sum }}</td>
+        <td style="width: 10%">{{ data.degreeCount }}</td>
+        <td style="width: 10%">{{ data.oneStar }}</td>
+        <td style="width: 10%">{{ data.twoStar }}</td>
+        <td style="width: 10%">{{ data.threeStar }}</td>
+        <td style="width: 10%">{{ data.fourStar }}</td>
+        <td style="width: 10%">{{ data.fiveStar }}</td>
+        <td style="width: 10%">{{ data.totalStar }}</td>
+        <td style="width: 10%">{{ data.avgStar }}</td>
+      </tr>
+    </table>
+  </ng-template>
+</nz-table>
+<div class="pagination">
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
+</div>
+
+<!-- 详细搜索 -->
+<app-search-more [fieldConfig]="fieldConfig" *ngIf="showSearchMore" [hosId]="hosId" [queryType]="queryType"  [dutyId]="dutyId"  [parentDutyId]="parentDutyId" (cancelEvent)="cancelEvent()" (submitEvent)="submitEvent($event)"></app-search-more>

src/app/views/new-statistics/maintenance-statistics/user-evaluate-statistics/user-evaluate-statistics.component.less

@@ -0,0 +1,71 @@
+@import "../../../../../../src/theme.less";
+:host{
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  ::ng-deep .ant-table-footer{
+    padding: 16px 0;
+    width: calc(100% - 15px);
+    font-weight: bold;
+  }
+  tr, th{
+    text-align: center;
+  }
+  .searchDataWrap{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    .searchData{
+      padding: 16px;
+      display: flex;
+      align-items: center;
+      .searchDataItem{
+        margin-right: 24px;
+        .label{
+          font-size: 16px;
+        }
+        .selectItem{
+          width: 160px;
+        }
+      }
+    }
+    .operation{
+      margin-right: 16px;
+      display: flex;
+      align-items: center;
+      cursor: pointer;
+      .icon_transport{
+        margin-right: 16px;
+        font-size: 24px;
+      }
+      .btn{
+        &.default{
+          height: 32px;
+          line-height: 32px;
+          min-width: 70px;
+        }
+      }
+    }
+  }
+
+  .table{
+    margin: 0 8px;
+  }
+
+  .moreFilter{
+    margin-bottom: 16px;
+    span{
+      margin-left: 16px;
+      color: @primary-color;
+    }
+  }
+
+  .pagination{
+    padding: 16px;
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+  }
+}

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

@@ -0,0 +1,284 @@
+import { debounceTime } from 'rxjs/operators';
+import { Subject } from 'rxjs';
+import { NzMessageService } from 'ng-zorro-antd/message';
+import { Component, OnInit, HostListener, AfterViewInit, ViewChild } from "@angular/core";
+import { MainService } from 'src/app/services/main.service';
+import { ActivatedRoute } from '@angular/router';
+import { TabService } from '../../services/tab.service';
+import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
+@Component({
+  selector: "app-user-evaluate-statistics",
+  templateUrl: "./user-evaluate-statistics.component.html",
+  styleUrls: ["./user-evaluate-statistics.component.less"],
+})
+export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
+  constructor(
+    private mainService: MainService,
+    private message: NzMessageService,
+    private route: ActivatedRoute,
+    private tabService: TabService,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+  listOfDataEnd: any[] = []; //表格合计
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 30; //表格每页展示条数
+  listLength: number = 0; //表格总数据量
+
+  userId;//维修人员id
+
+  searchTimerSubject = new Subject();
+
+  ngOnInit() {
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+  }
+
+  ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    setTimeout(() => {
+      this.search();
+    }, 0)
+    this.onResize();
+  }
+
+  tableHeight:number = 0;
+  @HostListener('window:resize')
+  onResize(): void {
+    setTimeout(() => {
+      this.tableHeight = window.innerHeight - (document.querySelector('.searchDataWrap') as HTMLElement).offsetHeight - 64 - 36 - 48 - 8 - (document.querySelector('.ant-table-header') as HTMLElement).offsetHeight - 55 - this.getMoreFilter + 14;
+
+    }, 0)
+  }
+
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
+    }
+  }
+
+  get getMoreFilter(){
+    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.repairDeptDTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO;
+    return flag ? 37 : 0;
+  }
+
+  // 初始化缓存数据
+  queryType:any;
+  hosId:any;
+  dutyId:any;
+  parentDutyId:any;
+  initSessionData(){
+    let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
+    let queryType:any = newStatistics.queryType;
+    let hosId:any = newStatistics.hospitalId;
+    let dutyId:any = newStatistics.dutyId;
+
+    queryType = queryType ? +queryType : undefined;
+    hosId = hosId ? +hosId : undefined;
+    dutyId = dutyId ? +dutyId : undefined;
+
+    this.queryType = queryType;
+    if(queryType == 1){
+      this.hosId = undefined;
+      this.dutyId = undefined;
+      this.parentDutyId = undefined;
+    }else if(queryType == 2){
+      this.hosId = hosId;
+      this.dutyId = undefined;
+      this.parentDutyId = undefined;
+    }else if(queryType == 3){
+      this.hosId = undefined;
+      this.dutyId = dutyId;
+      this.parentDutyId = undefined;
+    }else if(queryType == 4){
+      this.hosId = undefined;
+      this.dutyId = undefined;
+      this.parentDutyId = dutyId;
+    }
+  }
+
+  get getHosId(){
+    return this.parentDutyId || this.dutyId || this.hosId;
+  }
+
+  // 表格数据
+  loading1 = false;
+  getList(num?: number, field?: string, sort?: string) {
+    if (num !== undefined) {
+      this.pageIndex = num;
+    }
+    let postData:any = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
+      hosId: this.hosId || undefined,
+      dutyId: this.dutyId || undefined,
+      parentDutyId: this.parentDutyId || 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,
+      repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
+    };
+    if (field && sort) {
+      postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
+    }
+    this.loading1 = true;
+    this.mainService
+      .postCustom("itsm/report", "userEvaluate", postData)
+      .subscribe((result) => {
+        this.loading1 = false;
+        this.listOfData = result.dataList.filter((v, i) => { return i != result.dataList.length - 1 });
+        this.listOfDataEnd = result.dataList.filter((v, i) => { return i == result.dataList.length - 1 });
+        this.listLength = result.totalCount;
+      });
+  }
+
+  // 列表排序
+  sortCurrent:any = {};
+  sortCurrentKey: string = "";
+  sortCurrentValue: string | null = "";
+  sort(e) {
+    const { key, value } = e;
+    this.sortCurrentKey = key;
+    this.sortCurrentValue = value;
+    this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue);
+  }
+
+  // 搜索
+  search() {
+    this.getList(1, this.sortCurrentKey, this.sortCurrentValue);
+  }
+
+  // 日期选择
+  dateRange: any = [];
+
+  // 导出
+  excelExportLoading:any = false;
+  excelExport(){
+    this.excelExportLoading = this.message.loading("导出中..", {
+      nzDuration: 0,
+    }).messageId;
+    let postData:any = {
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
+      hosId: this.hosId || undefined,
+      dutyId: this.dutyId || undefined,
+      parentDutyId: this.parentDutyId || 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,
+      repairDeptiD: this.fieldConfig.fields.repairDeptiD || undefined,
+    };
+    if (this.sortCurrentKey && this.sortCurrentValue) {
+      postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
+    }
+    this.mainService
+      .postExportCustom("itsm/export", "userEvaluate", postData)
+      .subscribe((data) => {
+        this.message.remove(this.excelExportLoading);
+        this.excelExportLoading = false;
+        this.message.success('导出成功');
+        var file = new Blob([data], {
+          type: "application/vnd.ms-excel",
+        });
+        //trick to download store a file having its URL
+        var fileURL = URL.createObjectURL(file);
+        var a = document.createElement("a");
+        a.href = fileURL;
+        a.target = "_blank";
+        a.download = `${this.route.parent.routeConfig.data.title}.xls`;
+        document.body.appendChild(a);
+        a.click();
+      },(err) => {
+        this.message.remove(this.excelExportLoading);
+        this.excelExportLoading = false;
+        this.message.error('导出失败');
+      });
+  }
+  // 重置
+  reset(){
+    this.sortCurrentKey = "";
+		this.sortCurrentValue = "";
+		this.sortCurrent = {};
+    this.dateRange = []
+    this.userId = undefined;
+    this.fieldConfig.fields = {buildingId: undefined, floorId: undefined, categoryId: undefined, groupId: undefined, repairDeptiD: undefined};
+    this.customChangeDateComponent.resetByDate();
+    this.search();
+  }
+
+  // 维修人员搜索
+  changeUserInp(e) {
+    this.searchTimer(this.getUserList, e);
+  }
+
+  // 防抖
+  isLoading = false;
+  searchTimer(fun, e) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  openChangeUser(flag){
+    flag && this.getUserList();
+  }
+
+  // 获取维修人员列表
+  userList:any[] = [];
+  getUserList(keyword?) {
+    let data = {
+      user: {
+        name: keyword,
+        simpleQuery: true,
+        statisticalHosId: this.getHosId,
+        roleCodes: 'first-line support,second-line support,incident manager',
+        engineer: 1,
+      },
+      idx: 0,
+      sum: 20,
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("simple/data", "user", data)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.userList = data.list;
+      });
+  }
+
+  // 详细搜索
+  fieldConfig:any = {
+    fields: {buildingId: undefined, floorId: undefined, categoryId: undefined, groupId: undefined, repairDeptiD: undefined},
+    config: {buildingAndFloor: true, category123: true, group: true, repairDept: true},
+  }
+  showSearchMore:boolean = false;
+  showMore(){
+    this.showSearchMore = true;
+  }
+
+  cancelEvent(){
+    this.showSearchMore = false;
+  }
+
+  submitEvent(fields){
+    this.showSearchMore = false;
+    this.fieldConfig.fields = fields;
+    console.log('this.fieldConfig.fields:', this.fieldConfig.fields)
+    this.search();
+    this.onResize();
+  }
+}

src/app/views/new-statistics/maintenance-statistics/user-evaluate-statistics/user-evaluate-statistics.module.ts

@@ -0,0 +1,23 @@
+import { UserEvaluateStatisticsComponent } from './user-evaluate-statistics.component';
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { UserEvaluateStatisticsRoutingModule } from './user-evaluate-statistics-routing.module';
+import { ShareModule } from 'src/app/share/share.module';
+import { SearchMoreModule } from '../../components/search-more/search-more.module';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
+
+
+@NgModule({
+  declarations: [
+    UserEvaluateStatisticsComponent,
+  ],
+  imports: [
+    CommonModule,
+    UserEvaluateStatisticsRoutingModule,
+    ShareModule,
+    SearchMoreModule,
+    CustomChangeDateModule,
+  ]
+})
+export class UserEvaluateStatisticsModule { }

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

@@ -37,10 +37,11 @@
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
-      <th nzWidth="25%">工时名称</th>
-      <th nzWidth="25%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">含工时工单总数</th>
-      <th nzWidth="25%" nzShowSort nzSortKey="workHourNum" [(nzSort)]="sortCurrent.workHourNum">使用数量</th>
-      <th nzWidth="25%" nzShowSort nzSortKey="workHourPrice" [(nzSort)]="sortCurrent.workHourPrice">总费用(元)</th>
+      <th nzWidth="20%">工时名称</th>
+      <th nzWidth="20%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">含工时工单总数</th>
+      <th nzWidth="20%" nzShowSort nzSortKey="workHourNum" [(nzSort)]="sortCurrent.workHourNum">使用数量</th>
+      <th nzWidth="20%" nzShowSort nzSortKey="workHourPrice" [(nzSort)]="sortCurrent.workHourPrice">总费用(元)</th>
+      <th nzWidth="20%" nzShowSort nzSortKey="workHourScore" [(nzSort)]="sortCurrent.workHourScore">总积分</th>
     </tr>
   </thead>
   <tbody>
@@ -49,15 +50,17 @@
       <td>{{ data.sum }}</td>
       <td>{{ data.workHourNum }}</td>
       <td>{{ data.workHourPrice }}</td>
+      <td>{{ data.workHourScore }}</td>
     </tr>
   </tbody>
   <ng-template #footerTpl>
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
-        <td style="width: 25%">{{ data.workHourName }}</td>
-        <td style="width: 25%">{{ data.sum }}</td>
-        <td style="width: 25%">{{ data.workHourNum }}</td>
-        <td style="width: 25%">{{ data.workHourPrice }}</td>
+        <td style="width: 20%">{{ data.workHourName }}</td>
+        <td style="width: 20%">{{ data.sum }}</td>
+        <td style="width: 20%">{{ data.workHourNum }}</td>
+        <td style="width: 20%">{{ data.workHourPrice }}</td>
+        <td style="width: 20%">{{ data.workHourScore }}</td>
       </tr>
     </table>
   </ng-template>

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

@@ -113,6 +113,7 @@ export class WorkHourBigStatisticsComponent implements OnInit, AfterViewInit {
     let postData:any = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
+      treeLevel: 1,
       startDate: this.dateRange[0] || undefined,
       endDate: this.dateRange[1] || undefined,
       hosId: this.hosId || undefined,
@@ -179,6 +180,7 @@ export class WorkHourBigStatisticsComponent implements OnInit, AfterViewInit {
       nzDuration: 0,
     }).messageId;
     let postData:any = {
+      treeLevel: 1,
       startDate: this.dateRange[0] || undefined,
       endDate: this.dateRange[1] || undefined,
       hosId: this.hosId || undefined,

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

@@ -24,7 +24,8 @@
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>
   </div>
 </div>
-<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.floorDTO || fieldConfig.fields.companyDTO">
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.floorDTO || fieldConfig.fields.companyDTO || fieldConfig.fields.workHourParentDTO">
+  <span>{{fieldConfig.fields.workHourParentDTO?.workName}}</span>
   <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
   <span>{{fieldConfig.fields.userDTO?.name}}</span>
   <span>{{fieldConfig.fields.category1DTO?.category}}</span>
@@ -37,10 +38,11 @@
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
-      <th nzWidth="25%">工时名称</th>
-      <th nzWidth="25%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">含工时工单总数</th>
-      <th nzWidth="25%" nzShowSort nzSortKey="workHourNum" [(nzSort)]="sortCurrent.workHourNum">使用数量</th>
-      <th nzWidth="25%" nzShowSort nzSortKey="workHourPrice" [(nzSort)]="sortCurrent.workHourPrice">总费用(元)</th>
+      <th nzWidth="20%">工时名称</th>
+      <th nzWidth="20%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">含工时工单总数</th>
+      <th nzWidth="20%" nzShowSort nzSortKey="workHourNum" [(nzSort)]="sortCurrent.workHourNum">使用数量</th>
+      <th nzWidth="20%" nzShowSort nzSortKey="workHourPrice" [(nzSort)]="sortCurrent.workHourPrice">总费用(元)</th>
+      <th nzWidth="20%" nzShowSort nzSortKey="workHourScore" [(nzSort)]="sortCurrent.workHourScore">总积分</th>
     </tr>
   </thead>
   <tbody>
@@ -49,15 +51,17 @@
       <td>{{ data.sum }}</td>
       <td>{{ data.workHourNum }}</td>
       <td>{{ data.workHourPrice }}</td>
+      <td>{{ data.workHourScore }}</td>
     </tr>
   </tbody>
   <ng-template #footerTpl>
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
-        <td style="width: 25%">{{ data.workHourName }}</td>
-        <td style="width: 25%">{{ data.sum }}</td>
-        <td style="width: 25%">{{ data.workHourNum }}</td>
-        <td style="width: 25%">{{ data.workHourPrice }}</td>
+        <td style="width: 20%">{{ data.workHourName }}</td>
+        <td style="width: 20%">{{ data.sum }}</td>
+        <td style="width: 20%">{{ data.workHourNum }}</td>
+        <td style="width: 20%">{{ data.workHourPrice }}</td>
+        <td style="width: 20%">{{ data.workHourScore }}</td>
       </tr>
     </table>
   </ng-template>

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

@@ -61,7 +61,7 @@ export class WorkHourSmallStatisticsComponent implements OnInit, AfterViewInit {
   }
 
   get getMoreFilter(){
-    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || this.fieldConfig.fields.companyDTO;
+    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || this.fieldConfig.fields.companyDTO || this.fieldConfig.fields.workHourParentDTO;
     return flag ? 37 : 0;
   }
 
@@ -113,6 +113,7 @@ export class WorkHourSmallStatisticsComponent implements OnInit, AfterViewInit {
     let postData:any = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
+      treeLevel: 2,
       startDate: this.dateRange[0] || undefined,
       endDate: this.dateRange[1] || undefined,
       hosId: this.hosId || undefined,
@@ -126,6 +127,7 @@ export class WorkHourSmallStatisticsComponent implements OnInit, AfterViewInit {
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
       companyId: this.fieldConfig.fields.companyId || undefined,
+      workHourParentId: this.fieldConfig.fields.workHourParentId || undefined,
     };
     if (field && sort) {
       postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
@@ -179,6 +181,7 @@ export class WorkHourSmallStatisticsComponent implements OnInit, AfterViewInit {
       nzDuration: 0,
     }).messageId;
     let postData:any = {
+      treeLevel: 2,
       startDate: this.dateRange[0] || undefined,
       endDate: this.dateRange[1] || undefined,
       hosId: this.hosId || undefined,
@@ -192,6 +195,7 @@ export class WorkHourSmallStatisticsComponent implements OnInit, AfterViewInit {
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
       companyId: this.fieldConfig.fields.companyId || undefined,
+      workHourParentId: this.fieldConfig.fields.workHourParentId || undefined,
     };
     if (this.sortCurrentKey && this.sortCurrentValue) {
       postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
@@ -226,7 +230,7 @@ export class WorkHourSmallStatisticsComponent 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.repairDeptId = undefined;
-    this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined};
+    this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined, workHourParentId: undefined};
     this.search();
   }
 
@@ -269,8 +273,8 @@ export class WorkHourSmallStatisticsComponent implements OnInit, AfterViewInit {
 
   // 详细搜索
   fieldConfig:any = {
-    fields: {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined},
-    config: {groupAndUser: true, category123: true, buildingAndFloor: true, company: true},
+    fields: {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined, workHourParentId: undefined},
+    config: {groupAndUser: true, category123: true, buildingAndFloor: true, company: true, workHourParent: true},
   }
   showSearchMore:boolean = false;
   showMore(){