bugfix

src/app/share/businessData-detail-modal/businessData-detail-modal.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
 import { MainService } from '../../services/main.service';
 import { ToolService } from 'src/app/services/tool.service';
-
+import { format, startOfDay, endOfDay } from 'date-fns';
 @Component({
   selector: 'app-businessData-detail-modal',
   templateUrl: './businessData-detail-modal.component.html',
@@ -72,7 +72,7 @@ export class BusinessDataDetailModalComponent implements OnInit {
           this.getSpecimen();
           break;
       case 'deptInspectionRateStatistics':
-        this.getDeptInspectionRateStatistics(1);
+        this.getDeptInspectionRateStatistics();
         break;
     }
   }
@@ -139,28 +139,28 @@ export class BusinessDataDetailModalComponent implements OnInit {
       case 'total':
         postData.deptId = this.dataInfo.data.deptId;
         postData.hosId = this.hosId;
-        postData.startTime = this.dataInfo.searchDto.startTime;
-        postData.endTime = this.dataInfo.searchDto.endTime;
+        postData.startTime = this.dataInfo.searchDto.dateRange[0] ? format(startOfDay(this.dataInfo.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined;
+        postData.endTime = this.dataInfo.searchDto.dateRange[1] ? format(endOfDay(this.dataInfo.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined;
         break;
       case 'noCheckCount':
         postData.deptId = this.dataInfo.data.deptId;
         postData.hosId = this.hosId;
-        postData.startTime = this.dataInfo.searchDto.startTime;
-        postData.endTime = this.dataInfo.searchDto.endTime;
+        postData.startTime = this.dataInfo.searchDto.dateRange[0] ? format(startOfDay(this.dataInfo.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined;
+        postData.endTime = this.dataInfo.searchDto.dateRange[1] ? format(endOfDay(this.dataInfo.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined;
         postData.reportInsState = 'noCheck';
         break;
       case 'checkCount':
         postData.deptId = this.dataInfo.data.deptId;
         postData.hosId = this.hosId;
-        postData.startTime = this.dataInfo.searchDto.startTime;
-        postData.endTime = this.dataInfo.searchDto.endTime;
+        postData.startTime = this.dataInfo.searchDto.dateRange[0] ? format(startOfDay(this.dataInfo.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined;
+        postData.endTime = this.dataInfo.searchDto.dateRange[1] ? format(endOfDay(this.dataInfo.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined;
         postData.reportInsState = 'check';
         break;
       case 'insCount':
         postData.deptId = this.dataInfo.data.deptId;
         postData.hosId = this.hosId;
-        postData.startTime = this.dataInfo.searchDto.startTime;
-        postData.endTime = this.dataInfo.searchDto.endTime;
+        postData.startTime = this.dataInfo.searchDto.dateRange[0] ? format(startOfDay(this.dataInfo.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined;
+        postData.endTime = this.dataInfo.searchDto.dateRange[1] ? format(endOfDay(this.dataInfo.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined;
         postData.reportInsState = 'inspect';
         break;
     }

src/app/views/dept-inspection-rate-statistics/dept-inspection-rate-statistics.component.ts

@@ -91,8 +91,8 @@ export class DeptInspectionRateStatisticsComponent implements OnInit {
   }
 
   personDetail(dataInfo){
-    let startDate = dataInfo.searchDto.startTime || 'null';
-    let endDate = dataInfo.searchDto.endDate || 'null';
+    let startDate = dataInfo.searchDto.dateRange[0] ? format(startOfDay(dataInfo.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : 'null';
+    let endDate = dataInfo.searchDto.dateRange[1] ? format(endOfDay(dataInfo.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : 'null';
     let deptId = dataInfo.data.deptId || 'null';
     this.router.navigateByUrl(
       `/main/deptInspectionRateStatistics/workerStatisticsDetail/null/${startDate}/${endDate}/null/deptInspectionRateStatistics/${deptId}`