From 77ab08e5fc74c1756841b4c535b28f46d95b16f3 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 13 九月 2024 16:28:44 +0800
Subject: [PATCH] 装机先检查设备是否存在

---
 sql/mysql/jh.sql |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/sql/mysql/jh.sql b/sql/mysql/jh.sql
index 06cc27a..6c5e132 100644
--- a/sql/mysql/jh.sql
+++ b/sql/mysql/jh.sql
@@ -141,15 +141,16 @@
 DROP TABLE IF EXISTS `dev_rent`;
 CREATE TABLE `dev_rent` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'id',
-  `dev_id` varchar(45) DEFAULT NULL COMMENT '璁惧缂栧彿',
   `pat_id` varchar(45) DEFAULT NULL COMMENT '鎮ｈ�呯紪鍙�',
   `pat_name` varchar(45) DEFAULT NULL COMMENT '鎮ｈ�呭悕绉�',
+  `dev_id` varchar(45) DEFAULT NULL COMMENT '璁惧缂栧彿',
   `rent_time` datetime DEFAULT NULL COMMENT '瑁呮満鏃堕棿',
   `return_time` datetime DEFAULT NULL COMMENT '鎷嗘満鏃堕棿',
   `interference` int DEFAULT NULL COMMENT '骞叉壈鏁�',
   `baseline` varchar(100) DEFAULT NULL COMMENT '鍩虹嚎绮�',
   `detachment` varchar(100) DEFAULT NULL COMMENT '鑴辩',
   `remark` varchar(100) DEFAULT NULL COMMENT '澶囨敞',
+  `cancelled` int DEFAULT '0' COMMENT '鏈畨瑁�',
   `tenant_id` int DEFAULT '1' COMMENT '绉熸埛缂栧彿',
   `creator` varchar(10) DEFAULT '' COMMENT '鍒涘缓鑰�',
   `create_time` datetime NOT NULL COMMENT '鍒涘缓鏃堕棿',
@@ -157,8 +158,8 @@
   `update_time` datetime NOT NULL COMMENT '鏇存柊鏃堕棿',
   `deleted` bit(1) DEFAULT b'0' COMMENT '鍒犻櫎鏍囪',
   PRIMARY KEY (`id`),
-  KEY `indx_pat_dev` (`dev_id`,`rent_time`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=52 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='瑁呮満鎷嗘満琛�';
+  KEY `indx_dev_rent` (`dev_id`,`rent_time`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='瑁呮満鎷嗘満琛�';
 
 -- ----------------------------
 -- Table structure for job_record
@@ -176,11 +177,15 @@
   `job_time` datetime DEFAULT NULL COMMENT '浣滀笟鏃堕棿',
   `summary` varchar(200) DEFAULT NULL COMMENT '浣滀笟姒傝',
   `remark` varchar(100) DEFAULT NULL COMMENT '澶囨敞',
+  `cancelled` int DEFAULT '0' COMMENT '鏈畨瑁�',
   `tenant_id` int DEFAULT '1' COMMENT '绉熸埛缂栧彿',
   `creator` varchar(10) DEFAULT '' COMMENT '鍒涘缓鑰�',
   `create_time` datetime NOT NULL COMMENT '鍒涘缓鏃堕棿',
   `updater` varchar(10) DEFAULT '' COMMENT '鏇存柊鑰�',
   `update_time` datetime NOT NULL COMMENT '鏇存柊鏃堕棿',
   `deleted` bit(1) DEFAULT b'0' COMMENT '鍒犻櫎鏍囪',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='宸ヤ綔璁板綍琛�';
+  PRIMARY KEY (`id`),
+  KEY `idx_pat_job` (`pat_id`,`job_time`,`job_type`),
+  KEY `idx_rent_id` (`rent_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='宸ヤ綔璁板綍琛�';
+

--
Gitblit v1.9.3