diff --git a/src/app.controller.ts b/src/app.controller.ts index 0cef368..90b8759 100644 --- a/src/app.controller.ts +++ b/src/app.controller.ts @@ -111,7 +111,7 @@ export class CreateVisitor { @ApiProperty({ description: "被访部门" }) @IsString() @IsNotEmpty() - public visited_deparment: string; + public visited_department: string; @ApiProperty({ description: "被访部门" }) @IsString() @@ -212,7 +212,10 @@ export class AppController { }) const new_list = await bluebird.map(list, async (item) => { const visitor_list = await this.nodeOtherVisitorRepository.find({ - where: { node_visitor_id: item.id } + where: { node_visitor_id: item.id }, + order: { + created_date: "DESC" + } }) return { ...item, @@ -252,7 +255,7 @@ export class AppController { // new_node_visitor.end_date = new Date(data.end_date).toLocaleDateString(); new_node_visitor.end_date = moment(data.end_date).format("YYYY-MM-DD"); new_node_visitor.visited_staff = data.visited_staff; - new_node_visitor.visited_deparment = data.visited_deparment; + new_node_visitor.visited_department = data.visited_department; new_node_visitor.purpose = data.purpose; new_node_visitor.electronics = data.electronics; // new_node_visitor.electronics = JSON.stringify(data.electronics); diff --git a/src/node-visitor.entity.ts b/src/node-visitor.entity.ts index 3274813..3d757a6 100644 --- a/src/node-visitor.entity.ts +++ b/src/node-visitor.entity.ts @@ -61,7 +61,7 @@ export class NodeVisitorEntity extends Base { @ApiProperty({ description: "被访部门" }) @Column({ length: 150, nullable: true, type: 'char' }) - public visited_deparment: string; + public visited_department: string; @ApiProperty({ description: "被访部门" }) @Column({ length: 150, nullable: true, type: 'char' })