From afc83561b4da987b6a283b150ef1239bde730171 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期三, 07 八月 2024 16:21:43 +0800 Subject: [PATCH] 新增 预约 基本字段 OK --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java | 2 +- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java | 2 +- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentSaveReqVO.java | 2 +- sql/mysql/jh.sql | 7 +++---- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/appointment/AppointmentDO.java | 2 +- jh-server/pom.xml | 4 ++-- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java index b667458..17f2045 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java @@ -22,7 +22,7 @@ private String patName; @Schema(description = "鎮h�呮�у埆") - private Boolean patGender; + private Byte patGender; @Schema(description = "鎮h�呯敓鏃�") private LocalDateTime patBirthday; diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java index a3a545d..20735b9 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java @@ -25,7 +25,7 @@ @Schema(description = "鎮h�呮�у埆", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty(value = "鎮h�呮�у埆", converter = DictConvert.class) @DictFormat("system_user_sex") // TODO 浠g爜浼樺寲锛氬缓璁缃埌瀵瑰簲鐨� DictTypeConstants 鏋氫妇绫讳腑 - private Boolean patGender; + private Byte patGender; @Schema(description = "鎮h�呯敓鏃�") @ExcelProperty("鎮h�呯敓鏃�") diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentSaveReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentSaveReqVO.java index 93fbb6a..162612b 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentSaveReqVO.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentSaveReqVO.java @@ -23,7 +23,7 @@ @Schema(description = "鎮h�呮�у埆", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "鎮h�呮�у埆涓嶈兘涓虹┖") - private Boolean patGender; + private Byte patGender; @Schema(description = "鎮h�呯敓鏃�") private LocalDateTime patBirthday; diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/appointment/AppointmentDO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/appointment/AppointmentDO.java index 1506165..b86182b 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/appointment/AppointmentDO.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/appointment/AppointmentDO.java @@ -44,7 +44,7 @@ * * 鏋氫妇 {@link TODO system_user_sex 瀵瑰簲鐨勭被} */ - private Boolean patGender; + private Byte patGender; /** * 鎮h�呯敓鏃� */ diff --git a/jh-server/pom.xml b/jh-server/pom.xml index e2de31e..6a130b8 100644 --- a/jh-server/pom.xml +++ b/jh-server/pom.xml @@ -128,11 +128,11 @@ <artifactId>jh-spring-boot-starter-protection</artifactId> </dependency> -<!-- <dependency> + <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-devtools</artifactId> <scope>runtime</scope> - </dependency>--> + </dependency> </dependencies> diff --git a/sql/mysql/jh.sql b/sql/mysql/jh.sql index 7093b1c..5184016 100644 --- a/sql/mysql/jh.sql +++ b/sql/mysql/jh.sql @@ -10,7 +10,7 @@ `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', `pat_id` varchar(30) NOT NULL COMMENT '鎮h�呯紪鍙�', `pat_name` varchar(10) NOT NULL COMMENT '鎮h�呭鍚�', - `pat_gender` bit(1) NOT NULL COMMENT '鎮h�呮�у埆', + `pat_gender` tinyint(1) NOT NULL COMMENT '鎮h�呮�у埆', `pat_birthday` datetime DEFAULT NULL COMMENT '鎮h�呯敓鏃�', `pat_mobile` char(11) DEFAULT NULL COMMENT '鎮h�呮墜鏈�', `pat_phone` varchar(20) DEFAULT NULL COMMENT '鎮h�呯數璇�', @@ -32,10 +32,9 @@ `create_time` datetime NOT NULL COMMENT '鍒涘缓鏃堕棿', `updater` varchar(10) DEFAULT '' COMMENT '鏇存柊鑰�', `update_time` datetime NOT NULL COMMENT '鏇存柊鏃堕棿', - `deleted` bit(1) DEFAULT NULL COMMENT '鍒犻櫎鏍囪', + `deleted` bit(1) DEFAULT 0 COMMENT '鍒犻櫎鏍囪', `tenant_id` bigint NOT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `idx_book_id` (`book_id`) + PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='棰勭害琛�'; -- Gitblit v1.9.3