From ab8aa79143f7337c4d33d8c4eaa52b59c569412a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E9=A3=9E=E5=AE=87?= <2684146481@qq.com> Date: Wed, 2 Aug 2023 11:42:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=84=9A=E6=9C=AC=E8=B7=9F=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzims/operational/config/vo/PointDataVo.java | 2 ++ .../ticket/src/main/resources/db/2.0.0.sql | 28 ++++++++++++++++++++++ .../ticket/src/main/resources/db/2.0.1.sql | 3 --- .../ticket/src/main/resources/db/2.0.2.sql | 1 - .../ticket/src/main/resources/db/2.0.3.sql | 18 -------------- .../ticket/src/main/resources/db/2.0.4.sql | 2 -- 6 files changed, 30 insertions(+), 24 deletions(-) delete mode 100644 hzims-service/ticket/src/main/resources/db/2.0.1.sql delete mode 100644 hzims-service/ticket/src/main/resources/db/2.0.2.sql delete mode 100644 hzims-service/ticket/src/main/resources/db/2.0.3.sql delete mode 100644 hzims-service/ticket/src/main/resources/db/2.0.4.sql diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/vo/PointDataVo.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/vo/PointDataVo.java index 444da82..8a6388c 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/vo/PointDataVo.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/vo/PointDataVo.java @@ -42,4 +42,6 @@ public class PointDataVo { @JsonInclude(JsonInclude.Include.NON_EMPTY) private String signage; + private String name; + } diff --git a/hzims-service/ticket/src/main/resources/db/2.0.0.sql b/hzims-service/ticket/src/main/resources/db/2.0.0.sql index cc3d285..48a3b58 100644 --- a/hzims-service/ticket/src/main/resources/db/2.0.0.sql +++ b/hzims-service/ticket/src/main/resources/db/2.0.0.sql @@ -22,3 +22,31 @@ create table hzims_ticket_count ) 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; + + +alter table hzims_ticket_count add invalidated_ticket_num int null comment '废票数量'; + +# 工作票更新 +update hzims_work_ticket_info set flow_task_name = '签发' where status = 1; +update hzims_work_ticket_info set flow_task_name = '收到工作票' where status = 2; +update hzims_work_ticket_info set flow_task_name = '许可人许可' where status = 3; +update hzims_work_ticket_info set flow_task_name = '确认条件具备' where status = 4; +update hzims_work_ticket_info set flow_task_name = '工作负责人确认工作' where status = 5; +update hzims_work_ticket_info set flow_task_name = '许可人确认工作结束' where status = 6; +update hzims_work_ticket_info set flow_task_name = '工作票终结' where status = 7; +update hzims_work_ticket_info set flow_task_name = '许可人延期确认' where status = 9; +update hzims_work_ticket_info set flow_task_name = '负责人延期确认' where status = 10; +update hzims_work_ticket_info set flow_task_name = '作废' where status = 11; +update hzims_work_ticket_info set flow_task_name = '逾期' where status = 12; +# 操作票更新 +update hzims_standard_ticket_info set flow_task_name = '待监护人确认' where status = 1; +update hzims_standard_ticket_info set flow_task_name = '待值班负责人确认' where status = 2; +update hzims_standard_ticket_info set flow_task_name = '结束' where status = 3; +update hzims_standard_ticket_info set flow_task_name = '终止' where status = 4; + + +alter table hzims_ticket_count add wrong_ticket_num int null comment '错票数量'; +alter table hzims_ticket_count add percent_pass_ticket varchar(50) null comment '合格率'; diff --git a/hzims-service/ticket/src/main/resources/db/2.0.1.sql b/hzims-service/ticket/src/main/resources/db/2.0.1.sql deleted file mode 100644 index b4ff7d9..0000000 --- a/hzims-service/ticket/src/main/resources/db/2.0.1.sql +++ /dev/null @@ -1,3 +0,0 @@ -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; \ No newline at end of file diff --git a/hzims-service/ticket/src/main/resources/db/2.0.2.sql b/hzims-service/ticket/src/main/resources/db/2.0.2.sql deleted file mode 100644 index 85fa2b4..0000000 --- a/hzims-service/ticket/src/main/resources/db/2.0.2.sql +++ /dev/null @@ -1 +0,0 @@ -alter table hzims_ticket_count add invalidated_ticket_num int null comment '废票数量'; diff --git a/hzims-service/ticket/src/main/resources/db/2.0.3.sql b/hzims-service/ticket/src/main/resources/db/2.0.3.sql deleted file mode 100644 index 8f9af75..0000000 --- a/hzims-service/ticket/src/main/resources/db/2.0.3.sql +++ /dev/null @@ -1,18 +0,0 @@ -# 工作票更新 -update hzims_work_ticket_info set flow_task_name = '签发' where status = 1; -update hzims_work_ticket_info set flow_task_name = '收到工作票' where status = 2; -update hzims_work_ticket_info set flow_task_name = '许可人许可' where status = 3; -update hzims_work_ticket_info set flow_task_name = '确认条件具备' where status = 4; -update hzims_work_ticket_info set flow_task_name = '工作负责人确认工作' where status = 5; -update hzims_work_ticket_info set flow_task_name = '许可人确认工作结束' where status = 6; -update hzims_work_ticket_info set flow_task_name = '工作票终结' where status = 7; -update hzims_work_ticket_info set flow_task_name = '许可人延期确认' where status = 9; -update hzims_work_ticket_info set flow_task_name = '负责人延期确认' where status = 10; -update hzims_work_ticket_info set flow_task_name = '作废' where status = 11; -update hzims_work_ticket_info set flow_task_name = '逾期' where status = 12; -# 操作票更新 -update hzims_standard_ticket_info set flow_task_name = '待监护人确认' where status = 1; -update hzims_standard_ticket_info set flow_task_name = '待值班负责人确认' where status = 2; -update hzims_standard_ticket_info set flow_task_name = '结束' where status = 3; -update hzims_standard_ticket_info set flow_task_name = '终止' where status = 4; - diff --git a/hzims-service/ticket/src/main/resources/db/2.0.4.sql b/hzims-service/ticket/src/main/resources/db/2.0.4.sql deleted file mode 100644 index 58fafc0..0000000 --- a/hzims-service/ticket/src/main/resources/db/2.0.4.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hzims_ticket_count add wrong_ticket_num int null comment '错票数量'; -alter table hzims_ticket_count add percent_pass_ticket varchar(50) null comment '合格率'; \ No newline at end of file