修改时间处理

README.md

@@ -1,39 +1,47 @@
-# sql项目转换后的注意事项
+# sql 项目转换后的注意事项
 
 ## 1.数据库数据类型
+
 ### 1.1 字符串,有长度的使用 `character varying`; 不加限制的使用 `text`
 
 ### 1.2 数字使用 `integer`; 金额使用 `money`
 
 ### 1.3 时间使用 `timestamp without time zone`
-  开始时间与结束时间都分为2个字段
-  表属性在Column装饰器上添加:
+
+开始时间与结束时间都分为 2 个字段
+表属性在 Column 装饰器上添加:
+
+```
+transformer: { from: value => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : value), to: value => value }
+```
+
+用来格式化输出格式
+
+### 1.4 不能像 mongodb 一样轻易使用 JSON 文档模式
+
+- 因为 JSONB 数据中,只有精确查询:
+  ```
+  Array<any>:[1,2,3]
+  JSONB_CONTAINS/JSONB_EXISTS(column, :column)', { column: 1 }
   ```
-  transformer: { from: value => dayjs(value).format('YYYY-MM-DD HH:mm:ss'), to: value => value } 
   ```
-  用来格式化输出格式
-
-### 1.4 不能像mongodb一样轻易使用JSON文档模式
-  * 因为JSONB数据中,只有精确查询:
-    ``` 
-    Array<any>:[1,2,3]
-    JSONB_CONTAINS/JSONB_EXISTS(column, :column)', { column: 1 }
-    ```
-    ```
-    object: {test:'123'}
-    JSONB_CONTAINS(column, :val)', { val: { test: '123' } }
-    ```
-    ```
-    Array<object>
-    where "${root_column}" @> '[{"${key}": ${value} }]'
-    ```
-    导致文档模式查询会变得不可能,所以使用JSONB数据格式的情况,只有准确查询;
-    将文档模式的设计变成表关联,联查出来
+  object: {test:'123'}
+  JSONB_CONTAINS(column, :val)', { val: { test: '123' } }
+  ```
+  ```
+  Array<object>
+  where "${root_column}" @> '[{"${key}": ${value} }]'
+  ```
+  导致文档模式查询会变得不可能,所以使用 JSONB 数据格式的情况,只有准确查询;
+  将文档模式的设计变成表关联,联查出来
 
 ## 2.数据库导入
-### 2.1 带id导入数据
-带id导入数据后,需要执行数据库命令,使id的序列从导入数据的最后一条数据开始,否则会出现id已存在问题:
-``` 
+
+### 2.1 带 id 导入数据
+
+带 id 导入数据后,需要执行数据库命令,使 id 的序列从导入数据的最后一条数据开始,否则会出现 id 已存在问题:
+
+```
   SELECT setval('"company_id_seq"', (SELECT max(id) FROM "company"));
   SELECT setval('"表名_唯一约束的字段_seq"', (SELECT max(唯一约束的字段) FROM 表名));
-```
+```

src/entity/platform/achievement.entity.ts

@@ -29,7 +29,7 @@ export class Achievement extends BaseModel {
   technology: string;
   @Column({ type: 'jsonb', nullable: true, comment: '成果地区', default: [] })
   area: Array<any>;
-  @Column({ type: 'timestamp without time zone', nullable: true, comment: '发布时间', transformer: { from: value => dayjs(value).format('YYYY-MM-DD HH:mm:ss'), to: value => value } })
+  @Column({ type: 'timestamp without time zone', nullable: true, comment: '发布时间', transformer: { from: value => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : value), to: value => value } })
   time: Date;
   @Column({ type: 'character varying', nullable: true, comment: '参考价格' })
   money: string;

src/entity/platform/chat.entity.ts

@@ -12,7 +12,7 @@ export class Chat extends BaseModel {
   type: string;
   @Column({ type: 'text', comment: '内容' })
   content: string;
-  @Column({ type: 'timestamp without time zone', comment: '发送时间', transformer: { from: value => dayjs(value).format('YYYY-MM-DD HH:mm:ss'), to: value => value } })
+  @Column({ type: 'timestamp without time zone', comment: '发送时间', transformer: { from: value => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : value), to: value => value } })
   send_time: Date;
   @Column({ type: 'character varying', comment: '是否已读', default: '0' })
   is_read: string;

src/entity/platform/collection.entity.ts

@@ -10,6 +10,6 @@ export class Collection extends BaseModel {
   source: number;
   @Column({ type: 'character varying', nullable: true, comment: '类型' })
   type: string;
-  @Column({ type: 'timestamp without time zone', nullable: true, comment: '收藏时间', transformer: { from: value => dayjs(value).format('YYYY-MM-DD HH:mm:ss'), to: value => value } })
+  @Column({ type: 'timestamp without time zone', nullable: true, comment: '收藏时间', transformer: { from: value => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : value), to: value => value } })
   time: Date;
 }

src/entity/platform/news.entity.ts

@@ -14,7 +14,11 @@ export class News extends BaseModel {
   logo: Array<any>;
   @Column({ type: 'character varying', nullable: true, comment: '发布人' })
   person: string;
-  @Column({ type: 'timestamp without time zone', nullable: true, comment: '发布时间', transformer: { from: value => dayjs(value).format('YYYY-MM-DD HH:mm:ss'), to: value => value } })
+  @Column({ type: 'character varying', nullable: true, comment: '跳转地址' })
+  route: string;
+  @Column({ type: 'character varying', nullable: true, comment: '跳转类型' })
+  jump_type: string;
+  @Column({ type: 'timestamp without time zone', nullable: true, comment: '发布时间', transformer: { from: value => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : value), to: value => value } })
   time: Date;
   @Column({ type: 'character varying', nullable: true, comment: '内容' })
   content: string;

src/entity/test.entity.ts

@@ -17,7 +17,7 @@ export class Test extends BaseModel {
   array_props: Array<object>;
   @Column({ type: 'text', nullable: true, comment: '备注' })
   remark: string;
-  @Column({ type: 'timestamp without time zone', nullable: true, comment: '时间', transformer: { from: value => dayjs(value).format('YYYY-MM-DD HH:mm:ss'), to: value => value } })
+  @Column({ type: 'timestamp without time zone', nullable: true, comment: '时间', transformer: { from: value => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : value), to: value => value } })
   time: Date;
   @Column({ type: 'jsonb', nullable: true, comment: '爱好' })
   tags: Array<any>;

src/entity/users/company.entity.ts

@@ -54,7 +54,7 @@ export class Company extends BaseModel {
 
   @Column({ type: 'character varying', nullable: true, comment: '注册资本' })
   register: string;
-  @Column({ type: 'timestamp without time zone', nullable: true, comment: '成立日期', transformer: { from: value => dayjs(value).format('YYYY-MM-DD HH:mm:ss'), to: value => value } })
+  @Column({ type: 'timestamp without time zone', nullable: true, comment: '成立日期', transformer: { from: value => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : value), to: value => value } })
   create_time: Date;
   @Column({ type: 'character varying', nullable: true, comment: '地址' })
   address: string;

src/entity/users/expert.entity.ts

@@ -15,7 +15,7 @@ export class Expert extends BaseModel {
   icon: Array<any>;
   @Column({ type: 'character varying', nullable: true, comment: '性别' })
   gender: string;
-  @Column({ type: 'timestamp without time zone', nullable: true, comment: '出生年月', transformer: { from: value => dayjs(value).format('YYYY-MM-DD HH:mm:ss'), to: value => value } })
+  @Column({ type: 'timestamp without time zone', nullable: true, comment: '出生年月', transformer: { from: value => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : value), to: value => value } })
   birth: Date;
   @Column({ type: 'character varying', nullable: true, comment: '证件类型' })
   cardType: string;

src/entityLogs/opera.entity.ts

@@ -13,7 +13,7 @@ export class Opera extends BaseModel {
   ip: string;
   @Column({ type: 'character varying', nullable: true, comment: '设备' })
   device: string;
-  @Column({ type: 'timestamp without time zone', nullable: true, comment: '时间', transformer: { from: value => dayjs(value).format('YYYY-MM-DD HH:mm:ss'), to: value => value } })
+  @Column({ type: 'timestamp without time zone', nullable: true, comment: '时间', transformer: { from: value => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : value), to: value => value } })
   time: Date;
   @Column({ type: 'character varying', nullable: true, comment: '操作地址' })
   referer: string;

src/entityLogs/searchBehavior.entity.ts

@@ -11,7 +11,7 @@ export class SearchBehavior extends BaseModel {
   ip: string;
   @Column({ type: 'character varying', nullable: true, comment: '设备' })
   device: string;
-  @Column({ type: 'timestamp without time zone', nullable: true, comment: '时间', transformer: { from: value => dayjs(value).format('YYYY-MM-DD HH:mm:ss'), to: value => value } })
+  @Column({ type: 'timestamp without time zone', nullable: true, comment: '时间', transformer: { from: value => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : value), to: value => value } })
   time: Date;
   @Column({ type: 'character varying', comment: '检索内容' })
   keyword: string;

src/frame/BaseModel.ts

@@ -9,10 +9,10 @@ export class BaseModel {
   id?: number;
 
   /**数据创建时间 */
-  @CreateDateColumn({ type: 'timestamp without time zone', transformer: { from: value => dayjs(value).format('YYYY-MM-DD HH:mm:ss'), to: value => value } })
+  @CreateDateColumn({ type: 'timestamp without time zone', transformer: { from: value => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : value), to: value => value } })
   created_time?: Date;
   /**数据最后更新时间 */
-  @UpdateDateColumn({ type: 'timestamp without time zone', transformer: { from: value => dayjs(value).format('YYYY-MM-DD HH:mm:ss'), to: value => value } })
+  @UpdateDateColumn({ type: 'timestamp without time zone', transformer: { from: value => (value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : value), to: value => value } })
   update_time?: Date;
 
   /**数据版本 */

src/interface/platform/news.interface.ts

@@ -20,6 +20,10 @@ export class FVO_news {
   'person': string = undefined;
   @ApiProperty({ description: '发布时间' })
   'time': string = undefined;
+  @ApiProperty({ description: '跳转地址' })
+  'route': string = undefined;
+  @ApiProperty({ description: '跳转类型' })
+  'jump_type': string = undefined;
   @ApiProperty({ description: '内容' })
   'content': string = undefined;
   @ApiProperty({ description: '浏览次数' })
@@ -49,6 +53,10 @@ export class QDTO_news extends SearchBase {
   'time': string = undefined;
   @ApiProperty({ description: '类型' })
   'type': string = undefined;
+  @ApiProperty({ description: '跳转地址' })
+  'route': string = undefined;
+  @ApiProperty({ description: '跳转类型' })
+  'jump_type': string = undefined;
   @ApiProperty({ description: '是否使用' })
   'is_use': string = undefined;
   @ApiProperty({ description: '是否在首页显示' })
@@ -85,6 +93,12 @@ export class CDTO_news {
   @ApiProperty({ description: '发布时间' })
   @Rule(RuleType['string']().empty(''))
   'time': string = undefined;
+  @ApiProperty({ description: '跳转地址' })
+  @Rule(RuleType['string']().empty(''))
+  'route': string = undefined;
+  @ApiProperty({ description: '跳转类型' })
+  @Rule(RuleType['string']().empty(''))
+  'jump_type': string = undefined;
   @ApiProperty({ description: '内容' })
   @Rule(RuleType['string']().empty(''))
   'content': string = undefined;