Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/db/menu/init_tour_menu.sql

src/main/resources/db/menu/init_tour_menu.sql

@@ -99,6 +99,12 @@ FROM sys_menu p
 WHERE p.permission = 'tour'
   AND NOT EXISTS (SELECT 1 FROM (SELECT id FROM sys_menu WHERE permission = 'tour.group') t);
 
+INSERT INTO sys_menu (id, parentId, path, name, aliasName, type, href, target, icon, showit, disabled, permission, note, location, hasChildren, createdBy, createdAt, updatedBy, updatedAt, delFlag, platform, moduleId, picIcon, initialPinyinName, isRecommendApp, isRecommendService)
+SELECT 'b7c63f0c73a44a9a8c4f3d3bb1a10013', p.id, CONCAT(p.path, '0012'), '领办线路', 'Tour Undertake', 'menu', '/platform/tour/undertake', 'data-pjax', '', 1, 0, 'tour.undertake', NULL, 12, 0, '', UNIX_TIMESTAMP(NOW()) * 1000, '', UNIX_TIMESTAMP(NOW()) * 1000, 0, 'PC', NULL, NULL, 'l', 0, 0
+FROM sys_menu p
+WHERE p.permission = 'tour'
+  AND NOT EXISTS (SELECT 1 FROM (SELECT id FROM sys_menu WHERE permission = 'tour.undertake') t);
+
 -- 给系统管理员默认授权，其他角色可在角色管理中按需分配。
 INSERT INTO sys_role_menu (roleId, menuId)
 SELECT r.id, m.id
@@ -111,6 +117,7 @@ JOIN sys_menu m ON m.permission IN (
     'tour.matter',
     'tour.signup',
     'tour.group',
+    'tour.undertake',
     'tour.mysignup',
     'tour.unionledger',
     'tour.unionApproval',
@@ -121,6 +128,17 @@ LEFT JOIN sys_role_menu rm ON rm.roleId = r.id AND rm.menuId = m.id
 WHERE r.code = 'SYSADMIN'
   AND rm.roleId IS NULL;
 
+INSERT INTO sys_role_menu (roleId, menuId)
+SELECT r.id, m.id
+FROM sys_role r
+JOIN sys_menu m ON m.permission IN (
+    'tour',
+    'tour.undertake'
+)
+LEFT JOIN sys_role_menu rm ON rm.roleId = r.id AND rm.menuId = m.id
+WHERE r.code = 'BRANCH_UNION_CHAIRMAN'
+  AND rm.roleId IS NULL;
+
 -- 普惠疗休养移动端菜单。
 -- 手机端接口使用 h5. 前缀权限，保留 PC 权限的同时支持单独分配 H5 角色。
 INSERT INTO sys_menu (id, parentId, path, name, aliasName, type, href, target, icon, showit, disabled, permission, note, location, hasChildren, createdBy, createdAt, updatedBy, updatedAt, delFlag, platform, moduleId, picIcon, initialPinyinName, isRecommendApp, isRecommendService)

src/main/resources/db/tour_ledger_add_mobile.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `tour_ledger`
+  ADD COLUMN `mobile` varchar(30) DEFAULT NULL COMMENT '手机号' AFTER `idCard`;

src/main/resources/db/tour_matter_add_undertake_status.sql

@@ -0,0 +1,6 @@
+ALTER TABLE `tour_matter`
+  ADD COLUMN `undertakeStatus` varchar(20) DEFAULT 'unclaimed' COMMENT '领办状态 claimed已领 unclaimed未领' AFTER `unionId`;
+
+UPDATE `tour_matter`
+SET `undertakeStatus` = 'unclaimed'
+WHERE `undertakeStatus` IS NULL OR `undertakeStatus` = '';

src/main/resources/db/tour_matter_create.sql

@@ -7,6 +7,7 @@ CREATE TABLE IF NOT EXISTS `tour_matter` (
   `creatorUserId` varchar(32) DEFAULT NULL COMMENT '创建人ID',
   `creatorName` varchar(100) DEFAULT NULL COMMENT '创建人',
   `unionId` varchar(32) DEFAULT NULL COMMENT '所属工会ID',
+  `undertakeStatus` varchar(20) DEFAULT 'unclaimed' COMMENT '领办状态 claimed已领 unclaimed未领',
   `organizationType` varchar(100) DEFAULT NULL COMMENT '组织形式',
   `mobileThumb` varchar(500) DEFAULT NULL COMMENT '移动端缩略图',
   `enabled` tinyint(1) DEFAULT 1 COMMENT '事项状态',

src/main/resources/db/tour_setting_add_signup_time.sql

@@ -0,0 +1,4 @@
+-- 疗休养配置增加全局报名时间字段。
+ALTER TABLE `tour_setting`
+  ADD COLUMN `signupStartTime` varchar(20) DEFAULT NULL COMMENT '报名开始时间' AFTER `maxGroupPeople`,
+  ADD COLUMN `signupEndTime` varchar(20) DEFAULT NULL COMMENT '报名结束时间' AFTER `signupStartTime`;

src/main/resources/db/tour_setting_create.sql

@@ -9,6 +9,8 @@ CREATE TABLE IF NOT EXISTS `tour_setting` (
   `sortNo` int DEFAULT NULL COMMENT '排序编号',
   `minGroupPeople` int DEFAULT NULL COMMENT '最少成团人数',
   `maxGroupPeople` int DEFAULT NULL COMMENT '最多成团人数',
+  `signupStartTime` varchar(20) DEFAULT NULL COMMENT '报名开始时间',
+  `signupEndTime` varchar(20) DEFAULT NULL COMMENT '报名结束时间',
   `outProvinceYears` int DEFAULT NULL COMMENT '省外几年去一次',
   `outProvinceRatio` decimal(10,2) DEFAULT NULL COMMENT '省外人数占比',
   `outProvinceRatioType` varchar(50) DEFAULT '当年报名人数' COMMENT '省外人数占比类型',
@@ -116,6 +118,7 @@ CREATE TABLE IF NOT EXISTS `tour_matter` (
   `creatorUserId` varchar(32) DEFAULT NULL COMMENT '创建人ID',
   `creatorName` varchar(100) DEFAULT NULL COMMENT '创建人',
   `unionId` varchar(32) DEFAULT NULL COMMENT '所属工会ID',
+  `undertakeStatus` varchar(20) DEFAULT 'unclaimed' COMMENT '领办状态 claimed已领 unclaimed未领',
   `organizationType` varchar(100) DEFAULT NULL COMMENT '组织形式',
   `mobileThumb` varchar(500) DEFAULT NULL COMMENT '移动端缩略图',
   `enabled` tinyint(1) DEFAULT 1 COMMENT '事项状态',

src/main/resources/db/tour_undertake_menu.sql

@@ -0,0 +1,16 @@
+INSERT INTO sys_menu (id, parentId, path, name, aliasName, type, href, target, icon, showit, disabled, permission, note, location, hasChildren, createdBy, createdAt, updatedBy, updatedAt, delFlag, platform, moduleId, picIcon, initialPinyinName, isRecommendApp, isRecommendService)
+SELECT 'b7c63f0c73a44a9a8c4f3d3bb1a10013', p.id, CONCAT(p.path, '0012'), '领办线路', 'Tour Undertake', 'menu', '/platform/tour/undertake', 'data-pjax', '', 1, 0, 'tour.undertake', NULL, 12, 0, '', UNIX_TIMESTAMP(NOW()) * 1000, '', UNIX_TIMESTAMP(NOW()) * 1000, 0, 'PC', NULL, NULL, 'l', 0, 0
+FROM sys_menu p
+WHERE p.permission = 'tour'
+  AND NOT EXISTS (SELECT 1 FROM (SELECT id FROM sys_menu WHERE permission = 'tour.undertake') t);
+
+INSERT INTO sys_role_menu (roleId, menuId)
+SELECT r.id, m.id
+FROM sys_role r
+JOIN sys_menu m ON m.permission IN (
+    'tour',
+    'tour.undertake'
+)
+LEFT JOIN sys_role_menu rm ON rm.roleId = r.id AND rm.menuId = m.id
+WHERE r.code IN ('SYSADMIN', 'BRANCH_UNION_CHAIRMAN')
+  AND rm.roleId IS NULL;