From 32b1ab4e372c50710595a2e7daab2d5defb996f5 Mon Sep 17 00:00:00 2001
From: rustdreamer <rustdreamer@outlook.com>
Date: Mon, 25 Dec 2023 14:15:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=E5=92=8C?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app.controller.ts      | 39 +++++++++++++++++++++++++++++++++-----
 src/node-visitor.entity.ts |  8 ++++++++
 2 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/src/app.controller.ts b/src/app.controller.ts
index d575e60..ce6e4f6 100644
--- a/src/app.controller.ts
+++ b/src/app.controller.ts
@@ -4,7 +4,7 @@ import * as fs from 'fs';
 import { ApiBearerAuth, ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
 import { IsArray, IsBoolean, IsDateString, IsNotEmpty, IsOptional, IsString } from 'class-validator';
 import { NodeVisitorEntity } from './node-visitor.entity';
-import { DataSource, IsNull, LessThan, Not, Repository } from 'typeorm';
+import { Between, DataSource, IsNull, LessThan, Not, Repository } from 'typeorm';
 import * as bluebird from 'bluebird';
 import { NodeOtherVisitorEntity } from './node-other-visitor.entity';
 import * as moment from 'moment';
@@ -151,6 +151,16 @@ export class CreateVisitor {
   public electronics: string;
   // public electronics: Electronics[];
 
+  @ApiProperty({ description: "携带电子产品人员" })
+  @IsArray()
+  @IsOptional()
+  public personnel_carrying_electronics: string;
+
+  @ApiProperty({ description: "是否上E1楼洽谈" })
+  @IsArray()
+  @IsOptional()
+  public sfslqt: string;
+
   @ApiProperty({ description: "访客清单", type: [VisitorList] })
   @IsArray()
   @IsNotEmpty()
@@ -173,6 +183,16 @@ export class QueryVisitorDto extends CommonPageArgs {
   @IsOptional()
   search?: string
 
+  @ApiPropertyOptional({ description: "申请人", required: false })
+  @IsString()
+  @IsOptional()
+  applicant?: string
+
+  @ApiPropertyOptional({ description: "被访人", required: false })
+  @IsString()
+  @IsOptional()
+  visited_staff?: string
+
   @ApiPropertyOptional({ description: "", required: false })
   @IsString()
   @IsOptional()
@@ -296,12 +316,19 @@ export class AppController {
       throw new BadRequestException("无权限, 请联系管理员")
     }
     const where: any = {};
-    if (query_data.start_date) {
-      where.start_date = query_data.start_date
+    if (query_data.applicant) {
+      where.applicant = query_data.applicant
     }
-    if (query_data.end_date) {
-      where.end_date = query_data.end_date
+    if (query_data.visited_staff) {
+      where.visited_staff = query_data.visited_staff
+    }
+    if (query_data.start_date) {
+      // where.start_date = query_data.start_date
+      where.start_date = Between(query_data.start_date, query_data.end_date)
     }
+    // if (query_data.end_date) {
+    //   where.end_date = query_data.end_date
+    // }
     const query = this.nodeVisitorRepository.createQueryBuilder('node-visitor');
     query.where(where);
     // if (organization_name) {
@@ -451,6 +478,8 @@ export class AppController {
       new_node_visitor.visited_department = data.visited_department;
       new_node_visitor.purpose = data.purpose;
       new_node_visitor.electronics = data.electronics;
+      new_node_visitor.personnel_carrying_electronics = data.personnel_carrying_electronics;
+      new_node_visitor.sfslqt = data.sfslqt;
       // new_node_visitor.electronics = JSON.stringify(data.electronics);
       // new_node_visitor.visitor_list = data.visitor_list;
       new_node_visitor.may_access_sensitive_info = data.may_access_sensitive_info;
diff --git a/src/node-visitor.entity.ts b/src/node-visitor.entity.ts
index e2e3266..e00cc18 100644
--- a/src/node-visitor.entity.ts
+++ b/src/node-visitor.entity.ts
@@ -71,6 +71,14 @@ export class NodeVisitorEntity extends Base {
   @Column({ length: 255, nullable: true, type: 'char' })
   public electronics: string;
 
+  @ApiProperty({ description: "携带电子产品人员" })
+  @Column({ length: 255, nullable: true, type: 'char' })
+  public personnel_carrying_electronics: string;
+
+  @ApiProperty({ description: "是否上E1楼洽谈" })
+  @Column({ length: 255, nullable: true, type: 'char' })
+  public sfslqt: string;
+
   // @ApiProperty({ description: "访客清单", type: [VisitorList] })
   // @IsArray()
   // @IsNotEmpty()