Merge remote-tracking branch 'origin/master'

hzims-service/ticket/src/main/resources/db/2.0.0.sql

@@ -100,29 +100,35 @@ SET FOREIGN_KEY_CHECKS=1;
 
 
 -- auto-generated definition
+-- auto-generated definition
 create table hzims_ticket_count
 (
-    id                    bigint auto_increment comment '主键ID'
+    id                     bigint auto_increment comment '主键ID'
         primary key,
-    date_time             varchar(20)                          null comment '日期',
+    date_time              varchar(20)                          null comment '日期',
-    dept_id               bigint                               null comment '站点Id',
+    dept_id                bigint                               null comment '站点Id',
-    dept_name             varchar(100)                         null comment '站点名称',
+    dept_name              varchar(100)                         null comment '站点名称',
-    ticket_type           varchar(255)                         null comment '票据类型',
+    ticket_type            varchar(255)                         null comment '票据类型',
-    ticket_number         int                                  null comment '开票数量',
+    ticket_number          int                                  null comment '开票数量',
-    ticket_complete_num   int                                  null comment '完成数量',
+    ticket_complete_num    int                                  null comment '完成数量',
-    ticket_delay_num      int                                  null comment '延期数量',
+    ticket_delay_num       int                                  null comment '延期数量',
-    ticket_proportion_num int                                  null comment '合格数量',
+    ticket_proportion_num  int                                  null comment '合格数量',
-    create_time           datetime   default CURRENT_TIMESTAMP null comment '创建时间',
+    create_time            datetime   default CURRENT_TIMESTAMP null comment '创建时间',
-    update_time           datetime   default CURRENT_TIMESTAMP null on update CURRENT_TIMESTAMP comment '更新时间',
+    update_time            datetime   default CURRENT_TIMESTAMP null on update CURRENT_TIMESTAMP comment '更新时间',
-    is_deleted            tinyint(1) default 0                 null comment '逻辑删除',
+    is_deleted             tinyint(1) default 0                 null comment '逻辑删除',
-    tenant_id             varchar(12)                          null comment '租户ID',
+    tenant_id              varchar(12)                          null comment '租户ID',
-    create_dept           varchar(30)                          null comment '创建部门',
+    create_dept            varchar(30)                          null comment '创建部门',
-    status                tinyint                              null,
+    status                 tinyint                              null,
-    create_user           bigint                               not null comment '创建人',
+    create_user            bigint                               not null comment '创建人',
-    update_user           bigint                               null
+    update_user            bigint                               null,
+    invalidated_ticket_num int                                  null comment '废票数量',
+    wrong_ticket_num       int                                  null comment '错票数量',
+    percent_pass_ticket    varchar(50)                          null comment '合格率'
 )
     comment '两票统计分析' row_format = DYNAMIC;
 
+
+
 insert into hzims_work_ticket_finish(ticket_id, ground_num, brake_number)
 select ticket_id, ground_switch_count,ground_wire_code
 from hzims_work_ticket_flow;