From b7301c0d37f2679ba095d22761746a12ffc7db09 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Wed, 18 May 2022 16:20:09 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E6=A0=B9=E6=8D=AE=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../audit-details-inform-time.component.html        |  2 ++
 .../pages/audit/audit-ing/audit-ing.component.html  | 13 +++++++++++--
 .../audit/audit-record/audit-record.component.html  | 11 +++++++++--
 .../audit/audit-record/audit-record.component.ts    |  5 ++++-
 .../details-file-category.component.html            |  2 +-
 .../details-update-category.component.html          |  2 +-
 6 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/app/pages/audit/audit-inform-time/audit-details-inform-time/audit-details-inform-time.component.html b/src/app/pages/audit/audit-inform-time/audit-details-inform-time/audit-details-inform-time.component.html
index 8a8cfbe..0d26d0b 100644
--- a/src/app/pages/audit/audit-inform-time/audit-details-inform-time/audit-details-inform-time.component.html
+++ b/src/app/pages/audit/audit-inform-time/audit-details-inform-time/audit-details-inform-time.component.html
@@ -9,6 +9,8 @@
     <div class="content">
         <p>{{organizationName}}</p>
         <div class="cutoffrule"></div>
+        <p>证照名称: {{data.licenseType ? data.licenseType.licenseName : null}}</p>
+        <div class="cutoffrule"></div>
         <p class="flexp">
             <span>办理提醒时间：修改时间 {{data.handleRemindDays}}天</span>
             <span>默认时间 {{data.handleRemindDaysDefault}}天</span>
diff --git a/src/app/pages/audit/audit-ing/audit-ing.component.html b/src/app/pages/audit/audit-ing/audit-ing.component.html
index 558691e..c03a84a 100644
--- a/src/app/pages/audit/audit-ing/audit-ing.component.html
+++ b/src/app/pages/audit/audit-ing/audit-ing.component.html
@@ -29,8 +29,17 @@
                     </td>
                     <td><label *ngIf="item.gasStation">{{item.gasStation.stationName}}</label></td>
                     <td><label *ngIf="item.gasStation">{{item.gasStation.locationName}}</label></td>
-                    <td><label *ngIf="item.gasStation">{{item.gasStation.companyName}}</label></td>
-                    <td>{{item.committedTime | date:"yyyy/MM/dd"}}</td>
+                    <td>
+                        <ng-container *ngIf="item.gasStation; else elseTemplate">
+                            <label>{{item.gasStation.companyName}}</label>
+                        </ng-container>
+                        <ng-template #elseTemplate>
+                            <label>{{item.organization ? item.organization.displayName : null}}</label>
+                        </ng-template>
+
+
+                    </td>
+                    <td>{{item.committedTime | date:"yyyy/MM/dd HH:mm:ss" }}</td>
                     <td>{{item.auditStatusDesc}}</td>
                     <td class="operation">
                         <span class="blueColor" (click)="dispose(item)">处置</span>
diff --git a/src/app/pages/audit/audit-record/audit-record.component.html b/src/app/pages/audit/audit-record/audit-record.component.html
index a2c5cad..071ede5 100644
--- a/src/app/pages/audit/audit-record/audit-record.component.html
+++ b/src/app/pages/audit/audit-record/audit-record.component.html
@@ -113,8 +113,15 @@
                     </td>
                     <td><label *ngIf="item.gasStation">{{item.gasStation.stationName}}</label></td>
                     <td><label *ngIf="item.gasStation">{{item.gasStation.locationName}}</label></td>
-                    <td><label *ngIf="item.gasStation">{{item.gasStation.companyName}}</label></td>
-                    <td>{{item.committedTime | date:"yyyy/MM/dd"}}</td>
+                    <td>
+                        <ng-container *ngIf="item.gasStation; else elseTemplate">
+                            <label>{{item.gasStation.companyName}}</label>
+                        </ng-container>
+                        <ng-template #elseTemplate>
+                            <label>{{item.organization ? item.organization.displayName : null}}</label>
+                        </ng-template>
+                    </td>
+                    <td>{{item.committedTime | date:"yyyy/MM/dd HH:mm:ss"}}</td>
                     <td>{{item.auditStatusDesc}}</td>
                     <td class="operation">
                         <span class="blueColor" (click)="details(item)">详情</span>
diff --git a/src/app/pages/audit/audit-record/audit-record.component.ts b/src/app/pages/audit/audit-record/audit-record.component.ts
index 74a9f46..e85a0a4 100644
--- a/src/app/pages/audit/audit-record/audit-record.component.ts
+++ b/src/app/pages/audit/audit-record/audit-record.component.ts
@@ -161,13 +161,16 @@ export class AuditRecordComponent implements OnInit {
   MaxResultCount: string = '100'
   getRecordList() {
     this.tableSpin = true
+    let endTime = this.validateForm.value.datePicker[1] + ' 23:59:59'
+    console.log('结束时间',endTime)
+   
     let params = {
       IsContainsChildren: 'true',
       OrganizationUnitId: this.validateForm.value.organization,
       AuditTitle: this.validateForm.value.type,
       AuditType: this.validateForm.value.info,
       StartTime: this.validateForm.value.datePicker[0],
-      EndTime: this.validateForm.value.datePicker[1],
+      EndTime: endTime,
       AuditStatuses: this.validateForm.value.state,
       AuditLevel: this.validateForm.value.level,
       Sorting: null,
diff --git a/src/app/pages/license/file-category/details-file-category/details-file-category.component.html b/src/app/pages/license/file-category/details-file-category/details-file-category.component.html
index ff37dda..0280b5d 100644
--- a/src/app/pages/license/file-category/details-file-category/details-file-category.component.html
+++ b/src/app/pages/license/file-category/details-file-category/details-file-category.component.html
@@ -15,7 +15,7 @@
         <div class="cutoffrule"></div> -->
         <p>证件图片: &nbsp;&nbsp;<img *ngIf="data.imageUrl" [src]="data.imageUrl" (click)="viewImg(data.imageUrl)"></p>
         <div class="cutoffrule"></div>
-        <p class="recordP">
+        <p class="recordP" style="margin-bottom: 32px">
             <span>审核记录</span>
             <span>
                 <span style="margin-right: 6px;">
diff --git a/src/app/pages/license/update-category/details-update-category/details-update-category.component.html b/src/app/pages/license/update-category/details-update-category/details-update-category.component.html
index 4b970b7..635d1ef 100644
--- a/src/app/pages/license/update-category/details-update-category/details-update-category.component.html
+++ b/src/app/pages/license/update-category/details-update-category/details-update-category.component.html
@@ -25,7 +25,7 @@
             <img *ngIf="data.imageUrl && getFileType(data.imageUrl) == 'pdf'" src="../../../../assets/images/license/pdf.png" (click)="lookFile(data)">
         </p>
         <div class="cutoffrule"></div>
-        <p class="recordP">
+        <p class="recordP" style="margin-bottom: 32px">
             <span>审核记录</span>
             <span>
                 <span style="margin-right: 6px;">