拉取代码

src/app/components/configurationCenter/configuration-manHour/configuration-manHour.component.html

@@ -13,7 +13,7 @@
 			</div>
       <overlay-scrollbars #osComponentRef1 class="contentBody">
         <nz-spin nzSimple [nzSpinning]="categoryLoading1" class="mt8 text_align_center"></nz-spin>
-        <div [hidden]="categoryLoading1" class="contentItem" [title]="item.workName" [ngClass]="{ active: item.id === activeCategory1.id }" (click)="clickCategory(item, 1)" *ngFor="let item of categoryList1">{{ item.workName }} - {{item.workUnit}} - {{item.wage}}元 - {{item.integral.value}}分 - {{item.disableType==0?'停用':'启用'}}</div>
+        <div [hidden]="categoryLoading1" class="contentItem" [title]="item.workName" [ngClass]="{ active: item.id === activeCategory1.id }" (click)="clickCategory(item, 1)" *ngFor="let item of categoryList1">{{ item.workName }} - {{item.workUnit}} - {{item.wage}}元 - {{item.integral?item.integral.value:''}}分 - {{item.disableType==0?'停用':'启用'}}</div>
       </overlay-scrollbars>
     </div>
     <div class="address">
@@ -28,7 +28,7 @@
 			</div>
       <overlay-scrollbars #osComponentRef2 class="contentBody">
         <nz-spin nzSimple [nzSpinning]="categoryLoading2" class="mt8 text_align_center"></nz-spin>
-        <div [hidden]="categoryLoading2" class="contentItem" [title]="item.workName" [ngClass]="{ active: item.id === activeCategory2.id }" (click)="clickCategory(item, 2)" *ngFor="let item of categoryList2">{{ item.workName }} - {{item.workUnit}} - {{item.wage}}元 - {{item.integral.value}}分 - {{item.disableType==0?'停用':'启用'}}</div>
+        <div [hidden]="categoryLoading2" class="contentItem" [title]="item.workName" [ngClass]="{ active: item.id === activeCategory2.id }" (click)="clickCategory(item, 2)" *ngFor="let item of categoryList2">{{ item.workName }} - {{item.workUnit}} - {{item.wage}}元 - {{item.integral?item.integral.value:''}}分 - {{item.disableType==0?'停用':'启用'}}</div>
       </overlay-scrollbars>
     </div>
   </div>
@@ -155,7 +155,7 @@
 	            	<td>{{ data.operationType ? data.operationType.name : '-' }}</td>
 	            	<td>{{ data.operationTime|date:'yyyy-MM-dd HH:mm'}}</td>
 	            	<td>{{ data.operationUserDTO ? data.operationUserDTO.name : '-' }}</td>
-	            	<td>{{ data.logRemark ? data.logRemark : '-' }} <span *ngIf="data.operationType.value==6">单价:{{ data.currentPrice }} &nbsp;&nbsp;积分:{{ data.currentScore.value }}</span></td>
+	            	<td>{{ data.logRemark ? data.logRemark : '-' }} <span *ngIf="data.operationType.value==6">单价:{{ data.currentPrice }} &nbsp;&nbsp;积分:{{ data.currentScore?data.currentScore.value:'' }}</span></td>
 	            </tr>
 	          </tbody>
 	        </nz-table>

src/app/components/order-scope/order-scope.component.ts

@@ -3,7 +3,7 @@ import { EventEmitter } from '@angular/core';
 import { MainService } from 'src/app/services/main.service';
 import { ToolService } from 'src/app/services/tool.service';
 import { NzMessageService } from 'ng-zorro-antd';
-import { Router } from "@angular/router";
+import { Router, ActivatedRoute } from "@angular/router";
 
 @Component({
   selector: 'app-order-scope',
@@ -29,7 +29,8 @@ export class OrderScopeComponent implements OnInit {
     private mainService: MainService,
     private tool: ToolService,
     private message: NzMessageService,
-		public router: Router
+		public router: Router,
+		public route: ActivatedRoute
   ) { }
 
   user = JSON.parse(localStorage.getItem("user")); //用户信息
@@ -49,6 +50,8 @@ export class OrderScopeComponent implements OnInit {
 	menuList:any;
 
   ngOnInit() {
+		let btn = this.tool.initCoopBtns(this.route)
+		console.log(77777,btn)
 		let menuItem = JSON.parse(localStorage.getItem("menuItem"))
 		this.menuList = menuItem.find(i=>i.link=='gongdanfanwei')
     this.initItsm();

src/app/services/tool.service.ts

@@ -314,6 +314,7 @@ export class ToolService {
 				  break;
 				case "log":
 				  coopBtns.log = true; //日志
+					break
 				case "viewGd":
 				  coopBtns.viewGd = true; //查看工单
 				  break;

src/app/views/appraise-management/appraise-management.component.html

@@ -7,7 +7,7 @@
           <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="false" nzAllowClear
             nzPlaceHolder="请选择工单类型" [(ngModel)]="taskType">
             <ng-container *ngFor="let data of allTaskType">
-              <nz-option nzLabel="{{data.taskName}}" nzValue="{{data.id}}"></nz-option>
+              <nz-option nzLabel="{{data.name}}" nzValue="{{data.id}}"></nz-option>
             </ng-container>
           </nz-select>
         </div>
@@ -42,6 +42,10 @@
             <nz-option nzLabel="{{data.name}}" nzValue="{{data.id}}" *ngFor="let data of handleStatus"></nz-option>
           </nz-select>
         </div>
+				<div class="list-template__searchItem">
+				  <span class="label">单号</span>：
+				  <input class="formItem" nz-input placeholder="请输入单号" [(ngModel)]="orderNo" />
+				</div>
       </div>
       <div nz-col nzXl='6' class="list-template__btns">
         <button nz-button class="btn default" (click)='search()'>搜索</button>
@@ -57,7 +61,7 @@
 						<th>工单类型</th>
             <th>单号</th>
             <th>申请科室</th>
-            <th>发起时间</th>
+            <!-- <th>发起时间</th> -->
 						<th>执行人</th>
 						<th>评价时间</th>
             <th>评价等级</th>
@@ -73,8 +77,8 @@
 						<td>{{data.orderType?data.orderType.name:'-'}}</td>
             <td>{{data.orderNo}}</td>
             <td>{{ data.startDept.dept }}</td>
-            <td>{{timestampToTime(data.startTime)}}</td>
-						<td>{{data.mediationUser?data.mediationUser.name:''}}</td>
+            <!-- <td>{{timestampToTime(data.startTime)}}</td> -->
+						<td>{{data.worker?data.worker.name:''}}</td>
 						<td>{{ data.evaluationTime?timestampToTime(data.evaluationTime):'-'}}</td>
 						<td>{{ data.evaluationLevel ? data.evaluationLevel.name:'-' }}</td>
 						<td>

src/app/views/appraise-management/appraise-management.component.ts

@@ -29,6 +29,7 @@ export class AppraiseManagementComponent implements OnInit {
   department: any; //所属科室
   mediUser: number; //调解人
   taskType: number; //工单类型
+	orderNo:any;
   allTaskType: any; //所有工单类型
   allHospital: any; //所有院区
   pageIndex: number = 1; //页码
@@ -70,7 +71,6 @@ export class AppraiseManagementComponent implements OnInit {
     this.worker = null;
     this.mediUser = null;
     this.status = null;
-    this.getAllTaskType();
     this.getAllWorker();
     this.getAllMediUser();
   }
@@ -123,7 +123,6 @@ export class AppraiseManagementComponent implements OnInit {
       user: {
         name: e || "",
         hospital: { id: that.hospital },
-        usertype: { id: 107 }, //服务台
       },
       idx: 0,
       sum: 20,
@@ -167,6 +166,11 @@ export class AppraiseManagementComponent implements OnInit {
       .subscribe((data) => {
         that.handleStatus = data;
       });
+		that.mainService
+		  .getDictionary("list", "order_type")
+		  .subscribe((data) => {
+		    that.allTaskType = data;
+		  });
   }
 
   // 搜索
@@ -178,6 +182,7 @@ export class AppraiseManagementComponent implements OnInit {
   reset() {
     this.pageIndex = 1;
     this.taskType = null;
+		this.orderNo = null;
     this.worker = null;
     this.mediUser = null;
     this.status = null;
@@ -191,15 +196,18 @@ export class AppraiseManagementComponent implements OnInit {
       idx: that.pageIndex - 1,
       sum: that.pageSize,
       badEvaluationHandle: {
-        taskType: that.taskType || "",
+				orderNo: that.orderNo || "",
+        orderType: {
+					id: that.taskType || "",
+				},
         worker: { id: that.worker || "" },
         handleStatus: { id: that.status || "" },
         hosId: that.hospital,
         mediationUser: { id: that.mediUser },
       },
     };
-    if (!data.badEvaluationHandle.taskType) {
-      delete data.badEvaluationHandle.taskType;
+    if (!data.badEvaluationHandle.orderType) {
+      delete data.badEvaluationHandle.orderType;
     }
     if (!data.badEvaluationHandle.worker.id) {
       delete data.badEvaluationHandle.worker;

src/app/views/fuwutai/fuwutai.component.html

@@ -118,7 +118,7 @@
                   <div class="gongdan" (click)="batchDispatchSelect(!data.checked, data.data.id, $event)">
                     <span class="left mr8" *ngIf="!flagList.itsmFlag1 && flagList.hsmsFlag1"><label nz-checkbox [ngModel]="data.checked" (ngModelChange)="batchDispatchSelect($event, data.data.id)"></label></span>
                     <span class="left gongdan_name" nz-tooltip [nzTooltipTitle]="data.data.taskType.taskName + (data.data.goodsRemark?'-'+data.data.goodsRemark:'')+'(' + data.data.gdcode + ')'">
-                      <strong [ngStyle]="{color: data.taskTypeConfig.renderColors?data.taskTypeConfig.renderColors:'#333'}">{{ data.data.taskType.taskName }}</strong><ng-container *ngIf="data.data.goodsRemark">-{{data.data.goodsRemark}}</ng-container>({{ data.data.gdcode }})
+                      <strong [ngStyle]="{color: data.data.taskType?data.data.taskType.renderColors:'#333'}">{{ data.data.taskType.taskName }}</strong><ng-container *ngIf="data.data.goodsRemark">-{{data.data.goodsRemark}}</ng-container>({{ data.data.gdcode }})
                     </span>
                     <div class="right_all">
                       <span nz-tooltip [nzTooltipTitle]="data.data.worker ? data.data.worker.phone : ''" class="right_all_name">{{ data.data.worker ? data.data.worker.name : "" }}</span>
@@ -315,7 +315,7 @@
                       <label nz-checkbox [ngModel]="data.checked" (ngModelChange)="batchWithdrawalSelect($event, data.data.id)"></label>
                     </span>
                     <span class="left gongdan_name" nz-tooltip [nzTooltipTitle]="data.data.taskType.taskName + (data.data.goodsRemark?'-'+data.data.goodsRemark:'')+'(' + data.data.gdcode + ')'">
-                      <strong [ngStyle]="{color: data.taskTypeConfig.renderColors?data.taskTypeConfig.renderColors:'#333'}">{{ data.data.taskType.taskName }}</strong><ng-container *ngIf="data.data.goodsRemark">-{{data.data.goodsRemark}}</ng-container>({{ data.data.gdcode }})
+                      <strong [ngStyle]="{color: data.data.taskType?data.data.taskType.renderColors:'#333'}">{{ data.data.taskType.taskName }}</strong><ng-container *ngIf="data.data.goodsRemark">-{{data.data.goodsRemark}}</ng-container>({{ data.data.gdcode }})
                     </span>
                     <div class="right_all">
                       <span nz-tooltip [nzTooltipTitle]="data.data.worker ? data.data.worker.phone : ''" class="right_all_name">{{ data.data.worker ? data.data.worker.name : "" }}</span>
@@ -500,7 +500,7 @@
                       <label nz-checkbox [ngModel]="data.checked" (ngModelChange)="batchWithdrawalSelect($event, data.data.id)"></label>
                     </span>
                     <span class="left gongdan_name" nz-tooltip [nzTooltipTitle]="data.data.taskType.taskName + (data.data.goodsRemark?'-'+data.data.goodsRemark:'')+'(' + data.data.gdcode + ')'">
-                      <strong [ngStyle]="{color: data.taskTypeConfig.renderColors?data.taskTypeConfig.renderColors:'#333'}">{{ data.data.taskType.taskName }}</strong><ng-container *ngIf="data.data.goodsRemark">-{{data.data.goodsRemark}}</ng-container>({{ data.data.gdcode }})
+                      <strong [ngStyle]="{color: data.data.taskType?data.data.taskType.renderColors:'#333'}">{{ data.data.taskType.taskName }}</strong><ng-container *ngIf="data.data.goodsRemark">-{{data.data.goodsRemark}}</ng-container>({{ data.data.gdcode }})
                     </span>
                     <div class="right_all">
                       <span nz-tooltip [nzTooltipTitle]="data.data.worker ? data.data.worker.phone : ''" class="right_all_name">{{ data.data.worker ? data.data.worker.name : "" }}</span>

src/app/views/fuwutai/fuwutai.component.ts

@@ -440,6 +440,7 @@ export class FuwutaiComponent implements OnInit {
         console.log(data);
         this.isOkLoading = false;
         this.isGoLoading = false;
+				this.dataStatus = data["status"];
         if (data["status"] == 200) {
           this.newOrderShow = false; //关闭弹窗
           if (go === "&go&") {
@@ -453,11 +454,21 @@ export class FuwutaiComponent implements OnInit {
             }
             this.showPromptModal("建单", true, "", "close");
           }
-        } else if(data["status"] == 1000033){
+        } 
+				else if(data["status"] == 1000033){
+					this.newOrderShow = false; //关闭弹窗
+					if (go === "&go&") {
+					  this.applyDept = data["startDept"].id;
+					  this.applyStartDept = data["startDept"];
+					  this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
+					}
 					//重复建单那策略
 					this.repeatMsg = data["msg"];
-					this.showRepeatModal(postData, "transport");
-				}else{
+					this.showRepeatModal(postData, "transport", go);
+				}else if (data["status"] == 100043){
+					this.showPromptModal("建单", true, data["msg"]);
+				}
+				else{
 					this.showPromptModal("建单", false, data["msg"]);
 				}
       });
@@ -527,6 +538,7 @@ export class FuwutaiComponent implements OnInit {
         console.log(data);
         this.isOkLoading = false;
         this.isGoLoading = false;
+				this.dataStatus = data["status"];
         if (data["status"] == 200) {
           this.newOrderShow = false; //关闭弹窗
           if (go === "&go&") {
@@ -542,18 +554,36 @@ export class FuwutaiComponent implements OnInit {
           }
         } else if(data["status"] == 100042){
           this.newOrderShow = false; //关闭弹窗
-          this.showPromptModal("建单", false, data["msg"]);
-        } else if(data["status"] == 1000033){
+					if (go === "&go&") {
+						this.applyDept = data["startDept"].id;
+						this.applyStartDept = data["startDept"];
+						this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
+						this.showPromptModal("建单", false, data["msg"], "closeGo");
+					}else{
+						this.showPromptModal("建单", false, data["msg"]);
+					}
+        } 
+				else if(data["status"] == 1000033){
+					this.newOrderShow = false; //关闭弹窗
+					if (go === "&go&") {
+						this.applyDept = data["startDept"].id;
+						this.applyStartDept = data["startDept"];
+						this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
+					}
 					//重复建单那策略
 					this.repeatMsg = data["msg"];
-					this.showRepeatModal(postData, "inspection");
-				}else{
+					this.showRepeatModal(postData, "inspection", go);					
+				}else if (data["status"] == 100043){
+					this.showPromptModal("建单", true, data["msg"]);
+				}
+				else{
 					this.showPromptModal("建单", false, data["msg"]);
 				}
       });
     }
   }
   // 标本配送表单提交
+	dataStatus:any;
   submitFormBbps(go?) {
     let postData = {
       workOrder: {
@@ -573,6 +603,7 @@ export class FuwutaiComponent implements OnInit {
     this.mainService.buildOrder(postData).subscribe((data) => {
       this.isOkLoading = false;
       this.isGoLoading = false;
+			this.dataStatus = data["status"];
       if (data["status"] == 200) {
         this.newOrderShow = false; //关闭弹窗
         if (go === "&go&") {
@@ -586,11 +617,19 @@ export class FuwutaiComponent implements OnInit {
           }
           this.showPromptModal("建单", true, "", "close");
         }
-      } else if(data["status"] == 1000033){
-				//重复建单那策略
-				this.repeatMsg = data["msg"];
-				this.showRepeatModal(postData, "specimen");
-			}else{
+      }else if(data["status"] == 1000033){
+				 this.newOrderShow = false; //关闭弹窗
+				 if (go === "&go&") {
+				 	this.applyDept = data["startDept"].id;
+				 	this.applyStartDept = data["startDept"];
+				 	this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
+				 }
+				 //重复建单那策略
+				 this.repeatMsg = data["msg"];
+				 this.showRepeatModal(postData, "specimen", go);
+			}else if (data["status"] == 100043){
+				this.showPromptModal("建单", true, data["msg"]);
+			} else{
 				this.showPromptModal("建单", false, data["msg"]);
 			}
     });
@@ -639,6 +678,7 @@ export class FuwutaiComponent implements OnInit {
     this.mainService.buildOrder(postData).subscribe((data) => {
       this.isOkLoading = false;
       this.isGoLoading = false;
+			this.dataStatus = data["status"];
       if (data["status"] == 200) {
         this.newOrderShow = false; //关闭弹窗
         if (go === "&go&") {
@@ -652,11 +692,22 @@ export class FuwutaiComponent implements OnInit {
           }
           this.showPromptModal("建单", true, "", "close");
         }
-      } else if(data["status"] == 1000033){
+      } 
+			else if(data["status"] == 1000033){
+				this.newOrderShow = false; //关闭弹窗
+				if (go === "&go&") {
+					this.applyDept = data["startDept"].id;
+					this.applyStartDept = data["startDept"];
+					this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
+				}
 				//重复建单那策略
 				this.repeatMsg = data["msg"];
-				this.showRepeatModal(postData, "other");
-			}else{
+				this.showRepeatModal(postData, "other", go);
+				
+			}else if (data["status"] == 100043){
+				this.showPromptModal("建单", true, data["msg"]);
+			}
+			else{
 				this.showPromptModal("建单", false, data["msg"]);
 			}
     });
@@ -697,6 +748,7 @@ export class FuwutaiComponent implements OnInit {
     this.mainService.buildOrder(postData).subscribe((data) => {
       this.isOkLoading = false;
       this.isGoLoading = false;
+			this.dataStatus = data["status"];
       if (data["status"] == 200) {
         this.newOrderShow = false; //关闭弹窗
         if (go === "&go&") {
@@ -710,11 +762,21 @@ export class FuwutaiComponent implements OnInit {
           }
           this.showPromptModal("建单", true, "", "close");
         }
-      } else if(data["status"] == 1000033){
+      } 
+			else if(data["status"] == 1000033){
+				this.newOrderShow = false; //关闭弹窗
+				if (go === "&go&") {
+					this.applyDept = data["startDept"].id;
+					this.applyStartDept = data["startDept"];
+					this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
+				}
 				//重复建单那策略
 				this.repeatMsg = data["msg"];
-				this.showRepeatModal(postData, "ordinary");
-			}else{
+				this.showRepeatModal(postData, "ordinary", go);
+			}else if (data["status"] == 100043){
+				this.showPromptModal("建单", true, data["msg"]);
+			}
+			else{
 				this.showPromptModal("建单", false, data["msg"]);
 			}
     });
@@ -797,24 +859,23 @@ export class FuwutaiComponent implements OnInit {
           this.getInspectAndPatientTransportConfig(tasktype);
         }
       });
-			
-			let query = {
-			  idx: 0,
-			  sum: 9999,
-			  taskType: {
-			    hosId: {
-			      id: this.checkedHos
-			    }
-			  }
-			};
-			this.mainService
-			  .getFetchDataList("simple/data", "taskType", query)
-			  .subscribe((result) => {
-			    if (result.status == 200) {
-			      this.allTaskType = result.list || {};
-						this.initControlView();
-			    }
-			  });
+			// let query = {
+			//   idx: 0,
+			//   sum: 9999,
+			//   taskType: {
+			//     hosId: {
+			//       id: this.checkedHos
+			//     }
+			//   }
+			// };
+			// this.mainService
+			//   .getFetchDataList("simple/data", "taskType", query)
+			//   .subscribe((result) => {
+			//     if (result.status == 200) {
+			//       this.allTaskType = result.list || {};
+			// 			this.initControlView();
+			//     }
+			//   });
   }
   // 获取检查页面信息配置
   getInspectAndPatientTransportConfig(tasktype) {
@@ -907,6 +968,7 @@ export class FuwutaiComponent implements OnInit {
     this.initOrderScope();
     this.getVisitList();
     this.getMessageList();
+		this.initControlView();
     this.moveMenu("fixedMenu");
     this.moveMenu("fixedMenuLeft");
     this.moveMenuAll("fixedMenuAll");
@@ -2239,9 +2301,12 @@ export class FuwutaiComponent implements OnInit {
               item.computedReceiveFlag = this.computedReceive(item.data)
               item.computedEditFlag = this.computedEdit(item.data)
             }
-						item.taskTypeConfig = this.allTaskType.find(i=>i.associationType.id == item.data.taskType.associationType.id)
+						// else{
+						// 	item.taskTypeConfig = this.allTaskType.find(i=>i.id == item.data.taskType.id)
+						// }
           });
           this.unassignedList = unassignedList;
+					console.log(5555,unassignedList)
           this.batchType = false;
           this.allUnassignedList = false;
           this.unassignedListClone = cloneDeep(this.unassignedList);
@@ -2266,7 +2331,9 @@ export class FuwutaiComponent implements OnInit {
               item.computedReceiveFlag = this.computedReceive(item.data)
               item.computedEditFlag = this.computedEdit(item.data)
             }
-						item.taskTypeConfig = this.allTaskType.find(i=>i.associationType.id == item.data.taskType.associationType.id)
+						// else{
+						// 	item.taskTypeConfig = this.allTaskType.find(i=>i.id == item.data.taskType.id)
+						// }
           });
           this.arriveList = arriveList;
           this.batchType1 = false;
@@ -2282,7 +2349,9 @@ export class FuwutaiComponent implements OnInit {
               item.computedHandleFlag = this.computedHandle(item.data)
               item.computedEditFlag = this.computedEdit(item.data)
             }
-						item.taskTypeConfig = this.allTaskType.find(i=>i.associationType.id == item.data.taskType.associationType.id)
+						// else{
+						// 	item.taskTypeConfig = this.allTaskType.find(i=>i.id == item.data.taskType.id)
+						// }
           });
           this.executionList = executionList;
           this.loading3 = false;
@@ -4112,6 +4181,7 @@ export class FuwutaiComponent implements OnInit {
       if(this.incomingService.getSign() === 'callCenter' && this.incomingService.getPhoneNumber()){
         this.jry_shixian();
       }
+			this.goType = null;
       this.newOrderShow = false; //关闭弹窗
       this.newOrderShowOpen = false; //此时可出现新的弹窗
       this.showPromptModal("操作", true, "", "");
@@ -4652,7 +4722,7 @@ export class FuwutaiComponent implements OnInit {
     console.log(this.workTypesArrange[index].value);
     let taskType = this.workTypesArrange[index].value.find(v => v.id == value);
     let patientCode;
-		this.taskType = taskType.associationTypeValue
+		// this.taskType = taskType.associationTypeValue?taskType.associationTypeValue:null
     if(taskType.associationTypeValue === 'inspect'){
       patientCode = this.patientZy;
       this.requiredConfigChange('validateFormZy', 'startDept', false);
@@ -4779,8 +4849,9 @@ export class FuwutaiComponent implements OnInit {
       return;
     }
 		let index = this.tabIndex;
-		let item = this.workTypesArrange[1].value.find(v => v.id == value);
-		this.taskType = item.associationTypeValue
+		// let item = this.workTypesArrange[1].value.find(v => v.id == value);
+		// console.log(788787,item)
+		// this.taskType = item.associationTypeValue?item.associationTypeValue:null
 		this.psValue = value
     this.startDeptQt = null;
     this.endDeptQt = null;
@@ -4842,26 +4913,33 @@ export class FuwutaiComponent implements OnInit {
 
   //新建工单->确定提交
   isGoLoading = false;
+	goType:any;
   newOrderOk(go?): void {
+		this.goType = go
     console.log(this.radioValueQt);
     let arr = this.workTypesArrange.find(v => v.key === this.currentTabIndex);
     let objQt = arr.value.find(v => v.id == this.radioValueQt);
     let objZy = arr.value.find(v => v.id == this.radioValueZy);
     if (this.isYyInspect && objQt && objQt.associationTypeValue === 'other') {
       this.clickYYFlag = true;
+			console.log(110)
     } else {
+			console.log(111)
       this.clickYYFlag = false;
     }
     if (this.isYyInspect && objZy && (objZy.associationTypeValue === 'patientTransport' || objZy.associationTypeValue === 'inspect')) {
       this.clickYYZyFlag = true;
+			console.log(112)
     } else {
       this.clickYYZyFlag = false;
+			console.log(113)
     }
 
     if (
       (!this.yyTime && objQt && objQt.associationTypeValue === 'other' && this.isYyInspect) ||
       (!this.yyTimeZy && objZy && (objZy.associationTypeValue === 'patientTransport' || objZy.associationTypeValue === 'inspect') && this.isYyInspect)
     ) {
+			console.log(114)
       return;
     }
 
@@ -4902,6 +4980,7 @@ export class FuwutaiComponent implements OnInit {
     this.currentTabIndex = "";
     this.fixedTab = "";
     this.fixedMenuShangla();
+		this.goType = null;
     this.radioValueQt = null;
     this.startDeptQt = null;
     this.endDeptQt = null;
@@ -5061,13 +5140,23 @@ export class FuwutaiComponent implements OnInit {
     this.mainService.buildOrder(postData).subscribe((result:any) => {
       this.createLoading = false;
       this.deptFlag = false;
+			this.dataStatus = result["status"];
       if (result["status"] == 200) {
         this.showPromptModal("建单", true, "");
-      } else if(result["status"] == 1000033){
+      } 
+			else if(result["status"] == 1000033){
+				if (this.goType === "&go&") {
+					this.applyDept = result["startDept"].id;
+					this.applyStartDept = result["startDept"];
+					this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = result["phone"];
+				}
 				//重复建单那策略
-				this.repeatMsg = result.msg;
-				this.showRepeatModal(postData, "");
-      }else{
+				this.repeatMsg = result["msg"];
+				this.showRepeatModal(postData, "ordinary", this.goType);
+      }else if (result["status"] == 100043){
+				this.showPromptModal("建单", true, result["msg"]);
+			}
+			else{
 				this.showPromptModal("建单", false, result["msg"]);
 			}
     });
@@ -5084,34 +5173,7 @@ export class FuwutaiComponent implements OnInit {
 	isShowConfirm:boolean = true;
 	isShowConfirmInfo:string = '';
 	newOrderTimeFun(order, fun1, fun2){
-	  if(this.currentDept.typeValue != 'recovery' && this.currentDept.typeValue != 'surgery'){
-	    let taskTypeId = order.taskType.id;
-	    let deptId = order.createDept;
-	    let maskFlag = this.msg.loading("正在加载中..", {
-	      nzDuration: 0,
-	    }).messageId;
-	    this.mainService
-	    .postCustom("api", "compareWorkTime", {taskTypeId, deptId, yyTime: order.yyTime})
-	    .subscribe((data) => {
-	      this.msg.remove(maskFlag);
-	      if(data.state == 200){
-	        fun2.call(this);
-	      }else{
-	        fun1.call(this);
-	        this.limitTimeModal = true;
-	        this.limitTimeItem = {taskTypeId, fun1, fun2};
-	        this.limitTimeInfo = data.data.remark;
-	        this.isShowConfirm = data.data.limitType == 1;
-	        if(this.isShowConfirm || data.data.limitNum == 1){
-	          this.isShowConfirmInfo = '';
-	        }else{
-	          this.isShowConfirmInfo = '请在规定时间内下单';
-	        }
-	      }
-	    })
-	  }else{
-	    fun2.call(this);
-	  }
+	  fun2.call(this)
 	}
 	
 	repeatModal: boolean = false; //删除模态框
@@ -5119,121 +5181,156 @@ export class FuwutaiComponent implements OnInit {
 	loadingRepeat = false;
 	repeatPostData;
 	sourceType;
-	isYuyue;
-	showRepeatModal(postData, sourceType, yuyue?) {
+	showRepeatModal(postData, sourceType, go) {
 	  this.repeatModal = true;
 	  this.repeatPostData = postData;
 	  this.sourceType = sourceType;
-	  this.isYuyue = yuyue ? yuyue : false;
+		// if(this.goType=='&go&'){
+		// 	this.showRepetitionModal("建单", true, "", "closeGo");
+		// }
 	}
 	hideRepeatModal() {
 	  this.repeatModal = false;
 	  this.btnLoading = false;
+		this.confirmType = false;
+		if(this.goType=='&go&'){
+			console.log('fou222222')
+			this.showNewOrder("&go&");
+			// this.showRepetitionModal("建单", true, "", "closeGo");
+		}
 	}
+	
+	confirmType:boolean = false;
 	confirmRepeat() {
+		this.confirmType = true;
 	  this.loadingRepeat = true;
 	  this.repeatPostData.tipsCreateOder = 1;
-	  this.newOrderTimeFun(this.repeatPostData.workOrder, () => {
+		let url = null;
+		if(this.isYyInspect){
+			url = this.mainService.postCustom("api", "appointmentOrder", this.repeatPostData)
+		}else{
+			url = this.mainService.buildOrder(this.repeatPostData)
+		}
+	 url.subscribe((data) => {
 	    this.loadingRepeat = false;
 	    this.repeatModal = false;
-	  }, () => {
-	    this.mainService
-	    .postCustom(
-	      "api",
-	      this.isYuyue ? "appointmentOrder" : "startOrder",
-	      this.repeatPostData
-	    )
-	    .subscribe((data) => {
-	      this.loadingRepeat = false;
-	      this.repeatModal = false;
-	      if(this.currentDept.typeValue == 'recovery'){
-	        this.mainService.postCustom("api", "clearPatientRecoveryDept", {patientCode: this.repeatPostData.workOrder.patient.patientCode}).subscribe((resultData) => {
-	          this.confirmRepeatFun(data);
-	        });
-	      }else{
-	        this.confirmRepeatFun(data);
-	      }
-	    });
-	  })
+			if(this.currentDept.typeValue == 'recovery'){
+			  this.mainService.postCustom("api", "clearPatientRecoveryDept", {patientCode: this.repeatPostData.workOrder.patient.patientCode}).subscribe((resultData) => {
+			    this.confirmRepeatFun(data);
+			  });
+			}else{
+			  this.confirmRepeatFun(data);
+			}
+	    
+	  });
 	}
 	confirmRepeatFun(data){
+		console.log(10087,this.sourceType)
 	  if (this.sourceType === "specimen") {
 	    // 标本建单
-	    if (data.status == 200 && (this.taskType == "other" || this.taskType == "ordinary")) {
-	      this.showPromptModal("创建", true, "", this.taskType);
-	    } else if (data.status == 200 && this.taskType == "bb") {
-	      this.showPromptModal("创建", true, "", "bb");
-	    } else if (this.taskType == "bb" && data.status == 100043) {
-	      this.showPromptModal("创建", true, data.msg);
-	    } else {
-	      this.showPromptModal("创建", false, data.msg);
-	    }
+			if (data.status == 200){
+				this.showRepetitionModal("创建", true, "");
+			}else if(data.status == 100043){
+				this.showRepetitionModal("创建", true, data.msg);
+			}else{
+				this.showRepetitionModal("创建", false, data.msg);
+			}
+	  //   if (data.status == 200 && (this.taskType == "other" || this.taskType == "ordinary")) {
+	  //     this.showRepetitionModal("创建", true, "", this.taskType);
+	  //   } else if (data.status == 200 && this.taskType == "bb") {
+	  //     this.showRepetitionModal("创建", true, "", "bb");
+	  //   } else if (this.taskType == "bb" && data.status == 100043) {
+	  //     this.showRepetitionModal("创建", true, data.msg);
+	  //   } else if (data.status == 100043){
+	  //     this.showRepetitionModal("创建", true, data.msg);
+	  //   } else {
+			// 	this.showRepetitionModal("创建", false, data.msg);
+			// }
 	  } else if (this.sourceType === "other" || this.sourceType === "ordinary") {
 			// 其他建单
-	    if (data.status == 200 && (this.taskType == "other" || this.taskType == "ordinary")) {
-	      this.showPromptModal("创建", true, "", this.taskType);
-	    } else if (data.status == 200 && this.taskType == "bb") {
-	      this.showPromptModal("创建", true, "", "bb");
-	    } else if (this.taskType == "bb" && data.status == 100043) {
-	      this.showPromptModal("创建", true, data.msg);
-	    } else {
-	      this.showPromptModal("创建", false, data.msg);
-	    }
+			if (data.status == 200){
+				this.showRepetitionModal("创建", true, "");
+			}else if(data.status == 100043){
+				this.showRepetitionModal("创建", true, data.msg);
+			}else{
+				this.showRepetitionModal("创建", false, data.msg);
+			}
+	    // if (data.status == 200 && (this.taskType == "other" || this.taskType == "ordinary")) {
+	    //   this.showRepetitionModal("创建", true, "", this.taskType);
+	    // } else if (data.status == 200 && this.taskType == "bb") {
+	    //   this.showRepetitionModal("创建", true, "", "bb");
+	    // } else if (this.taskType == "bb" && data.status == 100043) {
+	    //   this.showRepetitionModal("创建", true, data.msg);
+	    // } else if (data.status == 100043){
+	    //   this.showRepetitionModal("创建", true, data.msg);
+	    // } else {
+	    //   this.showRepetitionModal("创建", false, data.msg);
+	    // }
 	  } else if (this.sourceType === "transport") {
 	    // 转运
 	    if (data.status == 200) {
-	      this.showPromptModal("创建", true, "");
+	      this.showRepetitionModal("创建", true, "");
 	    } else if (data.status == 100042) {
-	      this.showPromptModal("创建", false, data.msg);
+	      this.showRepetitionModal("创建", false, data.msg);
 	    } else {
-	      this.showPromptModal("创建", false, data.msg);
+	      this.showRepetitionModal("创建", false, data.msg);
 	    }
 	  } else if (this.sourceType === "accompany1") {
 	    // 陪检
 	    if (data.status == 200) {
-	      this.showPromptModal("创建", true, "");
+	      this.showRepetitionModal("创建", true, "");
 	    } else if (data.status == 100042) {
-	      this.showPromptModal("创建", false, data.msg);
+	      this.showRepetitionModal("创建", false, data.msg);
 	    } else {
-	      this.showPromptModal("创建", false, data.msg);
+	      this.showRepetitionModal("创建", false, data.msg);
 	    }
 	  } else if (this.sourceType === "accompany2") {
 	    // 陪检
 	    if (data.status == 200) {
-	      this.showPromptModal("创建", true, "");
+	      this.showRepetitionModal("创建", true, "");
 	    } else if (data.status == 100042) {
-	      this.showPromptModal("创建", false, data.msg);
+	      this.showRepetitionModal("创建", false, data.msg);
 	    } else {
-	      this.showPromptModal("创建", false, data.msg);
+	      this.showRepetitionModal("创建", false, data.msg);
 	    }
 	  } else if (this.sourceType === "accompany3") {
 	    // 陪检
 	    if (data.status == 200) {
-	      this.showPromptModal("创建", true, "");
+	      this.showRepetitionModal("创建", true, "");
 	    } else if (data.status == 100042) {
-	      this.showPromptModal("创建", false, data.msg);
+	      this.showRepetitionModal("创建", false, data.msg);
 	    } else {
-	      this.showPromptModal("创建", false, data.msg);
+	      this.showRepetitionModal("创建", false, data.msg);
 	    }
 	  } else if (this.sourceType === "accompany4") {
 	    // 陪检
 	    if (data.status == 200) {
-	      this.showPromptModal("创建", true, "");
+	      this.showRepetitionModal("创建", true, "");
 	    } else if (data.status == 100042) {
-	      this.showPromptModal("创建", false, data.msg);
+	      this.showRepetitionModal("创建", false, data.msg);
 	    } else {
-	      this.showPromptModal("创建", false, data.msg);
+	      this.showRepetitionModal("创建", false, data.msg);
 	    }
 	  } else if (this.sourceType === "accompany5") {
 	    // 陪检
 	    if (data.status == 200) {
-	      this.showPromptModal("创建", true, "");
+	      this.showRepetitionModal("创建", true, "");
 	    } else if (data.status == 100042) {
-	      this.showPromptModal("创建", false, data.msg);
+	      this.showRepetitionModal("创建", false, data.msg);
 	    } else {
-	      this.showPromptModal("创建", false, data.msg);
+	      this.showRepetitionModal("创建", false, data.msg);
 	    }
-	  }
+	  } else {
+			if (data.status == 200) {
+			  this.showRepetitionModal("创建", true, "");
+			} else if (data.status == 100042) {
+			  this.showRepetitionModal("创建", false, data.msg);
+			} else if (data.status == 100043) {
+			  this.showRepetitionModal("创建", true, data.msg);
+			} else {
+			  this.showRepetitionModal("创建", false, data.msg);
+			}
+		}
 	}
 	
   // 隐藏选择转入科室的模态框
@@ -5328,14 +5425,48 @@ export class FuwutaiComponent implements OnInit {
         }
       });
   }
-
+	
+	// 确认
+	jdFlagId;
+	limitTimeLoading:boolean = false;
+	confirmLimitTime() {
+	  console.log(this.limitTimeItem);
+	  this.limitTimeModal = false;
+	  this.jdFlagId = this.msg.loading("正在加载中..", {
+	    nzDuration: 0,
+	  }).messageId;
+	  this.limitTimeItem.fun2.call(this);
+	}
+	
   closeModel(e) {
+		console.log(99999,e)
     if (e === "close") {
+			this.goType = null;
       this.newOrderShowOpen = false; //此时可出现新的弹窗
     } else if (e === "closeGo") {
+			console.log(1111)
       this.showNewOrder("&go&");
-    }
+    }else if(this.dataStatus==1000033 && this.goType=='&go&'){
+			console.log(2222)
+			this.showNewOrder("&go&");
+		}
   }
+	
+	// 重复建单提示框
+	showRepetitionModal(con, success, promptInfo?, back?){
+		this.promptModalShow = false;
+		this.promptContent = con;
+		this.ifSuccess = success;
+		this.promptInfo = promptInfo;
+		this.back = back || "";
+		setTimeout(() => {
+			if(this.confirmType || this.goType=='&go&'){
+				this.showPromptModalRefresh();
+				this.promptModalShow = true;
+			}
+		}, 100);
+	}
+	
   // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
   showPromptModal(con, success, promptInfo?, back?) {
     this.promptModalShow = false;
@@ -5350,6 +5481,8 @@ export class FuwutaiComponent implements OnInit {
   }
 
   showPromptModalRefresh(){
+		// this.goType = null;
+		// this.confirmType = false;
     this.getUnassignedBuilding2();
     this.resetList();
     this.getOrderList(1);
@@ -5366,8 +5499,8 @@ export class FuwutaiComponent implements OnInit {
     } else if (this.currentRTab === 3) {
       this.getDictionaryList();
     }
-		this.newOrderShow = false;
-		this.newOrderShowOpen = false;
+		// this.newOrderShow = false;
+		// this.newOrderShowOpen = false;
     this.fixedTab = "";
     this.fixedMenuShangla();
   }

src/app/views/home/home.component.html

@@ -222,7 +222,7 @@
 										 <div>评价时间：{{data.evaluationTime|date:'yyyy-MM-dd HH:mm:ss' || ''}}</div>
 										 <div>评价等级：{{data.evaluationLevel ? data.evaluationLevel.name : '-'}}</div>
 									 </div>
-                  <div class="time">发起时间：{{data.startTime|date:'yyyy-MM-dd HH:mm:ss'}}</div>
+                  <!-- <div class="time">发起时间：{{data.startTime|date:'yyyy-MM-dd HH:mm:ss'}}</div> -->
                 </div>
                 <div class="btns display_flex">
                   <div class="btn flex_1" (click)="designate(data.id,data.hosId)">指派</div>

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

@@ -191,7 +191,7 @@
 				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择报修人!">
 				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changerepairUserInp($event)" formControlName="repairUserId" nzPlaceHolder="请选择报修人" (nzOpenChange)="openChangerepairUser($event)" (ngModelChange)="setIsSelecting(true)">
 				      <ng-container *ngFor="let option of repairUserList">
-				        <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+				        <nz-option *ngIf="!isLoading" [nzLabel]="option.name +'('+ option.account +')'" [nzValue]="option.id"></nz-option>
 				      </ng-container>
 				      <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
 				        <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -233,7 +233,7 @@
 				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择耗材!">
 				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeConsumableInp($event)" formControlName="consumableId" nzPlaceHolder="请选择耗材" (nzOpenChange)="openChangeConsumable($event)" (ngModelChange)="setIsSelecting(true)">
 				      <ng-container *ngFor="let option of consumableList">
-				        <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+				        <nz-option *ngIf="!isLoading" [nzLabel]="option.name +'-'+ option.model +'-'+ option.unit +'-'+ option.price" [nzValue]="option.id"></nz-option>
 				      </ng-container>
 				      <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
 				        <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...

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

@@ -19,6 +19,7 @@ export class SearchMoreComponent implements OnInit {
   @Input() parentDutyId: any;
   @Input() dutyId: any;
   @Input() queryType: any;
+	@Input() going: boolean = false;
   validateForm: FormGroup;//表单
   searchTimerSubject = new Subject();
   constructor(
@@ -91,6 +92,40 @@ export class SearchMoreComponent implements OnInit {
 			codeNum: [this.fieldConfig.fields.codeNum || null],
 			overtimeId: [this.fieldConfig.fields.overtimeDTO ? this.fieldConfig.fields.overtimeDTO.id  : null],
 		});
+		
+		if(this.going && this.fieldConfig.fields.groupId){
+			this.getGroupList();
+		}
+		
+		if(this.going && this.fieldConfig.fields.userId){
+			this.getUserList();
+		}
+		
+		if(this.going && this.fieldConfig.fields.category1DTO){
+			this.getCategory1List();
+		}
+		
+		if(this.going && this.fieldConfig.fields.category2DTO){
+			this.getCategory2List();
+		}
+		
+		if(this.going && this.fieldConfig.fields.category3DTO){
+			this.getCategory3List();
+		}
+		
+		if(this.going && this.fieldConfig.fields.buildingId){
+			this.getBuildingList();
+		}
+		
+		if(this.going && this.fieldConfig.fields.floorId){
+			this.getFloorList();
+		}
+		
+		if(this.going && this.fieldConfig.fields.companyId){
+			this.getCompanyList();
+		}
+		
+		
   }
   // 表单提交
   submitForm(): void {
@@ -287,18 +322,18 @@ export class SearchMoreComponent implements OnInit {
   // 获取维修人员列表
   userList:any[] = [];
   getUserList(keyword = ''){
-    if(!this.validateForm.value.groupId){
-      this.isLoading = false;
-      this.userList = [];
-      return;
-    }
+    // if(!this.validateForm.value.groupId){
+    //   this.isLoading = false;
+    //   this.userList = [];
+    //   return;
+    // }
     let postData: any = {
       idx: 0,
       sum: 20,
       user: {
         name: keyword,
         simpleQuery: true,
-        groupdata: { id: this.validateForm.value.groupId },
+        // groupdata: { id: this.validateForm.value.groupId },
         roleCodes: 'first-line support,second-line support,incident manager',
         engineer: 1,
       },
@@ -644,6 +679,11 @@ export class SearchMoreComponent implements OnInit {
 	// 获取工时小类列表
 	workHourSmallList:any[] = [];
 	getWorkHourSmallList(keyword?){
+		if(!this.validateForm.value.workHourParentId){
+		  this.isLoading = false;
+		  this.workHourSmallList = [];
+		  return;
+		}
 	  let postData: any = {
 	    idx: 0,
 	    sum: 20,
@@ -701,9 +741,8 @@ export class SearchMoreComponent implements OnInit {
 	    sum: 20,
 			user: {
 			  name: keyword,
-			  hospital: { id: this.tool.getCurrentHospital().id },
 			  engineer: 1,
-			  simpleQuery: true,
+			  // simpleQuery: true,
 			},
 	  };
 	  this.isLoading = true;
@@ -736,7 +775,6 @@ export class SearchMoreComponent implements OnInit {
 	    sum: 20,
 	    consumable: {
 				name: keyword,
-	      hosId: this.tool.getCurrentHospital().id,
 	      quoteOther: 0,
 	    },
 	  };

src/app/views/new-statistics/maintenance-statistics/category-one-statistics/category-one-statistics.component.html

@@ -36,15 +36,15 @@
   <tbody>
     <tr *ngFor="let data of listOfData">
       <td>{{ data.category }}</td>
-      <td (click)="viewDetail1(data)">{{ data.sum }}</td>
+      <td class="text-sign" (click)="viewDetail1(data)">{{ data.sum }}</td>
       <td>{{ data.avgResponseTime }}</td>
       <td>{{ data.avgResolvedTime }}</td>
-      <td (click)="viewDetail2(data)">{{ data.resolvedOverNum }}</td>
-      <td (click)="viewDetail3(data)">{{ data.overTimeNum }}</td>
+      <td class="text-sign" (click)="viewDetail2(data)">{{ data.resolvedOverNum }}</td>
+      <td class="text-sign" (click)="viewDetail3(data)">{{ data.overTimeNum }}</td>
       <td>{{ data.consumablePrice }}</td>
       <td>{{ data.workHourPrice }}</td>
       <td>{{ data.totalPrice }}</td>
-      <td (click)="viewDetail4(data)">{{ data.negativeNum }}</td>
+      <td class="text-sign" (click)="viewDetail4(data)">{{ data.negativeNum }}</td>
       <td>{{ data.favorableRate }}</td>
     </tr>
   </tbody>
@@ -52,15 +52,15 @@
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
         <td style="width: 10%">{{ data.category }}</td>
-        <td style="width: 9%" (click)="viewDetail1(data, 'all')">{{ data.sum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail1(data, 'all')">{{ data.sum }}</td>
         <td style="width: 9%">{{ data.avgResponseTime }}</td>
         <td style="width: 9%">{{ data.avgResolvedTime }}</td>
-        <td style="width: 9%" (click)="viewDetail2(data, 'all')">{{ data.resolvedOverNum }}</td>
-        <td style="width: 9%" (click)="viewDetail3(data, 'all')">{{ data.overTimeNum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail2(data, 'all')">{{ data.resolvedOverNum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail3(data, 'all')">{{ data.overTimeNum }}</td>
         <td style="width: 9%">{{ data.consumablePrice }}</td>
         <td style="width: 9%">{{ data.workHourPrice }}</td>
         <td style="width: 9%">{{ data.totalPrice }}</td>
-        <td style="width: 9%" (click)="viewDetail4(data, 'all')">{{ data.negativeNum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail4(data, 'all')">{{ data.negativeNum }}</td>
         <td style="width: 9%">{{ data.favorableRate }}</td>
       </tr>
     </table>

src/app/views/new-statistics/maintenance-statistics/category-one-statistics/category-one-statistics.component.less

@@ -5,6 +5,10 @@
   right: 0;
   bottom: 0;
   left: 0;
+	.text-sign{
+		text-decoration: underline;
+		cursor: pointer;
+	}
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
     width: calc(100% - 15px);

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

@@ -52,8 +52,20 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					companyId: this.fieldConfig.fields.companyId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
 				}
 			}
 		}else{
@@ -65,11 +77,17 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
 					statusValue: 'close',
 					hierarchy: data.hierarchy,
 					categoryId: data.categoryId,
-					groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+					groupId: this.fieldConfig.fields.groupId || undefined,
 					userId: this.fieldConfig.fields.userId || undefined,
 					buildingId: this.fieldConfig.fields.buildingId || undefined,
 					placeId: this.fieldConfig.fields.floorId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
 					companyId: this.fieldConfig.fields.companyId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
 				}
 			}
 		}
@@ -85,9 +103,21 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					overtimeId: 1,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					companyId: this.fieldConfig.fields.companyId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
 				}
 			}
 		}else{
@@ -100,11 +130,17 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
 					hierarchy: data.hierarchy,
 					categoryId: data.categoryId,
 					overtimeId: 1,
-					groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+					groupId: this.fieldConfig.fields.groupId || undefined,
 					userId: this.fieldConfig.fields.userId || undefined,
 					buildingId: this.fieldConfig.fields.buildingId || undefined,
 					placeId: this.fieldConfig.fields.floorId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
 					companyId: this.fieldConfig.fields.companyId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
 				}
 			}
 		}
@@ -120,9 +156,21 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					isHangId: 1,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					companyId: this.fieldConfig.fields.companyId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
 				}
 			}
 		}else{
@@ -135,11 +183,17 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
 					hierarchy: data.hierarchy,
 					categoryId: data.categoryId,
 					isHangId: 1,
-					groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+					groupId: this.fieldConfig.fields.groupId || undefined,
 					userId: this.fieldConfig.fields.userId || undefined,
 					buildingId: this.fieldConfig.fields.buildingId || undefined,
 					placeId: this.fieldConfig.fields.floorId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
 					companyId: this.fieldConfig.fields.companyId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
 				}
 			}
 		}
@@ -155,9 +209,21 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					evaluateId: 20424,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					companyId: this.fieldConfig.fields.companyId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
 				}
 			}
 		}else{
@@ -170,11 +236,17 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
 					hierarchy: data.hierarchy,
 					categoryId: data.categoryId,
 					evaluateId: 20424,
-					groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+					groupId: this.fieldConfig.fields.groupId || undefined,
 					userId: this.fieldConfig.fields.userId || undefined,
 					buildingId: this.fieldConfig.fields.buildingId || undefined,
 					placeId: this.fieldConfig.fields.floorId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
 					companyId: this.fieldConfig.fields.companyId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
 				}
 			}
 		}
@@ -254,6 +326,7 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
       userId: this.fieldConfig.fields.userId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
+      floorId: this.fieldConfig.fields.floorId || undefined,
       companyId: this.fieldConfig.fields.companyId || undefined,
       repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
       categoryLevel: 1,
@@ -307,6 +380,7 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
       userId: this.fieldConfig.fields.userId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
+      floorId: this.fieldConfig.fields.floorId || undefined,
       companyId: this.fieldConfig.fields.companyId || undefined,
       repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
       categoryLevel: 1,
@@ -345,6 +419,7 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
     this.dateRange = []
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined, repairDeptId: undefined};
     this.customChangeDateComponent.resetByDate();
+		sessionStorage.removeItem('maintenanceData');
     this.search();
   }
 

src/app/views/new-statistics/maintenance-statistics/category-three-statistics/category-three-statistics.component.html

@@ -56,15 +56,15 @@
   <tbody>
     <tr *ngFor="let data of listOfData">
       <td>{{ data.category }}</td>
-      <td (click)="viewDetail1(data)">{{ data.sum }}</td>
+      <td class="text-sign" (click)="viewDetail1(data)">{{ data.sum }}</td>
       <td>{{ data.avgResponseTime }}</td>
       <td>{{ data.avgResolvedTime }}</td>
-      <td (click)="viewDetail2(data)">{{ data.resolvedOverNum }}</td>
-      <td (click)="viewDetail3(data)">{{ data.overTimeNum }}</td>
+      <td class="text-sign" (click)="viewDetail2(data)">{{ data.resolvedOverNum }}</td>
+      <td class="text-sign" (click)="viewDetail3(data)">{{ data.overTimeNum }}</td>
       <td>{{ data.consumablePrice }}</td>
       <td>{{ data.workHourPrice }}</td>
       <td>{{ data.totalPrice }}</td>
-      <td (click)="viewDetail4(data)">{{ data.negativeNum }}</td>
+      <td class="text-sign" (click)="viewDetail4(data)">{{ data.negativeNum }}</td>
       <td>{{ data.favorableRate }}</td>
     </tr>
   </tbody>
@@ -72,15 +72,15 @@
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
         <td style="width: 10%">{{ data.category }}</td>
-        <td style="width: 9%" (click)="viewDetail1(data, 'all')">{{ data.sum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail1(data, 'all')">{{ data.sum }}</td>
         <td style="width: 9%">{{ data.avgResponseTime }}</td>
         <td style="width: 9%">{{ data.avgResolvedTime }}</td>
-        <td style="width: 9%" (click)="viewDetail2(data, 'all')">{{ data.resolvedOverNum }}</td>
-        <td style="width: 9%" (click)="viewDetail3(data, 'all')">{{ data.overTimeNum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail2(data, 'all')">{{ data.resolvedOverNum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail3(data, 'all')">{{ data.overTimeNum }}</td>
         <td style="width: 9%">{{ data.consumablePrice }}</td>
         <td style="width: 9%">{{ data.workHourPrice }}</td>
         <td style="width: 9%">{{ data.totalPrice }}</td>
-        <td style="width: 9%" (click)="viewDetail4(data, 'all')">{{ data.negativeNum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail4(data, 'all')">{{ data.negativeNum }}</td>
         <td style="width: 9%">{{ data.favorableRate }}</td>
       </tr>
     </table>

src/app/views/new-statistics/maintenance-statistics/category-three-statistics/category-three-statistics.component.less

@@ -5,6 +5,10 @@
   right: 0;
   bottom: 0;
   left: 0;
+	.text-sign{
+		text-decoration: underline;
+		cursor: pointer;
+	}
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
     width: calc(100% - 15px);

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

@@ -59,12 +59,36 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
 	// 数据下钻
 	viewDetail1(data, type){
 		let query = null
+		let item1 = null;
+		let item2 = null;
+		if(this.category1Id){
+		  item1 = this.category1List.find(item => item.id == this.category1Id);
+		}
+		if(this.category2Id){
+		  item2 = this.category2List.find(item => item.id == this.category2Id);
+		}
 		if(type=='all'){
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
+					categoryId: this.category1Id && this.category2Id ? this.category2Id : this.category1Id,
+					hierarchy: this.category1Id && this.category2Id ? 2 : 1,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					companyId: this.fieldConfig.fields.companyId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					category1DTO: item1 || undefined,
+					category2DTO: item2 || undefined,
 				}
 			}
 		}else{
@@ -76,11 +100,19 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
 					statusValue: 'close',
 					hierarchy: data.hierarchy,
 					categoryId: data.categoryId,
-					groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+					groupId: this.fieldConfig.fields.groupId || undefined,
 					userId: this.fieldConfig.fields.userId || undefined,
 					buildingId: this.fieldConfig.fields.buildingId || undefined,
 					placeId: this.fieldConfig.fields.floorId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
 					companyId: this.fieldConfig.fields.companyId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					category1DTO: item1 || undefined,
+					category2DTO: item2 || undefined,
 				}
 			}
 		}
@@ -92,13 +124,37 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
 	// 数据下钻
 	viewDetail2(data, type){
 		let query = null
+		let item1 = null;
+		let item2 = null;
+		if(this.category1Id){
+		  item1 = this.category1List.find(item => item.id == this.category1Id);
+		}
+		if(this.category2Id){
+		  item2 = this.category2List.find(item => item.id == this.category2Id);
+		}
 		if(type=='all'){
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					overtimeId: 1,
+					categoryId: this.category1Id && this.category2Id ? this.category2Id : this.category1Id,
+					hierarchy: this.category1Id && this.category2Id ? 2 : 1,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					companyId: this.fieldConfig.fields.companyId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					category1DTO: item1 || undefined,
+					category2DTO: item2 || undefined,
 				}
 			}
 		}else{
@@ -111,11 +167,19 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
 					hierarchy: data.hierarchy,
 					categoryId: data.categoryId,
 					overtimeId: 1,
-					groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+					groupId: this.fieldConfig.fields.groupId || undefined,
 					userId: this.fieldConfig.fields.userId || undefined,
 					buildingId: this.fieldConfig.fields.buildingId || undefined,
 					placeId: this.fieldConfig.fields.floorId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
 					companyId: this.fieldConfig.fields.companyId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					category1DTO: item1 || undefined,
+					category2DTO: item2 || undefined,
 				}
 			}
 		}
@@ -127,13 +191,37 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
 	// 数据下钻
 	viewDetail3(data, type){
 		let query = null
+		let item1 = null;
+		let item2 = null;
+		if(this.category1Id){
+		  item1 = this.category1List.find(item => item.id == this.category1Id);
+		}
+		if(this.category2Id){
+		  item2 = this.category2List.find(item => item.id == this.category2Id);
+		}
 		if(type=='all'){
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					isHangId: 1,
+					categoryId: this.category1Id && this.category2Id ? this.category2Id : this.category1Id,
+					hierarchy: this.category1Id && this.category2Id ? 2 : 1,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					companyId: this.fieldConfig.fields.companyId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					category1DTO: item1 || undefined,
+					category2DTO: item2 || undefined,
 				}
 			}
 		}else{
@@ -146,11 +234,19 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
 					hierarchy: data.hierarchy,
 					categoryId: data.categoryId,
 					isHangId: 1,
-					groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+					groupId: this.fieldConfig.fields.groupId || undefined,
 					userId: this.fieldConfig.fields.userId || undefined,
 					buildingId: this.fieldConfig.fields.buildingId || undefined,
 					placeId: this.fieldConfig.fields.floorId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
 					companyId: this.fieldConfig.fields.companyId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					category1DTO: item1 || undefined,
+					category2DTO: item2 || undefined,
 				}
 			}
 		}
@@ -162,13 +258,37 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
 	// 数据下钻
 	viewDetail4(data, type){
 		let query = null
+		let item1 = null;
+		let item2 = null;
+		if(this.category1Id){
+		  item1 = this.category1List.find(item => item.id == this.category1Id);
+		}
+		if(this.category2Id){
+		  item2 = this.category2List.find(item => item.id == this.category2Id);
+		}
 		if(type=='all'){
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					evaluateId: 20424,
+					categoryId: this.category1Id && this.category2Id ? this.category2Id : this.category1Id,
+					hierarchy: this.category1Id && this.category2Id ? 2 : 1,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					companyId: this.fieldConfig.fields.companyId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					category1DTO: item1 || undefined,
+					category2DTO: item2 || undefined,
 				}
 			}
 		}else{
@@ -181,11 +301,19 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
 					hierarchy: data.hierarchy,
 					categoryId: data.categoryId,
 					evaluateId: 20424,
-					groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+					groupId: this.fieldConfig.fields.groupId || undefined,
 					userId: this.fieldConfig.fields.userId || undefined,
 					buildingId: this.fieldConfig.fields.buildingId || undefined,
 					placeId: this.fieldConfig.fields.floorId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
 					companyId: this.fieldConfig.fields.companyId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					category1DTO: item1 || undefined,
+					category2DTO: item2 || undefined,
 				}
 			}
 		}
@@ -362,6 +490,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
     this.category2Id = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined, repairDeptId: undefined};
     this.customChangeDateComponent.resetByDate();
+		sessionStorage.removeItem('maintenanceData');
     this.search();
   }
 

src/app/views/new-statistics/maintenance-statistics/category-two-statistics/category-two-statistics.component.html

@@ -46,15 +46,15 @@
   <tbody>
     <tr *ngFor="let data of listOfData">
       <td>{{ data.category }}</td>
-      <td (click)="viewDetail1(data)">{{ data.sum }}</td>
+      <td class="text-sign" (click)="viewDetail1(data)">{{ data.sum }}</td>
       <td>{{ data.avgResponseTime }}</td>
       <td>{{ data.avgResolvedTime }}</td>
-      <td (click)="viewDetail2(data)">{{ data.resolvedOverNum }}</td>
-      <td (click)="viewDetail3(data)">{{ data.overTimeNum }}</td>
+      <td class="text-sign" (click)="viewDetail2(data)">{{ data.resolvedOverNum }}</td>
+      <td class="text-sign" (click)="viewDetail3(data)">{{ data.overTimeNum }}</td>
       <td>{{ data.consumablePrice }}</td>
       <td>{{ data.workHourPrice }}</td>
       <td>{{ data.totalPrice }}</td>
-      <td (click)="viewDetail4(data)">{{ data.negativeNum }}</td>
+      <td class="text-sign" (click)="viewDetail4(data)">{{ data.negativeNum }}</td>
       <td>{{ data.favorableRate }}</td>
     </tr>
   </tbody>
@@ -62,15 +62,15 @@
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
         <td style="width: 10%">{{ data.category }}</td>
-        <td style="width: 9%" (click)="viewDetail1(data, 'all')">{{ data.sum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail1(data, 'all')">{{ data.sum }}</td>
         <td style="width: 9%">{{ data.avgResponseTime }}</td>
         <td style="width: 9%">{{ data.avgResolvedTime }}</td>
-        <td style="width: 9%" (click)="viewDetail2(data, 'all')">{{ data.resolvedOverNum }}</td>
-        <td style="width: 9%" (click)="viewDetail3(data, 'all')">{{ data.overTimeNum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail2(data, 'all')">{{ data.resolvedOverNum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail3(data, 'all')">{{ data.overTimeNum }}</td>
         <td style="width: 9%">{{ data.consumablePrice }}</td>
         <td style="width: 9%">{{ data.workHourPrice }}</td>
         <td style="width: 9%">{{ data.totalPrice }}</td>
-        <td style="width: 9%" (click)="viewDetail4(data, 'all')">{{ data.negativeNum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail4(data, 'all')">{{ data.negativeNum }}</td>
         <td style="width: 9%">{{ data.favorableRate }}</td>
       </tr>
     </table>

src/app/views/new-statistics/maintenance-statistics/category-two-statistics/category-two-statistics.component.less

@@ -5,6 +5,10 @@
   right: 0;
   bottom: 0;
   left: 0;
+	.text-sign{
+		text-decoration: underline;
+		cursor: pointer;
+	}
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
     width: calc(100% - 15px);

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

@@ -58,13 +58,32 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
 	
 	// 数据下钻
 	viewDetail1(data, type){
-		let query = null
+		let query = null;
+		let item = null;
+		if(this.category1Id){
+		  item = this.category1List.find(item => item.id == this.category1Id);
+		}
 		if(type=='all'){
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
+					categoryId: this.category1Id,
+					hierarchy:1,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					companyId: this.fieldConfig.fields.companyId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					category1DTO: item || undefined,
 				}
 			}
 		}else{
@@ -76,11 +95,18 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
 					statusValue: 'close',
 					hierarchy: data.hierarchy,
 					categoryId: data.categoryId,
-					groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+					groupId: this.fieldConfig.fields.groupId || undefined,
 					userId: this.fieldConfig.fields.userId || undefined,
 					buildingId: this.fieldConfig.fields.buildingId || undefined,
 					placeId: this.fieldConfig.fields.floorId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
 					companyId: this.fieldConfig.fields.companyId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					category1DTO: item || undefined,
 				}
 			}
 		}
@@ -92,13 +118,32 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
 	// 数据下钻
 	viewDetail2(data, type){
 		let query = null
+		let item = null;
+		if(this.category1Id){
+		  item = this.category1List.find(item => item.id == this.category1Id);
+		}
 		if(type=='all'){
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					overtimeId: 1,
+					categoryId: this.category1Id,
+					hierarchy:1,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					companyId: this.fieldConfig.fields.companyId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					category1DTO: item || undefined,
 				}
 			}
 		}else{
@@ -111,11 +156,18 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
 					hierarchy: data.hierarchy,
 					categoryId: data.categoryId,
 					overtimeId: 1,
-					groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+					groupId: this.fieldConfig.fields.groupId || undefined,
 					userId: this.fieldConfig.fields.userId || undefined,
 					buildingId: this.fieldConfig.fields.buildingId || undefined,
 					placeId: this.fieldConfig.fields.floorId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
 					companyId: this.fieldConfig.fields.companyId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					category1DTO: item || undefined,
 				}
 			}
 		}
@@ -127,13 +179,32 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
 	// 数据下钻
 	viewDetail3(data, type){
 		let query = null
+		let item = null;
+		if(this.category1Id){
+		  item = this.category1List.find(item => item.id == this.category1Id);
+		}
 		if(type=='all'){
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					isHangId: 1,
+					categoryId: this.category1Id,
+					hierarchy:1,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					companyId: this.fieldConfig.fields.companyId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					category1DTO: item || undefined,
 				}
 			}
 		}else{
@@ -146,11 +217,18 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
 					hierarchy: data.hierarchy,
 					categoryId: data.categoryId,
 					isHangId: 1,
-					groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+					groupId: this.fieldConfig.fields.groupId || undefined,
 					userId: this.fieldConfig.fields.userId || undefined,
 					buildingId: this.fieldConfig.fields.buildingId || undefined,
 					placeId: this.fieldConfig.fields.floorId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
 					companyId: this.fieldConfig.fields.companyId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					category1DTO: item || undefined,
 				}
 			}
 		}
@@ -162,13 +240,32 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
 	// 数据下钻
 	viewDetail4(data, type){
 		let query = null
+		let item = null;
+		if(this.category1Id){
+		  item = this.category1List.find(item => item.id == this.category1Id);
+		}
 		if(type=='all'){
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					evaluateId: 20424,
+					categoryId: this.category1Id,
+					hierarchy:1,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					companyId: this.fieldConfig.fields.companyId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					category1DTO: item || undefined,
 				}
 			}
 		}else{
@@ -181,11 +278,18 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
 					hierarchy: data.hierarchy,
 					categoryId: data.categoryId,
 					evaluateId: 20424,
-					groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+					groupId: this.fieldConfig.fields.groupId || undefined,
 					userId: this.fieldConfig.fields.userId || undefined,
 					buildingId: this.fieldConfig.fields.buildingId || undefined,
 					placeId: this.fieldConfig.fields.floorId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
 					companyId: this.fieldConfig.fields.companyId || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					companyDTO: this.fieldConfig.fields.companyDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					category1DTO: item || undefined,
 				}
 			}
 		}
@@ -361,6 +465,7 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
     this.category1Id = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined, repairDeptId: undefined};
     this.customChangeDateComponent.resetByDate();
+		sessionStorage.removeItem('maintenanceData');
     this.search();
   }
 

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

@@ -220,6 +220,7 @@ export class ConsumableStatisticsComponent implements OnInit, AfterViewInit {
     this.repairDeptId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined};
     this.customChangeDateComponent.resetByDate();
+		sessionStorage.removeItem('maintenanceData');
     this.search();
   }
 

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

@@ -51,13 +51,13 @@
 			<tr *ngFor="let data of listOfData">
 				<td *ngIf="parent==1">{{ data.parentName || '无' }}<ng-container *ngIf="parent==1 && data.parentName">({{ data.parentCode }})</ng-container></td>
 				<td>{{ data.deptName }}<ng-container *ngIf="data.deptCode">({{ data.deptCode }})</ng-container></td>
-				<td (click)="viewDetail1(data)">{{ data.sum }}</td>
+				<td class="text-sign" (click)="viewDetail1(data)">{{ data.sum }}</td>
 				<td>{{ data.degreeCount }}</td>
-				<td (click)="viewDetail2(data)">{{ data.oneStar }}</td>
-				<td (click)="viewDetail3(data)">{{ data.twoStar }}</td>
-				<td (click)="viewDetail4(data)">{{ data.threeStar }}</td>
-				<td (click)="viewDetail5(data)">{{ data.fourStar }}</td>
-				<td (click)="viewDetail6(data)">{{ data.fiveStar }}</td>
+				<td class="text-sign" (click)="viewDetail2(data)">{{ data.oneStar }}</td>
+				<td class="text-sign" (click)="viewDetail3(data)">{{ data.twoStar }}</td>
+				<td class="text-sign" (click)="viewDetail4(data)">{{ data.threeStar }}</td>
+				<td class="text-sign" (click)="viewDetail5(data)">{{ data.fourStar }}</td>
+				<td class="text-sign" (click)="viewDetail6(data)">{{ data.fiveStar }}</td>
 				<td>{{ data.totalStar }}</td>
 				<td>{{ data.avgStar }}</td>
 			</tr>
@@ -68,13 +68,13 @@
 					<td [ngStyle]="{width:widthStyle}" *ngIf="parent==1">{{ data.parentCode }}</td>
 					<td [ngStyle]="{width:widthStyle}" *ngIf="parent==0">{{ data.deptCode }}</td>
 					<td [ngStyle]="{width:widthStyle}" *ngIf="parent==1"></td>
-					<td [ngStyle]="{width:widthStyle}" (click)="viewDetail1(data, 'all')">{{ data.sum }}</td>
+					<td [ngStyle]="{width:widthStyle}" class="text-sign" (click)="viewDetail1(data, 'all')">{{ data.sum }}</td>
 					<td [ngStyle]="{width:widthStyle}">{{ data.degreeCount }}</td>
-					<td [ngStyle]="{width:widthStyle}" (click)="viewDetail2(data, 'all')">{{ data.oneStar }}</td>
-					<td [ngStyle]="{width:widthStyle}" (click)="viewDetail3(data, 'all')">{{ data.twoStar }}</td>
-					<td [ngStyle]="{width:widthStyle}" (click)="viewDetail4(data, 'all')">{{ data.threeStar }}</td>
-					<td [ngStyle]="{width:widthStyle}" (click)="viewDetail5(data, 'all')">{{ data.fourStar }}</td>
-					<td [ngStyle]="{width:widthStyle}" (click)="viewDetail6(data, 'all')">{{ data.fiveStar }}</td>
+					<td [ngStyle]="{width:widthStyle}" class="text-sign" (click)="viewDetail2(data, 'all')">{{ data.oneStar }}</td>
+					<td [ngStyle]="{width:widthStyle}" class="text-sign" (click)="viewDetail3(data, 'all')">{{ data.twoStar }}</td>
+					<td [ngStyle]="{width:widthStyle}" class="text-sign" (click)="viewDetail4(data, 'all')">{{ data.threeStar }}</td>
+					<td [ngStyle]="{width:widthStyle}" class="text-sign" (click)="viewDetail5(data, 'all')">{{ data.fourStar }}</td>
+					<td [ngStyle]="{width:widthStyle}" class="text-sign" (click)="viewDetail6(data, 'all')">{{ data.fiveStar }}</td>
 					<td [ngStyle]="{width:widthStyle}">{{ data.totalStar }}</td>
 					<td [ngStyle]="{width:widthStyle}">{{ data.avgStar }}</td>
 				</tr>

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

@@ -5,6 +5,10 @@
   right: 0;
   bottom: 0;
   left: 0;
+	.text-sign{
+		text-decoration: underline;
+		cursor: pointer;
+	}
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
     width: calc(100% - 15px);

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

@@ -68,8 +68,25 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.deptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
 				}
 			}
 		}else{
@@ -86,6 +103,15 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 					groupId: this.fieldConfig.fields.groupId || undefined,
 					deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
 					userId: this.fieldConfig.fields.userId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
 				}
 			}
 		}
@@ -101,9 +127,26 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.deptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					evaluateId: 20424,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
 				}
 			}
 		}else{
@@ -121,6 +164,15 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 					groupId: this.fieldConfig.fields.groupId || undefined,
 					deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
 					userId: this.fieldConfig.fields.userId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
 				}
 			}
 		}
@@ -136,9 +188,26 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.deptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					evaluateId: 20423,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
 				}
 			}
 		}else{
@@ -156,6 +225,15 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 					groupId: this.fieldConfig.fields.groupId || undefined,
 					deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
 					userId: this.fieldConfig.fields.userId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
 				}
 			}
 		}
@@ -171,9 +249,26 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.deptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					evaluateId: 20422,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
 				}
 			}
 		}else{
@@ -191,6 +286,15 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 					groupId: this.fieldConfig.fields.groupId || undefined,
 					deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
 					userId: this.fieldConfig.fields.userId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
 				}
 			}
 		}
@@ -206,9 +310,26 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.deptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					evaluateId: 20421,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
 				}
 			}
 		}else{
@@ -226,6 +347,15 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 					groupId: this.fieldConfig.fields.groupId || undefined,
 					deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
 					userId: this.fieldConfig.fields.userId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
 				}
 			}
 		}
@@ -241,9 +371,17 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.deptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					evaluateId: 20420,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
 				}
 			}
 		}else{
@@ -450,6 +588,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
     this.deptId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, deptTypeId: undefined};
     this.customChangeDateComponent.resetByDate();
+		sessionStorage.removeItem('maintenanceData');
     this.search();
   }
 

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

@@ -52,15 +52,15 @@
 			<tr *ngFor="let data of listOfData">
 				<td *ngIf="parent==1">{{ data.parentName || '无' }}<ng-container *ngIf="parent==1 && data.parentName">({{ data.parentCode }})</ng-container></td>
 				<td>{{ data.deptName }}<ng-container *ngIf="data.deptCode">({{ data.deptCode }})</ng-container></td>
-				<td (click)="viewDetail1(data)">{{ data.sum }}</td>
+				<td class="text-sign" (click)="viewDetail1(data)">{{ data.sum }}</td>
 				<td>{{ data.avgResponseTime }}</td>
 				<td>{{ data.avgResolvedTime }}</td>
-				<td (click)="viewDetail2(data)">{{ data.resolvedOverNum }}</td>
-				<td (click)="viewDetail3(data)">{{ data.overTimeNum }}</td>
+				<td class="text-sign" (click)="viewDetail2(data)">{{ data.resolvedOverNum }}</td>
+				<td class="text-sign" (click)="viewDetail3(data)">{{ data.overTimeNum }}</td>
 				<td>{{ data.consumablePrice }}</td>
 				<td>{{ data.workHourPrice }}</td>
 				<td>{{ data.totalPrice }}</td>
-				<td (click)="viewDetail4(data)">{{ data.negativeNum }}</td>
+				<td class="text-sign" (click)="viewDetail4(data)">{{ data.negativeNum }}</td>
 				<td>{{ data.favorableRate }}</td>
 			</tr>
 		</tbody>
@@ -70,15 +70,15 @@
 					<td [ngStyle]="{width:widthStyle}" *ngIf="parent==1">{{ data.parentCode }}</td>
 					<td [ngStyle]="{width:widthStyle}" *ngIf="parent==0">{{ data.deptCode}}</td>
 					<td [ngStyle]="{width:widthStyle}" *ngIf="parent==1"></td>
-					<td [ngStyle]="{width:widthStyle}" (click)="viewDetail1(data, 'all')">{{ data.sum }}</td>
+					<td [ngStyle]="{width:widthStyle}" class="text-sign" (click)="viewDetail1(data, 'all')">{{ data.sum }}</td>
 					<td [ngStyle]="{width:widthStyle}">{{ data.avgResponseTime }}</td>
 					<td [ngStyle]="{width:widthStyle}">{{ data.avgResolvedTime }}</td>
-					<td [ngStyle]="{width:widthStyle}" (click)="viewDetail2(data, 'all')">{{ data.resolvedOverNum }}</td>
-					<td [ngStyle]="{width:widthStyle}" (click)="viewDetail3(data, 'all')">{{ data.overTimeNum }}</td>
+					<td [ngStyle]="{width:widthStyle}" class="text-sign" (click)="viewDetail2(data, 'all')">{{ data.resolvedOverNum }}</td>
+					<td [ngStyle]="{width:widthStyle}" class="text-sign" (click)="viewDetail3(data, 'all')">{{ data.overTimeNum }}</td>
 					<td [ngStyle]="{width:widthStyle}">{{ data.consumablePrice }}</td>
 					<td [ngStyle]="{width:widthStyle}">{{ data.workHourPrice }}</td>
 					<td [ngStyle]="{width:widthStyle}">{{ data.totalPrice }}</td>
-					<td [ngStyle]="{width:widthStyle}" (click)="viewDetail4(data, 'all')">{{ data.negativeNum }}</td>
+					<td [ngStyle]="{width:widthStyle}" class="text-sign" (click)="viewDetail4(data, 'all')">{{ data.negativeNum }}</td>
 					<td [ngStyle]="{width:widthStyle}">{{ data.favorableRate }}</td>
 				</tr>
 			</table>

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

@@ -5,6 +5,10 @@
   right: 0;
   bottom: 0;
   left: 0;
+	.text-sign{
+		text-decoration: underline;
+		cursor: pointer;
+	}
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
     width: calc(100% - 15px);

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

@@ -68,8 +68,25 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.deptId,
 				searchQuery:{
 					statusValue: 'close',
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
 				}
 			}
 		}else{
@@ -86,6 +103,15 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 					groupId: this.fieldConfig.fields.groupId || undefined,
 					deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
 					userId: this.fieldConfig.fields.userId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
 				}
 			}
 		}
@@ -101,9 +127,26 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.deptId,
 				searchQuery:{
 					statusValue: 'close',
 					overtimeId: 1,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
 				}
 			}
 		}else{
@@ -121,6 +164,15 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 					groupId: this.fieldConfig.fields.groupId || undefined,
 					deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
 					userId: this.fieldConfig.fields.userId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
 				}
 			}
 		}
@@ -136,9 +188,26 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.deptId,
 				searchQuery:{
 					statusValue: 'close',
 					isHangId: 1,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
 				}
 			}
 		}else{
@@ -156,6 +225,15 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 					groupId: this.fieldConfig.fields.groupId || undefined,
 					deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
 					userId: this.fieldConfig.fields.userId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
 				}
 			}
 		}
@@ -171,9 +249,26 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.deptId,
 				searchQuery:{
 					statusValue: 'close',
 					evaluateId: 20424,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
 				}
 			}
 		}else{
@@ -191,6 +286,15 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 					groupId: this.fieldConfig.fields.groupId || undefined,
 					deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
 					userId: this.fieldConfig.fields.userId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO: this.fieldConfig.fields.userDTO || undefined,
+					deptTypeDTO: this.fieldConfig.fields.deptTypeDTO || undefined,
 				}
 			}
 		}
@@ -380,6 +484,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
     this.deptId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, deptTypeId: undefined};
     this.customChangeDateComponent.resetByDate();
+		sessionStorage.removeItem('maintenanceData');
     this.search();
   }
 

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

@@ -35,15 +35,15 @@
   <tbody>
     <tr *ngFor="let data of listOfData">
       <td>{{ data.groupName }}</td>
-      <td (click)="viewDetail1(data)">{{ data.sum }}</td>
+      <td class="text-sign" (click)="viewDetail1(data)">{{ data.sum }}</td>
       <td>{{ data.avgResponseTime }}</td>
       <td>{{ data.avgResolvedTime }}</td>
-      <td (click)="viewDetail2(data)">{{ data.resolvedOverNum }}</td>
-      <td (click)="viewDetail3(data)">{{ data.overTimeNum }}</td>
+      <td class="text-sign" (click)="viewDetail2(data)">{{ data.resolvedOverNum }}</td>
+      <td class="text-sign" (click)="viewDetail3(data)">{{ data.overTimeNum }}</td>
       <td>{{ data.consumablePrice }}</td>
       <td>{{ data.workHourPrice }}</td>
       <td>{{ data.totalPrice }}</td>
-      <td (click)="viewDetail4(data)">{{ data.negativeNum }}</td>
+      <td class="text-sign" (click)="viewDetail4(data)">{{ data.negativeNum }}</td>
       <td>{{ data.favorableRate }}</td>
     </tr>
   </tbody>
@@ -51,15 +51,15 @@
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
         <td style="width: 10%">{{ data.groupName }}</td>
-        <td style="width: 9%" (click)="viewDetail1(data, 'all')">{{ data.sum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail1(data, 'all')">{{ data.sum }}</td>
         <td style="width: 9%">{{ data.avgResponseTime }}</td>
         <td style="width: 9%">{{ data.avgResolvedTime }}</td>
-        <td style="width: 9%" (click)="viewDetail2(data, 'all')">{{ data.resolvedOverNum }}</td>
-        <td style="width: 9%" (click)="viewDetail3(data, 'all')">{{ data.overTimeNum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail2(data, 'all')">{{ data.resolvedOverNum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail3(data, 'all')">{{ data.overTimeNum }}</td>
         <td style="width: 9%">{{ data.consumablePrice }}</td>
         <td style="width: 9%">{{ data.workHourPrice }}</td>
         <td style="width: 9%">{{ data.totalPrice }}</td>
-        <td style="width: 9%" (click)="viewDetail4(data, 'all')">{{ data.negativeNum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail4(data, 'all')">{{ data.negativeNum }}</td>
         <td style="width: 9%">{{ data.favorableRate }}</td>
       </tr>
     </table>

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

@@ -5,6 +5,10 @@
   right: 0;
   bottom: 0;
   left: 0;
+	.text-sign{
+		text-decoration: underline;
+		cursor: pointer;
+	}
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
     width: calc(100% - 15px);

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

@@ -54,6 +54,16 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 				endDate: this.customChangeDateComponent.endDate || undefined,
 				searchQuery:{
 					statusValue: 'close',
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 				}
 			}
 		}else{
@@ -67,6 +77,12 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
 					buildingId: this.fieldConfig.fields.buildingId || undefined,
 					floorId: this.fieldConfig.fields.floorId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 				}
 			}
 		}
@@ -85,6 +101,16 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 				searchQuery:{
 					statusValue: 'close',
 					overtimeId: 1,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 				}
 			}
 		}else{
@@ -99,6 +125,12 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
 					buildingId: this.fieldConfig.fields.buildingId || undefined,
 					floorId: this.fieldConfig.fields.floorId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 				}
 			}
 		}
@@ -117,6 +149,16 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 				searchQuery:{
 					statusValue: 'close',
 					isHangId: 1,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 				}
 			}
 		}else{
@@ -131,6 +173,12 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
 					buildingId: this.fieldConfig.fields.buildingId || undefined,
 					floorId: this.fieldConfig.fields.floorId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 				}
 			}
 		}
@@ -149,6 +197,16 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 				searchQuery:{
 					statusValue: 'close',
 					evaluateId: 20424,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 				}
 			}
 		}else{
@@ -163,6 +221,12 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
 					buildingId: this.fieldConfig.fields.buildingId || undefined,
 					floorId: this.fieldConfig.fields.floorId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 				}
 			}
 		}

src/app/views/new-statistics/maintenance-statistics/incident-list/incident-list.component.html

@@ -40,7 +40,7 @@
 	<span>{{fieldConfig.fields.isHangDTO?.name}}</span>
 	<span>{{fieldConfig.fields.overtimeDTO?.name}}</span>
 	<span>{{fieldConfig.fields.codeNumDTO}}</span>
-	<span>{{fieldConfig.fields.deptTypeDTO.name}}</span>
+	<span>{{fieldConfig.fields.deptTypeDTO?.name}}</span>
 	
 </div>
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px', x: '1600px'}">
@@ -87,8 +87,8 @@
 				<div>解决:{{data.resolvedTime}}</div>
 			</td>
       <td>
-      	<div>预接:{{data.overdueTime|date:'yyyy-MM-dd HH:mm:ss'}}</div>
-      	<div>预解:{{data.overdueResponseDate|date:'yyyy-MM-dd HH:mm:ss'}}</div>
+      	<div>预接:{{data.overdueResponseDate|date:'yyyy-MM-dd HH:mm:ss'}}</div>
+      	<div>预解:{{data.overdueTime|date:'yyyy-MM-dd HH:mm:ss'}}</div>
       </td>
       <td>{{ data.remark }}</td>
       <td>
@@ -109,7 +109,7 @@
 </div>
 
 <!-- 详细搜索 -->
-<app-search-more [fieldConfig]="fieldConfig" *ngIf="showSearchMore" [hosId]="hosId" [queryType]="queryType"  [dutyId]="dutyId"  [parentDutyId]="parentDutyId" (cancelEvent)="cancelEvent()" (submitEvent)="submitEvent($event)"></app-search-more>
+<app-search-more [fieldConfig]="fieldConfig" *ngIf="showSearchMore" [hosId]="hosId" [queryType]="queryType"  [dutyId]="dutyId"  [parentDutyId]="parentDutyId" (cancelEvent)="cancelEvent()" (submitEvent)="submitEvent($event)" [going]="goingType"></app-search-more>
 
 <!-- 详情 -->
 <app-incident-detail [id]="coopData.id" *ngIf="detailModalShow" (closeModelHs)="closeDetailModelOrder($event)" (confirmModelHs)="confirmDetailModelOrder($event)"></app-incident-detail>

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

@@ -72,6 +72,7 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
     }, 0)
   }
 	
+	goingType:boolean = false;
 	getRouteQuery(){
 		let data = sessionStorage.getItem('maintenanceData')
 		let query = null
@@ -95,8 +96,10 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 					this.repairDeptId = undefined
 				}
 				if(query.searchQuery){
+					this.goingType = true
 					this.fieldConfig.fields = query.searchQuery
 				}else{
+					this.goingType = false
 					this.fieldConfig.fields = {}
 				}
 				
@@ -309,6 +312,7 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
     this.customChangeDateComponent.resetByDate();
     this.search();
 		this.onResize(0);
+		sessionStorage.removeItem('maintenanceData');
   }
 
   // 科室搜索

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

@@ -47,15 +47,15 @@
   <tbody>
     <tr *ngFor="let data of listOfData">
       <td>{{ data.startDate }}</td>
-      <td (click)="viewDetail1(data)">{{ data.sum }}</td>
+      <td class="text-sign" (click)="viewDetail1(data)">{{ data.sum }}</td>
       <td>{{ data.avgResponseTime }}</td>
       <td>{{ data.avgResolvedTime }}</td>
-      <td (click)="viewDetail2(data)">{{ data.resolvedOverNum }}</td>
-      <td (click)="viewDetail3(data)">{{ data.overTimeNum }}</td>
+      <td class="text-sign" (click)="viewDetail2(data)">{{ data.resolvedOverNum }}</td>
+      <td class="text-sign" (click)="viewDetail3(data)">{{ data.overTimeNum }}</td>
       <td>{{ data.consumablePrice }}</td>
       <td>{{ data.workHourPrice }}</td>
       <td>{{ data.totalPrice }}</td>
-      <td (click)="viewDetail3(data)">{{ data.negativeNum }}</td>
+      <td class="text-sign" (click)="viewDetail3(data)">{{ data.negativeNum }}</td>
       <td>{{ data.favorableRate }}</td>
     </tr>
   </tbody>
@@ -63,15 +63,15 @@
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
         <td style="width: 10%">{{ data.startDate }}</td>
-        <td style="width: 9%" (click)="viewDetail1(data,'all')">{{ data.sum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail1(data,'all')">{{ data.sum }}</td>
         <td style="width: 9%">{{ data.avgResponseTime }}</td>
         <td style="width: 9%">{{ data.avgResolvedTime }}</td>
-        <td style="width: 9%" (click)="viewDetail2(data,'all')">{{ data.resolvedOverNum }}</td>
-        <td style="width: 9%" (click)="viewDetail3(data,'all')">{{ data.overTimeNum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail2(data,'all')">{{ data.resolvedOverNum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail3(data,'all')">{{ data.overTimeNum }}</td>
         <td style="width: 9%">{{ data.consumablePrice }}</td>
         <td style="width: 9%">{{ data.workHourPrice }}</td>
         <td style="width: 9%">{{ data.totalPrice }}</td>
-        <td style="width: 9%" (click)="viewDetail4(data,'all')">{{ data.negativeNum }}</td>
+        <td style="width: 9%" class="text-sign" (click)="viewDetail4(data,'all')">{{ data.negativeNum }}</td>
         <td style="width: 9%">{{ data.favorableRate }}</td>
       </tr>
     </table>

src/app/views/new-statistics/maintenance-statistics/incident-statistics/incident-statistics.component.less

@@ -5,6 +5,10 @@
   right: 0;
   bottom: 0;
   left: 0;
+	.text-sign{
+		text-decoration: underline;
+		cursor: pointer;
+	}
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
     width: calc(100% - 15px);

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

@@ -63,21 +63,40 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
 			query = {
 				startDate: this.customChangeDateComponent.startDate,
 				endDate: this.customChangeDateComponent.endDate,
+				repairDeptId: this.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					sourceId: this.fieldConfig.fields.sourceId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO,
+					sourceDTO: this.fieldConfig.fields.sourceDTO,
+					userDTO: this.fieldConfig.fields.userDTO,
 				}
 			}
 		}else{
 			 query = {
 				startDate: data.startDate + ' ' + '00:00:00',
 				endDate: data.startDate + ' ' + '23:59:59',
+				repairDeptId: this.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
-					groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+					groupId: this.fieldConfig.fields.groupId || undefined,
 					userId: this.fieldConfig.fields.userId || undefined,
 					categoryId: this.fieldConfig.fields.categoryId || undefined,
 					sourceId: this.fieldConfig.fields.sourceId || undefined,
 					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO,
+					sourceDTO: this.fieldConfig.fields.sourceDTO,
+					userDTO: this.fieldConfig.fields.userDTO,
 				}
 			}
 		}
@@ -93,23 +112,42 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
 			query = {
 				startDate: this.customChangeDateComponent.startDate,
 				endDate: this.customChangeDateComponent.endDate,
+				repairDeptId: this.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					overtimeId: 1,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					sourceId: this.fieldConfig.fields.sourceId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO,
+					sourceDTO: this.fieldConfig.fields.sourceDTO,
+					userDTO: this.fieldConfig.fields.userDTO,
 				}
 			}
 		}else{
 			query = {
 				startDate: data.startDate + ' ' + '00:00:00',
 				endDate: data.startDate + ' ' + '23:59:59',
+				repairDeptId: this.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					overtimeId: 1,
-					groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+					groupId: this.fieldConfig.fields.groupId || undefined,
 					userId: this.fieldConfig.fields.userId || undefined,
 					categoryId: this.fieldConfig.fields.categoryId || undefined,
 					sourceId: this.fieldConfig.fields.sourceId || undefined,
 					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO,
+					sourceDTO: this.fieldConfig.fields.sourceDTO,
+					userDTO: this.fieldConfig.fields.userDTO,
 				}
 			}
 		}
@@ -125,23 +163,42 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
 			query = {
 				startDate: this.customChangeDateComponent.startDate,
 				endDate: this.customChangeDateComponent.endDate,
+				repairDeptId: this.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
-					isHangId: 1
+					isHangId: 1,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					sourceId: this.fieldConfig.fields.sourceId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO,
+					sourceDTO: this.fieldConfig.fields.sourceDTO,
+					userDTO: this.fieldConfig.fields.userDTO,
 				}
 			}
 		}else{
 			query = {
 				startDate: data.startDate + ' ' + '00:00:00',
 				endDate: data.startDate + ' ' + '23:59:59',
+				repairDeptId: this.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					isHangId: 1,
-					groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+					groupId: this.fieldConfig.fields.groupId || undefined,
 					userId: this.fieldConfig.fields.userId || undefined,
 					categoryId: this.fieldConfig.fields.categoryId || undefined,
 					sourceId: this.fieldConfig.fields.sourceId || undefined,
 					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO,
+					sourceDTO: this.fieldConfig.fields.sourceDTO,
+					userDTO: this.fieldConfig.fields.userDTO,
 				}
 			}
 		}
@@ -157,23 +214,42 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
 			query = {
 				startDate: this.customChangeDateComponent.startDate,
 				endDate: this.customChangeDateComponent.endDate,
+				repairDeptId: this.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
-					evaluateId: 20424
+					evaluateId: 20424,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: this.fieldConfig.fields.userId || undefined,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					sourceId: this.fieldConfig.fields.sourceId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO,
+					sourceDTO: this.fieldConfig.fields.sourceDTO,
+					userDTO: this.fieldConfig.fields.userDTO,
 				}
 			}
 		}else{
 			query = {
 				startDate: data.startDate + ' ' + '00:00:00',
 				endDate: data.startDate + ' ' + '23:59:59',
+				repairDeptId: this.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					evaluateId: 20424,
-					groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+					groupId: this.fieldConfig.fields.groupId || undefined,
 					userId: this.fieldConfig.fields.userId || undefined,
 					categoryId: this.fieldConfig.fields.categoryId || undefined,
 					sourceId: this.fieldConfig.fields.sourceId || undefined,
 					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO,
+					sourceDTO: this.fieldConfig.fields.sourceDTO,
+					userDTO: this.fieldConfig.fields.userDTO,
 				}
 			}
 		}
@@ -345,6 +421,7 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
     this.repairDeptId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: undefined};
     this.customChangeDateComponent.resetByDate();
+		sessionStorage.removeItem('maintenanceData');
     this.search();
   }
 

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

@@ -11,7 +11,7 @@
   <ng-container *ngIf="!isLoading">
     <div class="top1-statistics">
       <div class="top-list">
-        <div class="special-box" (click)="viewDetail1()">
+        <div class="special-box cursor" (click)="viewDetail1()">
           <div class="num">{{workData.gd_total || 0}}</div>
           <div class="describe">工单总数</div>
         </div>
@@ -34,21 +34,21 @@
         <div class="border"></div>
       </div>
       <div class="top-list">
-        <div class="special-box" (click)="viewDetail2()">
+        <div class="special-box cursor" (click)="viewDetail2()">
           <div class="num">{{workData.gd_postpone || 0}}</div>
           <div class="describe">挂起单数</div>
         </div>
         <div class="border"></div>
       </div>
       <div class="top-list">
-        <div class="special-box" (click)="viewDetail3()">
+        <div class="special-box cursor" (click)="viewDetail3()">
           <div class="num">{{workData.gd_overtime || 0}}</div>
           <div class="describe">超时单数</div>
         </div>
         <div class="border"></div>
       </div>
       <div class="top-list">
-        <div class="special-box" (click)="viewDetail4()">
+        <div class="special-box cursor" (click)="viewDetail4()">
           <div class="num">{{workData.gd_degree}}</div>
           <div class="describe">差评单数</div>
         </div>
@@ -83,10 +83,10 @@
               <span *ngIf="index !=0 && index !=1 && index !=2">{{index+1}}</span>
             </div>
             <div class="table-list">{{item.name}}</div>
-            <div class="table-list" (click)="viewMaintain1(item)">{{item.count || 0}}</div>
+            <div class="table-list text-sign" (click)="viewMaintain1(item)">{{item.count || 0}}</div>
             <div class="table-list">{{item.avg_response}}分</div>
             <div class="table-list">{{item.avg_handle }}分</div>
-            <div class="table-list" (click)="viewMaintain2(item)">{{item.overtime || 0}}</div>
+            <div class="table-list text-sign" (click)="viewMaintain2(item)">{{item.overtime || 0}}</div>
           </div>
         </div>
       </div>
@@ -140,7 +140,7 @@
           <div class="th" *ngFor="let item of deptCostData; let index = index;">
             <div class="table-list-4">{{index+1}}</div>
             <div class="table-list-4 ellipsis-oneline" title="{{item.dept}}">{{item.dept}}</div>
-            <div class="table-list-4" (click)="viewDept(item)">{{item.sum || 0}}</div>
+            <div class="table-list-4 text-sign" (click)="viewDept(item)">{{item.sum || 0}}</div>
             <div class="table-list-4">{{item.sum_price || 0}}</div>
           </div>
         </div>

src/app/views/new-statistics/maintenance-statistics/synthesize-statistics/synthesize-statistics.component.less

@@ -5,6 +5,13 @@
   right: 0;
   bottom: 0;
   left: 0;
+	.cursor{
+		cursor: pointer;
+	}
+	.text-sign{
+		text-decoration: underline;
+		cursor: pointer;
+	}
 	.synthesize-box{
 		background: #F0F2F5 !important;
 		height: calc((100vh - 92px));
@@ -48,7 +55,6 @@
 					right: 0;
 				}
 				.special-box{
-					cursor: pointer;
 					text-align: center;
 					position: relative;
 					top: -5px;

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

@@ -47,15 +47,15 @@
   <tbody>
     <tr *ngFor="let data of listOfData">
       <td>{{ data.companyName }}</td>
-      <td (click)="viewDetail1(data)">{{ data.sum }}</td>
+      <td class="text-sign" (click)="viewDetail1(data)">{{ data.sum }}</td>
       <td>{{ data.avgResponseTime }}</td>
       <td>{{ data.avgResolvedTime }}</td>
-      <td (click)="viewDetail2(data)">{{ data.resolvedOverNum }}</td>
-      <td (click)="viewDetail3(data)">{{ data.overTimeNum }}</td>
+      <td class="text-sign" (click)="viewDetail2(data)">{{ data.resolvedOverNum }}</td>
+      <td class="text-sign" (click)="viewDetail3(data)">{{ data.overTimeNum }}</td>
       <td>{{ data.consumablePrice }}</td>
       <td>{{ data.workHourPrice }}</td>
       <td>{{ data.totalPrice }}</td>
-      <td (click)="viewDetail4(data)">{{ data.negativeNum }}</td>
+      <td class="text-sign" (click)="viewDetail4(data)">{{ data.negativeNum }}</td>
       <td>{{ data.favorableRate }}</td>
     </tr>
   </tbody>
@@ -63,15 +63,15 @@
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
         <td style="width: 10%">{{ data.companyName }}</td>
-        <td style="width: 9%" (click)="viewDetail1(data, 'all')">{{ data.sum }}</td>
+        <td style="width: 9%">{{ data.sum }}</td>
         <td style="width: 9%">{{ data.avgResponseTime }}</td>
         <td style="width: 9%">{{ data.avgResolvedTime }}</td>
-        <td style="width: 9%" (click)="viewDetail2(data, 'all')">{{ data.resolvedOverNum }}</td>
-        <td style="width: 9%" (click)="viewDetail3(data, 'all')">{{ data.overTimeNum }}</td>
+        <td style="width: 9%">{{ data.resolvedOverNum }}</td>
+        <td style="width: 9%">{{ data.overTimeNum }}</td>
         <td style="width: 9%">{{ data.consumablePrice }}</td>
         <td style="width: 9%">{{ data.workHourPrice }}</td>
         <td style="width: 9%">{{ data.totalPrice }}</td>
-        <td style="width: 9%" (click)="viewDetail4(data, 'all')">{{ data.negativeNum }}</td>
+        <td style="width: 9%">{{ data.negativeNum }}</td>
         <td style="width: 9%">{{ data.favorableRate }}</td>
       </tr>
     </table>

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

@@ -5,6 +5,10 @@
   right: 0;
   bottom: 0;
   left: 0;
+	.text-sign{
+		text-decoration: underline;
+		cursor: pointer;
+	}
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
     width: calc(100% - 15px);

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

@@ -58,12 +58,29 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
 	// 数据下钻
 	viewDetail1(data, type){
 		let query = null
+		let item = null;
+		if(this.companyId){
+		  item = this.companyList.find(item => item.id == this.companyId);
+		}
 		if(type=='all'){
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
 				searchQuery:{
 					statusValue: 'close',
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					companyId: this.companyId,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					companyDTO: item || undefined,
 				}
 			}
 		}else{
@@ -79,6 +96,13 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
 					floorId: this.fieldConfig.fields.floorId || undefined,
 					groupId: this.fieldConfig.fields.groupId || undefined,
 					companyId: data.companyId,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					companyDTO: item || undefined,
 				}
 			}
 		}
@@ -90,17 +114,35 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
 	// 数据下钻
 	viewDetail2(data, type){
 		let query = null
+		let item = null;
+		if(this.companyId){
+		  item = this.companyList.find(item => item.id == this.companyId);
+		}
 		if(type=='all'){
-			let query = {
+			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					overtimeId: 1,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					companyId: this.companyId,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					companyDTO: item || undefined,
 				}
 			}
 		}else{
-			let query = {
+			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
 				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
@@ -113,6 +155,13 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
 					floorId: this.fieldConfig.fields.floorId || undefined,
 					groupId: this.fieldConfig.fields.groupId || undefined,
 					companyId: data.companyId,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					companyDTO: item || undefined,
 				}
 			}
 		}
@@ -124,13 +173,31 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
 	// 数据下钻
 	viewDetail3(data, type){
 		let query = null
+		let item = null;
+		if(this.companyId){
+		  item = this.companyList.find(item => item.id == this.companyId);
+		}
 		if(type=='all'){
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					isHangId: 1,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					companyId: this.companyId,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					companyDTO: item || undefined,
 				}
 			}
 		}else{
@@ -147,6 +214,13 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
 					floorId: this.fieldConfig.fields.floorId || undefined,
 					groupId: this.fieldConfig.fields.groupId || undefined,
 					companyId: data.companyId,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					companyDTO: item || undefined,
 				}
 			}
 		}
@@ -158,13 +232,31 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
 	// 数据下钻
 	viewDetail4(data, type){
 		let query = null
+		let item = null;
+		if(this.companyId){
+		  item = this.companyList.find(item => item.id == this.companyId);
+		}
 		if(type=='all'){
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					evaluateId: 20424,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					companyId: this.companyId,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					companyDTO: item || undefined,
 				}
 			}
 		}else{
@@ -181,6 +273,13 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
 					floorId: this.fieldConfig.fields.floorId || undefined,
 					groupId: this.fieldConfig.fields.groupId || undefined,
 					companyId: data.companyId,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					companyDTO: item || undefined,
 				}
 			}
 		}
@@ -350,6 +449,7 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
     this.companyId = undefined;
     this.fieldConfig.fields = {categoryId: undefined, buildingId: undefined, floorId: undefined, repairDeptId: undefined};
     this.customChangeDateComponent.resetByDate();
+		sessionStorage.removeItem('maintenanceData');
     this.search();
   }
 

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

@@ -47,13 +47,13 @@
   <tbody>
     <tr *ngFor="let data of listOfData">
       <td>{{ data.userName }}<ng-container *ngIf="data.userAccount">({{ data.userAccount }})</ng-container></td>
-      <td (click)="viewDetail1(data)">{{ data.sum }}</td>
+      <td class="text-sign" (click)="viewDetail1(data)">{{ data.sum }}</td>
       <td>{{ data.degreeCount }}</td>
-      <td (click)="viewDetail2(data)">{{ data.oneStar }}</td>
-      <td (click)="viewDetail3(data)">{{ data.twoStar }}</td>
-      <td (click)="viewDetail4(data)">{{ data.threeStar }}</td>
-      <td (click)="viewDetail5(data)">{{ data.fourStar }}</td>
-      <td (click)="viewDetail6(data)">{{ data.fiveStar }}</td>
+      <td class="text-sign" (click)="viewDetail2(data)">{{ data.oneStar }}</td>
+      <td class="text-sign" (click)="viewDetail3(data)">{{ data.twoStar }}</td>
+      <td class="text-sign" (click)="viewDetail4(data)">{{ data.threeStar }}</td>
+      <td class="text-sign" (click)="viewDetail5(data)">{{ data.fourStar }}</td>
+      <td class="text-sign" (click)="viewDetail6(data)">{{ data.fiveStar }}</td>
       <td>{{ data.totalStar }}</td>
       <td>{{ data.avgStar }}</td>
     </tr>
@@ -62,13 +62,13 @@
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
         <td style="width: 10%">{{ data.userName }}</td>
-        <td style="width: 10%" (click)="viewDetail1(data, 'all')">{{ data.sum }}</td>
+        <td style="width: 10%" class="text-sign" (click)="viewDetail1(data, 'all')">{{ data.sum }}</td>
         <td style="width: 10%">{{ data.degreeCount }}</td>
-        <td style="width: 10%" (click)="viewDetail2(data, 'all')">{{ data.oneStar }}</td>
-        <td style="width: 10%" (click)="viewDetail3(data, 'all')">{{ data.twoStar }}</td>
-        <td style="width: 10%" (click)="viewDetail4(data, 'all')">{{ data.threeStar }}</td>
-        <td style="width: 10%" (click)="viewDetail5(data, 'all')">{{ data.fourStar }}</td>
-        <td style="width: 10%" (click)="viewDetail6(data, 'all')">{{ data.fiveStar }}</td>
+        <td style="width: 10%" class="text-sign" (click)="viewDetail2(data, 'all')">{{ data.oneStar }}</td>
+        <td style="width: 10%" class="text-sign" (click)="viewDetail3(data, 'all')">{{ data.twoStar }}</td>
+        <td style="width: 10%" class="text-sign" (click)="viewDetail4(data, 'all')">{{ data.threeStar }}</td>
+        <td style="width: 10%" class="text-sign" (click)="viewDetail5(data, 'all')">{{ data.fourStar }}</td>
+        <td style="width: 10%" class="text-sign" (click)="viewDetail6(data, 'all')">{{ data.fiveStar }}</td>
         <td style="width: 10%">{{ data.totalStar }}</td>
         <td style="width: 10%">{{ data.avgStar }}</td>
       </tr>

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

@@ -5,6 +5,10 @@
   right: 0;
   bottom: 0;
   left: 0;
+	.text-sign{
+		text-decoration: underline;
+		cursor: pointer;
+	}
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
     width: calc(100% - 15px);

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

@@ -59,12 +59,31 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 	// 数据下钻
 	viewDetail1(data, type){
 		let query = null
+		let item = null;
+		if(this.userId){
+		  item = this.userList.find(item => item.id == this.userId);
+		}
 		if(type=='all'){
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: this.userId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO : item || undefined,
 				}
 			}
 		}else{
@@ -80,6 +99,14 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 					floorId: this.fieldConfig.fields.floorId || undefined,
 					groupId: this.fieldConfig.fields.groupId || undefined,
 					userId: data.userId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO : item || undefined,
 				}
 			}
 		}
@@ -91,13 +118,32 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 	// 数据下钻
 	viewDetail2(data, type){
 		let query = null
+		let item = null;
+		if(this.userId){
+		  item = this.userList.find(item => item.id == this.userId);
+		}
 		if(type=='all'){
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					evaluateId: 20424,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: this.userId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO : item || undefined,
 				}
 			}
 		}else{
@@ -114,6 +160,14 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 					floorId: this.fieldConfig.fields.floorId || undefined,
 					groupId: this.fieldConfig.fields.groupId || undefined,
 					userId: data.userId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO : item || undefined,
 				}
 			}
 		}
@@ -125,13 +179,32 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 	// 数据下钻
 	viewDetail3(data, type){
 		let query = null
+		let item = null;
+		if(this.userId){
+		  item = this.userList.find(item => item.id == this.userId);
+		}
 		if(type=='all'){
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					evaluateId: 20423,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: this.userId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO : item || undefined,
 				}
 			}
 		}else{
@@ -148,6 +221,14 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 					floorId: this.fieldConfig.fields.floorId || undefined,
 					groupId: this.fieldConfig.fields.groupId || undefined,
 					userId: data.userId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO : item || undefined,
 				}
 			}
 		}
@@ -159,13 +240,32 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 	// 数据下钻
 	viewDetail4(data, type){
 		let query = null
+		let item = null;
+		if(this.userId){
+		  item = this.userList.find(item => item.id == this.userId);
+		}
 		if(type=='all'){
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					evaluateId: 20422,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: this.userId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO : item || undefined,
 				}
 			}
 		}else{
@@ -182,6 +282,14 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 					floorId: this.fieldConfig.fields.floorId || undefined,
 					groupId: this.fieldConfig.fields.groupId || undefined,
 					userId: data.userId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO : item || undefined,
 				}
 			}
 		}
@@ -193,13 +301,32 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 	// 数据下钻
 	viewDetail5(data, type){
 		let query = null
+		let item = null;
+		if(this.userId){
+		  item = this.userList.find(item => item.id == this.userId);
+		}
 		if(type=='all'){
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					evaluateId: 20421,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: this.userId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO : item || undefined,
 				}
 			}
 		}else{
@@ -216,6 +343,14 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 					floorId: this.fieldConfig.fields.floorId || undefined,
 					groupId: this.fieldConfig.fields.groupId || undefined,
 					userId: data.userId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO : item || undefined,
 				}
 			}
 		}
@@ -227,13 +362,32 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 	// 数据下钻
 	viewDetail6(data, type){
 		let query = null
+		let item = null;
+		if(this.userId){
+		  item = this.userList.find(item => item.id == this.userId);
+		}
 		if(type=='all'){
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
-					evaluateId: 20420
+					evaluateId: 20420,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					userId: this.userId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO : item || undefined,
 				}
 			}
 		}else{
@@ -250,6 +404,14 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 					floorId: this.fieldConfig.fields.floorId || undefined,
 					groupId: this.fieldConfig.fields.groupId || undefined,
 					userId: data.userId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO : item || undefined,
 				}
 			}
 		}
@@ -421,6 +583,7 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
     this.userId = undefined;
     this.fieldConfig.fields = {buildingId: undefined, floorId: undefined, categoryId: undefined, groupId: undefined, repairDeptId: undefined};
     this.customChangeDateComponent.resetByDate();
+		sessionStorage.removeItem('maintenanceData');
     this.search();
   }
 

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

@@ -48,16 +48,16 @@
   <tbody>
     <tr *ngFor="let data of listOfData">
       <td>{{ data.userName }}<ng-container *ngIf="data.userAccount">({{ data.userAccount }})</ng-container></td>
-      <td (click)="viewDetail1(data)">{{ data.sum }}</td>
+      <td class="text-sign" (click)="viewDetail1(data)">{{ data.sum }}</td>
       <td>{{ data.avgResponseTime }}</td>
       <td>{{ data.avgResolvedTime }}</td>
-      <td (click)="viewDetail2(data)">{{ data.resolvedOverNum }}</td>
-      <td (click)="viewDetail3(data)">{{ data.overTimeNum }}</td>
+      <td class="text-sign" (click)="viewDetail2(data)">{{ data.resolvedOverNum }}</td>
+      <td class="text-sign" (click)="viewDetail3(data)">{{ data.overTimeNum }}</td>
       <td>{{ data.consumablePrice }}</td>
       <td>{{ data.workHourPrice }}</td>
       <td>{{ data.totalPrice }}</td>
 			<td>{{ data.totalScore }}</td>
-      <td (click)="viewDetail4(data)">{{ data.negativeNum }}</td>
+      <td class="text-sign" (click)="viewDetail4(data)">{{ data.negativeNum }}</td>
       <td>{{ data.favorableRate }}</td>
     </tr>
   </tbody>
@@ -65,16 +65,16 @@
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
         <td style="width: 8%">{{ data.userName }}</td>
-        <td style="width: 8%" (click)="viewDetail1(data, 'all')">{{ data.sum }}</td>
+        <td style="width: 8%" class="text-sign" (click)="viewDetail1(data, 'all')">{{ data.sum }}</td>
         <td style="width: 8%">{{ data.avgResponseTime }}</td>
         <td style="width: 8%">{{ data.avgResolvedTime }}</td>
-        <td style="width: 8%" (click)="viewDetail2(data, 'all')">{{ data.resolvedOverNum }}</td>
-        <td style="width: 8%" (click)="viewDetail3(data, 'all')">{{ data.overTimeNum }}</td>
+        <td style="width: 8%" class="text-sign" (click)="viewDetail2(data, 'all')">{{ data.resolvedOverNum }}</td>
+        <td style="width: 8%" class="text-sign" (click)="viewDetail3(data, 'all')">{{ data.overTimeNum }}</td>
         <td style="width: 8%">{{ data.consumablePrice }}</td>
         <td style="width: 8%">{{ data.workHourPrice }}</td>
         <td style="width: 8%">{{ data.totalPrice }}</td>
 				<td style="width: 8%">{{ data.totalScore }}</td>
-        <td style="width: 8%" (click)="viewDetail4(data, 'all')">{{ data.negativeNum }}</td>
+        <td style="width: 8%" class="text-sign" (click)="viewDetail4(data, 'all')">{{ data.negativeNum }}</td>
         <td style="width: 8%">{{ data.favorableRate }}</td>
       </tr>
     </table>

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

@@ -5,6 +5,10 @@
   right: 0;
   bottom: 0;
   left: 0;
+	.text-sign{
+		text-decoration: underline;
+		cursor: pointer;
+	}
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
     width: calc(100% - 15px);

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

@@ -59,12 +59,30 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 	// 数据下钻
 	viewDetail1(data, type){
 		let query = null
+		let item = null;
+		if(this.userId){
+		  item = this.userList.find(item => item.id == this.userId);
+		}
 		if(type=='all'){
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
 				searchQuery:{
 					statusValue: 'close',
+					userId: this.userId,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO : item || undefined
 				}
 			}
 		}else{
@@ -79,6 +97,14 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 					buildingId: this.fieldConfig.fields.buildingId || undefined,
 					floorId: this.fieldConfig.fields.floorId || undefined,
 					groupId: this.fieldConfig.fields.groupId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO : item || undefined
 				}
 			}
 		}
@@ -90,6 +116,10 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 	// 数据下钻
 	viewDetail2(data, type){
 		let query = null
+		let item = null;
+		if(this.userId){
+		  item = this.userList.find(item => item.id == this.userId);
+		}
 		if(type=='all'){
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
@@ -97,6 +127,20 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 				searchQuery:{
 					statusValue: 'close',
 					overtimeId: 1,
+					userId: this.userId,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO : item || undefined
 				}
 			}
 		}else{
@@ -112,6 +156,14 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 					buildingId: this.fieldConfig.fields.buildingId || undefined,
 					floorId: this.fieldConfig.fields.floorId || undefined,
 					groupId: this.fieldConfig.fields.groupId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO : item || undefined
 				}
 			}
 		}
@@ -123,6 +175,10 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 	// 数据下钻
 	viewDetail3(data, type){
 		let query = null
+		let item = null;
+		if(this.userId){
+		  item = this.userList.find(item => item.id == this.userId);
+		}
 		if(type=='all'){
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
@@ -130,6 +186,20 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 				searchQuery:{
 					statusValue: 'close',
 					isHangId: 1,
+					userId: this.userId,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO : item || undefined
 				}
 			}
 		}else{
@@ -145,6 +215,14 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 					buildingId: this.fieldConfig.fields.buildingId || undefined,
 					floorId: this.fieldConfig.fields.floorId || undefined,
 					groupId: this.fieldConfig.fields.groupId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO : item || undefined
 				}
 			}
 		}
@@ -156,6 +234,10 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 	// 数据下钻
 	viewDetail4(data, type){
 		let query = null
+		let item = null;
+		if(this.userId){
+		  item = this.userList.find(item => item.id == this.userId);
+		}
 		if(type=='all'){
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
@@ -163,6 +245,20 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 				searchQuery:{
 					statusValue: 'close',
 					evaluateId: 20424,
+					userId: this.userId,
+					categoryId: this.fieldConfig.fields.categoryId || undefined,
+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+					buildingId: this.fieldConfig.fields.buildingId || undefined,
+					floorId: this.fieldConfig.fields.floorId || undefined,
+					groupId: this.fieldConfig.fields.groupId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO : item || undefined
 				}
 			}
 		}else{
@@ -178,6 +274,14 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 					buildingId: this.fieldConfig.fields.buildingId || undefined,
 					floorId: this.fieldConfig.fields.floorId || undefined,
 					groupId: this.fieldConfig.fields.groupId || undefined,
+					placeId: this.fieldConfig.fields.floorId || undefined,
+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
+					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
+					userDTO : item || undefined
 				}
 			}
 		}
@@ -347,6 +451,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
     this.userId = undefined;
     this.fieldConfig.fields = {buildingId: undefined, floorId: undefined, categoryId: undefined, groupId: undefined};
     this.customChangeDateComponent.resetByDate();
+		sessionStorage.removeItem('maintenanceData');
     this.search();
   }
 

src/app/views/office-management/office-management.component.html

@@ -138,9 +138,9 @@
 					  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="busiParent">业务父级</nz-form-label>
 					  <nz-form-control nzErrorTip="请填写业务父级!">
 					    <nz-select nzAllowClear [nzDropdownMatchSelectWidth]="false" formControlName="busiParent" nzShowSearch
-					      nzPlaceHolder="请填写业务父级" nzServerSearch (nzOnSearch)="changeInp($event)"
-					      (nzOpenChange)="openDeptSelect($event)">
-					      <ng-container *ngFor="let data of allParentdepart">
+					      nzPlaceHolder="请填写业务父级" nzServerSearch (nzOnSearch)="changeInp2($event)"
+					      (nzOpenChange)="openDeptSelect2($event)">
+					      <ng-container *ngFor="let data of businessDept">
 					        <nz-option *ngIf="!isLoading" [nzLabel]="data.dept" [nzValue]="data.id">
 					        </nz-option>
 					      </ng-container>

src/app/views/office-management/office-management.component.ts

@@ -40,12 +40,20 @@ export class OfficeManagementComponent implements OnInit {
 
   ngOnInit() {
     this.searchParentDeptSubject.pipe(debounceTime(500)).subscribe((v: any) => {
-      this.getAllParentdepart(v).subscribe((result) => {
+      this.getAllParentdepart(v,'qd').subscribe((result) => {
         this.isLoading = false;
         if (result.status == 200) {
           this.allParentdepart = result.list;
         }
       });
+    });
+		this.searchBusinessDeptSubject.pipe(debounceTime(500)).subscribe((v: any) => {
+      this.getAllParentdepart(v,'yw').subscribe((result) => {
+        this.isLoading = false;
+        if (result.status == 200) {
+          this.businessDept = result.list;
+        }
+      });
     });
     this.coopBtns = this.tool.initCoopBtns(this.route);
     this.initForm();
@@ -81,6 +89,7 @@ export class OfficeManagementComponent implements OnInit {
   allParentdepart: any = []; //所有的父级科室列表
   hospitals1: any = []; //院区列表(搜索)
   searchParentDeptSubject = new Subject();
+	searchBusinessDeptSubject = new Subject();
   // 初始化增删改按钮
   coopBtns: any = {};
   // 模板导出
@@ -164,12 +173,17 @@ export class OfficeManagementComponent implements OnInit {
     this.isLoading = true;
     this.searchParentDeptSubject.next(e);
   }
+	
+	changeInp2(e) {
+    this.isLoading = true;
+    this.searchBusinessDeptSubject.next(e);
+  }
   // 打开父级科室下拉框baba
   isLoading = false;
   openDeptSelect(flag) {
     if (flag) {
       this.isLoading = true;
-      this.getAllParentdepart().subscribe((result) => {
+      this.getAllParentdepart('','qd').subscribe((result) => {
         this.isLoading = false;
         if (result.status == 200) {
           this.allParentdepart = result.list;
@@ -177,6 +191,18 @@ export class OfficeManagementComponent implements OnInit {
       });
     }
   }
+	
+	openDeptSelect2(flag) {
+    if (flag) {
+      this.isLoading = true;
+      this.getAllParentdepart('','yw').subscribe((result) => {
+        this.isLoading = false;
+        if (result.status == 200) {
+          this.businessDept = result.list;
+        }
+      });
+    }
+  }
   // 启用/停用弹框
   coopData:any = {};
   addDateModal(data) {
@@ -207,7 +233,7 @@ export class OfficeManagementComponent implements OnInit {
       });
   }
   //获取所有的父级科室列表
-  getAllParentdepart(keyWord = "") {
+  getAllParentdepart(keyWord = "", type) {
     let postData: any = {
       idx: 0,
       sum: 10,
@@ -216,10 +242,18 @@ export class OfficeManagementComponent implements OnInit {
         keyWord: keyWord,
       },
     };
-    if (this.coopItem) {
-      // 过滤这个科室及其子科室
-      postData.department.filterByDeptId = this.coopItem.id;
-    }
+		if(type=='qd'){
+			if (this.coopItem) {
+			  // 过滤这个科室及其子科室
+			  postData.department.filterByDeptId = this.coopItem.id;
+			}
+		}else{
+			if (this.coopItem) {
+			  // 过滤这个科室及其子科室
+			  postData.department.filterBusiByDeptId = this.coopItem.id;
+			}
+		}
+
     return this.mainService.getFetchDataList("data", "department", postData);
   }
   // 新添加科室号码
@@ -636,6 +670,7 @@ export class OfficeManagementComponent implements OnInit {
 
   // 编辑
   coopItem: any = null;
+	businessDept:any;
   edit(e, data) {
     e.stopPropagation();
     this.add = false;
@@ -671,15 +706,15 @@ export class OfficeManagementComponent implements OnInit {
     }
     this.validateForm.controls.officeAddress.setValue(data.address);
 		if(data.busiParentDTO){
-			this.getAllParentdepart(data.busiParentDTO.dept).subscribe((res) => {
+			this.getAllParentdepart(data.busiParentDTO.dept,'yw').subscribe((res) => {
 			  if (res.status == 200) {
-			    this.allParentdepart = res.list;
+			    this.businessDept = res.list;
 					this.validateForm.controls.busiParent.setValue(data.busiParentDTO.id);
 				}
 			});
 		}
     if (data.parent) {
-      this.getAllParentdepart(data.parent.dept).subscribe((res) => {
+      this.getAllParentdepart(data.parent.dept,'qd').subscribe((res) => {
         if (res.status == 200) {
           this.allParentdepart = res.list;
           this.validateForm.controls.parentOfficeName.setValue(data.parent.id);

src/app/views/qrcode-configuration/qrcode-configuration.component.ts

@@ -189,8 +189,7 @@ export class QRCodeConfigurationComponent implements OnInit {
     this.btnLoading = true;
     let deptsPhone = this.deptPhones.map((item) => item.phone).join();
     if(this.add){
-      this.qrCodeConfigurationService
-      .add({
+			let query ={
         name: this.validateForm.value.name,
         deptId: this.validateForm.value.deptId,
         placeCode: this.validateForm.value.placeCode,
@@ -199,7 +198,14 @@ export class QRCodeConfigurationComponent implements OnInit {
 				},
         phones: deptsPhone ? this.validateForm.value.phones + "," + deptsPhone : this.validateForm.value.phones,
         hosId: this.hosId,
-      })
+      }
+			if(this.validateForm.value.priority){
+				query.priority.id = this.validateForm.value.priority
+			}else{
+				delete query.priority
+			}
+      this.qrCodeConfigurationService
+      .add(query)
       .subscribe((data) => {
         this.btnLoading = false;
         this.hideModal();
@@ -211,8 +217,7 @@ export class QRCodeConfigurationComponent implements OnInit {
         }
       });
     }else{
-      this.qrCodeConfigurationService
-      .update({
+			let query = {
         name: this.validateForm.value.name,
         deptId: this.validateForm.value.deptId,
         placeCode: this.validateForm.value.placeCode,
@@ -221,7 +226,14 @@ export class QRCodeConfigurationComponent implements OnInit {
 				priority: {
 					id:this.validateForm.value.priority
 				},
-      })
+      }
+			if(this.validateForm.value.priority){
+				query.priority.id = this.validateForm.value.priority
+			}else{
+				delete query.priority
+			}
+      this.qrCodeConfigurationService
+      .update(query)
       .subscribe((data) => {
         this.btnLoading = false;
         this.hideModal();