合并冲突解决：学生消息管理和招生就业模块更新
This commit is contained in:
李旭明 committed
commit
593aa01a70
132 files changed
+158752
-1005
No files matched your search
@@ -0,0 +1,100 @@
|
||||
-- 修复学院字段拼写问题
|
||||
-- 版本: 1.0.0
|
||||
-- 创建日期: 2025-07-13
|
||||
-- 描述: 检查并修复学院字段的拼写问题（college vs collage）
|
||||
|
||||
-- 第一步：检查字段情况
|
||||
SELECT
|
||||
COUNT(*) as college_name_count,
|
||||
(SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
|
||||
WHERE TABLE_NAME = 'zsjy_enrollment_info'
|
||||
AND COLUMN_NAME = 'collage_name'
|
||||
AND TABLE_SCHEMA = DATABASE()) as collage_name_count,
|
||||
(SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
|
||||
WHERE TABLE_NAME = 'zsjy_enrollment_info'
|
||||
AND COLUMN_NAME = 'college_id'
|
||||
AND TABLE_SCHEMA = DATABASE()) as college_id_count,
|
||||
(SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
|
||||
WHERE TABLE_NAME = 'zsjy_enrollment_info'
|
||||
AND COLUMN_NAME = 'collage_id'
|
||||
AND TABLE_SCHEMA = DATABASE()) as collage_id_count
|
||||
FROM INFORMATION_SCHEMA.COLUMNS
|
||||
WHERE TABLE_NAME = 'zsjy_enrollment_info'
|
||||
AND COLUMN_NAME = 'college_name'
|
||||
AND TABLE_SCHEMA = DATABASE();
|
||||
|
||||
-- 第二步：如果存在collage_name而不存在college_name，则重命名字段
|
||||
SET @rename_collage_name_sql = (
|
||||
SELECT IF(
|
||||
EXISTS(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS
|
||||
WHERE TABLE_NAME = 'zsjy_enrollment_info'
|
||||
AND COLUMN_NAME = 'collage_name'
|
||||
AND TABLE_SCHEMA = DATABASE())
|
||||
AND
|
||||
NOT EXISTS(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS
|
||||
WHERE TABLE_NAME = 'zsjy_enrollment_info'
|
||||
AND COLUMN_NAME = 'college_name'
|
||||
AND TABLE_SCHEMA = DATABASE()),
|
||||
'ALTER TABLE zsjy_enrollment_info CHANGE COLUMN collage_name college_name varchar(100) COMMENT \'学院名称\'',
|
||||
'SELECT \'无需修改collage_name字段\' AS message'
|
||||
)
|
||||
);
|
||||
|
||||
PREPARE stmt FROM @rename_collage_name_sql;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
-- 第三步：如果存在collage_id而不存在college_id，则重命名字段
|
||||
SET @rename_collage_id_sql = (
|
||||
SELECT IF(
|
||||
EXISTS(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS
|
||||
WHERE TABLE_NAME = 'zsjy_enrollment_info'
|
||||
AND COLUMN_NAME = 'collage_id'
|
||||
AND TABLE_SCHEMA = DATABASE())
|
||||
AND
|
||||
NOT EXISTS(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS
|
||||
WHERE TABLE_NAME = 'zsjy_enrollment_info'
|
||||
AND COLUMN_NAME = 'college_id'
|
||||
AND TABLE_SCHEMA = DATABASE()),
|
||||
'ALTER TABLE zsjy_enrollment_info CHANGE COLUMN collage_id college_id varchar(20) COMMENT \'学院代码\'',
|
||||
'SELECT \'无需修改collage_id字段\' AS message'
|
||||
)
|
||||
);
|
||||
|
||||
PREPARE stmt FROM @rename_collage_id_sql;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
-- 第四步：如果不存在college_name，则添加该字段
|
||||
SET @add_college_name_sql = (
|
||||
SELECT IF(
|
||||
NOT EXISTS(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS
|
||||
WHERE TABLE_NAME = 'zsjy_enrollment_info'
|
||||
AND COLUMN_NAME = 'college_name'
|
||||
AND TABLE_SCHEMA = DATABASE()),
|
||||
'ALTER TABLE zsjy_enrollment_info ADD COLUMN college_name varchar(100) COMMENT \'学院名称\'',
|
||||
'SELECT \'college_name字段已存在\' AS message'
|
||||
)
|
||||
);
|
||||
|
||||
PREPARE stmt FROM @add_college_name_sql;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
-- 第五步：如果不存在college_id，则添加该字段
|
||||
SET @add_college_id_sql = (
|
||||
SELECT IF(
|
||||
NOT EXISTS(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS
|
||||
WHERE TABLE_NAME = 'zsjy_enrollment_info'
|
||||
AND COLUMN_NAME = 'college_id'
|
||||
AND TABLE_SCHEMA = DATABASE()),
|
||||
'ALTER TABLE zsjy_enrollment_info ADD COLUMN college_id varchar(20) COMMENT \'学院代码\'',
|
||||
'SELECT \'college_id字段已存在\' AS message'
|
||||
)
|
||||
);
|
||||
|
||||
PREPARE stmt FROM @add_college_id_sql;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
SELECT '学院字段拼写修复完成!' AS result;
|
||||
@@ -0,0 +1,78 @@
|
||||
-- 修复招生报名信息表中的学院相关字段
|
||||
-- 版本: 1.0.0
|
||||
-- 创建日期: 2025-07-25
|
||||
-- 描述: 检查并添加学院名称和学院代码字段
|
||||
|
||||
-- 检查college_name字段是否存在，如果不存在则添加
|
||||
SET @check_college_name = (
|
||||
SELECT COUNT(*)
|
||||
FROM INFORMATION_SCHEMA.COLUMNS
|
||||
WHERE TABLE_NAME = 'zsjy_enrollment_info'
|
||||
AND COLUMN_NAME = 'college_name'
|
||||
AND TABLE_SCHEMA = DATABASE()
|
||||
);
|
||||
|
||||
SET @alter_college_name = IF(@check_college_name = 0,
|
||||
'ALTER TABLE zsjy_enrollment_info ADD COLUMN college_name varchar(100) COMMENT \'学院名称\'',
|
||||
'SELECT \'college_name字段已存在，无需添加\' AS message');
|
||||
|
||||
PREPARE stmt FROM @alter_college_name;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
-- 检查college_id字段是否存在，如果不存在则添加
|
||||
SET @check_college_id = (
|
||||
SELECT COUNT(*)
|
||||
FROM INFORMATION_SCHEMA.COLUMNS
|
||||
WHERE TABLE_NAME = 'zsjy_enrollment_info'
|
||||
AND COLUMN_NAME = 'college_id'
|
||||
AND TABLE_SCHEMA = DATABASE()
|
||||
);
|
||||
|
||||
SET @alter_college_id = IF(@check_college_id = 0,
|
||||
'ALTER TABLE zsjy_enrollment_info ADD COLUMN college_id varchar(20) COMMENT \'学院代码\'',
|
||||
'SELECT \'college_id字段已存在，无需添加\' AS message');
|
||||
|
||||
PREPARE stmt FROM @alter_college_id;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
-- 检查数据字典是否存在
|
||||
SET @dict_exists = (
|
||||
SELECT COUNT(*)
|
||||
FROM sys_dict_type
|
||||
WHERE dict_type = 'zsjy_college'
|
||||
);
|
||||
|
||||
-- 如果不存在则添加字典类型
|
||||
SET @insert_dict_type = IF(@dict_exists = 0,
|
||||
'INSERT INTO sys_dict_type(dict_name, dict_type, status, create_by, create_time, update_by, update_time, remark) VALUES (\'学院列表\', \'zsjy_college\', \'0\', \'1\', NOW(), \'1\', NOW(), \'招生系统学院列表\')',
|
||||
'SELECT \'zsjy_college字典类型已存在，无需添加\' AS message');
|
||||
|
||||
PREPARE stmt FROM @insert_dict_type;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
-- 检查字典数据是否存在
|
||||
SET @dict_data_exists = (
|
||||
SELECT COUNT(*)
|
||||
FROM sys_dict_data
|
||||
WHERE dict_type = 'zsjy_college'
|
||||
);
|
||||
|
||||
-- 如果不存在则添加示例字典数据
|
||||
SET @insert_dict_data = IF(@dict_data_exists = 0,
|
||||
'INSERT INTO sys_dict_data(dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark)
|
||||
VALUES
|
||||
(1, \'机电工程学院\', \'JDGC\', \'zsjy_college\', null, \'default\', \'Y\', \'0\', \'1\', NOW(), \'1\', NOW(), null),
|
||||
(2, \'信息工程学院\', \'XXGC\', \'zsjy_college\', null, \'default\', \'N\', \'0\', \'1\', NOW(), \'1\', NOW(), null),
|
||||
(3, \'艺术设计学院\', \'YSSJ\', \'zsjy_college\', null, \'default\', \'N\', \'0\', \'1\', NOW(), \'1\', NOW(), null),
|
||||
(4, \'经济管理学院\', \'JJGL\', \'zsjy_college\', null, \'default\', \'N\', \'0\', \'1\', NOW(), \'1\', NOW(), null),
|
||||
(5, \'医药健康学院\', \'YYJK\', \'zsjy_college\', null, \'default\', \'N\', \'0\', \'1\', NOW(), \'1\', NOW(), null)',
|
||||
'SELECT \'zsjy_college字典数据已存在，无需添加\' AS message');
|
||||
|
||||
PREPARE stmt FROM @insert_dict_data;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
SELECT '招生报名信息表字段修复完成!' AS result;
|
||||
Reference in new issue
Block a user