Merge remote-tracking branch 'origin/dev' into dev

Makefile

@@ -2,10 +2,10 @@ merge:
 	git checkout master;git merge dev;git push;git checkout dev;
 
 create-tag:
-	git checkout master;git tag v1.2.3;git push origin --tags;git checkout dev;
+	git checkout master;git tag v1.2.4;git push origin --tags;git checkout dev;
 
 remove-tag:
-	git tag -d v1.1.9;git push origin :refs/tags/v1.1.8;
+	git tag -d v1.2.0;git push origin :refs/tags/v1.1.8;
 
 gen-rsaprivatekey:
 	openssl genrsa -out rsaprivatekey.pem 1024

src/main/resources/sqlScript/20231218_sql.sql

@@ -488,7 +488,7 @@ CREATE TABLE textbook_claim_user
 ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '教材领取人员';
 
 -- ----------------------------
--- 教材入库
+-- 教材入库记录
 -- ----------------------------
 DROP TABLE IF EXISTS textbook_warehouse_record;
 CREATE TABLE textbook_warehouse_record
@@ -511,7 +511,7 @@ CREATE TABLE textbook_warehouse_record
     `warehouse_mode` varchar(20) NULL DEFAULT NULL COMMENT '入库方式(xjr_dictionary_item[warehouse_mode])',
     `remark` varchar(1000) COMMENT '备注',
     PRIMARY KEY (`id`)
-) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '教材入库';
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '教材入库记录';
 
 -- ----------------------------
 -- 教材出库记录
@@ -533,8 +533,6 @@ CREATE TABLE textbook_issue_record
     `remaining_number` int NULL DEFAULT NULL COMMENT '剩余数量',
     `receive_user_id` bigint NULL DEFAULT NULL COMMENT '领取用户编号',
     `issue_user_id` bigint NULL DEFAULT NULL COMMENT '出库用户编号',
-    `issue_mode` varchar(20) NULL DEFAULT NULL COMMENT '出库方式(xjr_dictionary_item[issue_mode])',
-    `remark` varchar(1000) COMMENT '备注',
     PRIMARY KEY (`id`)
 ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '教材出库记录';
 
@@ -735,6 +733,81 @@ CREATE TABLE room_bed_record_item
     PRIMARY KEY (`id`)
 ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '寝室床位记录项';
 
+-- ----------------------------
+-- 寝室申请
+-- ----------------------------
+DROP TABLE IF EXISTS wf_room_applicant;
+CREATE TABLE wf_room_applicant
+(
+    id BIGINT NOT NULL COMMENT '主键编号',
+    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
+    `create_date` datetime NULL DEFAULT NULL COMMENT '创建时间',
+    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
+    `modify_date` datetime NULL DEFAULT NULL COMMENT '修改时间',
+    `delete_mark` INT NOT NULL COMMENT '删除标记',
+    `enabled_mark` INT NOT NULL COMMENT '有效标志',
+    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
+    `applicant_user_id` bigint NULL DEFAULT NULL COMMENT '申请人',
+    `recede_type` varchar(20) NULL DEFAULT NULL COMMENT '寝室申请类型(xjr_dictionary_item[room_applicant_type])',
+    `class_name` varchar(200) NULL DEFAULT NULL COMMENT '班级名称',
+    `room_bed_number`  varchar(200) NULL DEFAULT NULL COMMENT '寝室+床位名称',
+    `start_time` date NULL DEFAULT NULL COMMENT '开始时间',
+    `nos_reason` varchar(20) NULL DEFAULT NULL COMMENT '离宿事由(xjr_dictionary_item[nos_reason])',
+    `remark` varchar(1000) COMMENT '备注',
+    `status` int not null default 0 COMMENT '状态（1:结束 0:未结束）',
+    PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '寝室申请';
+
+-- ----------------------------
+-- 寝室情况汇报
+-- ----------------------------
+DROP TABLE IF EXISTS wf_room_report;
+CREATE TABLE wf_room_report
+(
+    id BIGINT NOT NULL COMMENT '主键编号',
+    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
+    `create_date` datetime NULL DEFAULT NULL COMMENT '创建时间',
+    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
+    `modify_date` datetime NULL DEFAULT NULL COMMENT '修改时间',
+    `delete_mark` INT NOT NULL COMMENT '删除标记',
+    `enabled_mark` INT NOT NULL COMMENT '有效标志',
+    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
+    `applicant_user_id` bigint NULL DEFAULT NULL COMMENT '申请人',
+    `room_bed_number`  varchar(200) NULL DEFAULT NULL COMMENT '寝室+床位名称',
+    `remark` varchar(1000) COMMENT '备注',
+    `file_id` BIGINT NULL DEFAULT NULL COMMENT '附件文件id',
+    `status` int not null default 0 COMMENT '状态（1:结束 0:未结束）',
+    PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '寝室情况汇报';
+
+-- ----------------------------
+-- 留校住宿申请
+-- ----------------------------
+DROP TABLE IF EXISTS wf_room_stay_overnight;
+CREATE TABLE wf_room_stay_overnight
+(
+    id BIGINT NOT NULL COMMENT '主键编号',
+    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
+    `create_date` datetime NULL DEFAULT NULL COMMENT '创建时间',
+    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
+    `modify_date` datetime NULL DEFAULT NULL COMMENT '修改时间',
+    `delete_mark` INT NOT NULL COMMENT '删除标记',
+    `enabled_mark` INT NOT NULL COMMENT '有效标志',
+    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
+    `applicant_user_id` bigint NULL DEFAULT NULL COMMENT '申请人',
+    `room_bed_number`  varchar(200) NULL DEFAULT NULL COMMENT '寝室+床位名称',
+    `student_id` VARCHAR(30) NULL DEFAULT NULL COMMENT '学号',
+    `gender_name` VARCHAR(200) NULL DEFAULT NULL COMMENT '性别',
+    `class_name` VARCHAR(200) NULL DEFAULT NULL COMMENT '班级',
+    `start_time` DATE NULL DEFAULT NULL COMMENT '开始时间',
+    `end_time` DATE NULL DEFAULT NULL COMMENT '结束时间',
+    `duration` int NULL DEFAULT NULL COMMENT '时长（天）',
+    `mobile` VARCHAR(30) NULL DEFAULT NULL COMMENT '联系电话',
+    `guardian_mobile` VARCHAR(30) NULL DEFAULT NULL COMMENT '联系电话',
+    `remark` varchar(1000) COMMENT '备注',
+    `status` int not null default 0 COMMENT '状态（1:结束 0:未结束）',
+    PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '留校住宿申请';
 -- ------------------------------------------------------------------寝室管理--------------------------------------------------------------------