feat: v3版疗休养优化9

src/main/resources/db/v4_from_v3/clear_inclusive_therapy_v3_menus.sql

@@ -1,4 +1,4 @@
--- 仅清理普惠疗休养V3菜单及角色菜单关联，保留职工权益模块和业务数据。
+-- 仅清理普惠疗休养菜单及角色菜单关联，保留职工权益模块和业务数据。
 START TRANSACTION;
 
 DELETE rm FROM sys_role_menu rm

src/main/resources/db/v4_from_v3/export_inclusive_therapy_v3.py

@@ -155,7 +155,7 @@ def main():
     output = args.output.resolve()
     if output.exists():
         raise ValueError("导出文件已存在，不覆盖：" + str(output))
-    log("开始导出普惠疗休养V3；源数据库：" + args.database)
+    log("开始导出普惠疗休养；源数据库：" + args.database)
     log("[1/4] 连接数据库并检查源表结构")
     client = MySQL(args)
     tables = {suffix: "the_rapy_recuperation_" + suffix for suffix in SUFFIXES}

src/main/resources/db/v4_from_v3/import_inclusive_therapy_v3.py

@@ -145,7 +145,7 @@ class IdentityMap:
 
 
 def default_config(row):
-    permitted = {"id": None, "configName": {"智慧工会疗休养配置", "普惠疗休养V3配置"},
+    permitted = {"id": None, "configName": {"智慧工会疗休养配置", "普惠疗休养配置"},
                  "isSnLine": {"0"}, "isSwLine": {"0"}, "travelAudit": {"0"}, "bedInfo": {"1"},
                  "familyInfo": {"1"}, "outsideQuotaProportion": {"0", "0.00", "0.0"},
                  "unionLineNumberConfigs": {"[]"}, "lots": {"[]"}}
@@ -271,7 +271,7 @@ def main():
     parser.add_argument("--minio-region", default=os.environ.get("MINIO_REGION", "us-east-1"))
     parser.add_argument("--mapping", type=Path)
     args = parser.parse_args()
-    log("开始导入普惠疗休养V3；目标数据库：" + args.database)
+    log("开始导入普惠疗休养；目标数据库：" + args.database)
     log("[1/5] 读取导出包并校验数据：" + str(args.input))
     overrides = json.loads(args.mapping.read_text(encoding="utf-8-sig")) if args.mapping else {}
     uploaded_location = None
@@ -415,7 +415,7 @@ def main():
             for row in source:
                 user = get(row, "userId")
                 prepared["activity_user_scope"].append({
-                    "groupId": new_group, "groupName": "普惠疗休养V3 / " + (get(row, "groupName") or "参加人员"),
+                    "groupId": new_group, "groupName": "普惠疗休养 / " + (get(row, "groupName") or "参加人员"),
                     "userId": identities["user"].resolve(user, "user") if user else "",
                     "groupType": "1", "groupSql": None,
                     "creator": identities["user"].resolve(get(row, "creator"), "user", required=False), "delFlag": "0"})
@@ -478,7 +478,7 @@ def main():
                            ",".join(literal(value) for value in row.values()) + ");")
         sql.append("UPDATE sys_config SET configValue=" + literal(version) + " WHERE configKey='staffTherapyRecuperationVersion';")
         sql.append("INSERT INTO sys_config(configKey,configValue,note,delFlag) SELECT 'staffTherapyRecuperationVersion'," +
-                   literal(version) + "," + literal("普惠疗休养V3报名规则版本") + ",0 WHERE NOT EXISTS "
+                   literal(version) + "," + literal("普惠疗休养报名规则版本") + ",0 WHERE NOT EXISTS "
                    "(SELECT 1 FROM sys_config WHERE configKey='staffTherapyRecuperationVersion');")
         sql.append("COMMIT;")
         log("[5/5] 开始数据库事务，写入 %s 条记录；数据量较大时请等待事务提交" %
@@ -492,7 +492,7 @@ def main():
                 print("已上传附件保留在 MinIO 前缀：" + uploaded_location, file=sys.stderr)
             raise
     log("数据库事务提交成功")
-    log("导入完成：普惠疗休养V3，表前缀 " + PREFIX)
+    log("导入完成：普惠疗休养，表前缀 " + PREFIX)
     log("业务记录：%s；审核记录：%s；附件：%s" %
         (sum(len(records[name]) for name in SUFFIXES), len(records["_audit"]), len(file_info)))
     if uploaded_location:

src/main/resources/db/v4_from_v3/init_staff_therapy_menus_roles.sql

@@ -1,14 +1,14 @@
--- 普惠疗休养V3：父菜单及12个子菜单，归属已有的职工权益模块。
+-- 普惠疗休养：PC父菜单及12个子菜单、移动端入口，归属职工权益模块。
 -- 角色菜单关系暂时只授予本项目超级管理员角色 SYSADMIN。
 SET NAMES utf8mb4;
 
 START TRANSACTION;
 
--- 普惠疗休养V3
+-- 普惠疗休养
 INSERT INTO sys_menu (id, parentId, path, name, type, href, target, icon, showit, disabled, permission, location, hasChildren, platform, moduleId, createdBy, createdAt, updatedBy, updatedAt, delFlag)
 SELECT '7ea90000000000000000000000000000', '',
     (SELECT LPAD(COALESCE(MAX(CAST(path AS UNSIGNED)),0)+1,4,'0') FROM sys_menu WHERE CHAR_LENGTH(path)=4),
-    '普惠疗休养V3', 'menu', '/platform/inclusiveTherapyV3', '_self', 'fa fa-heart', 1, 0,
+    '普惠疗休养', 'menu', '/platform/inclusiveTherapyV3', '_self', 'fa fa-heart', 1, 0,
     'inclusiveTherapyV3', 50, 1, 'pc', id, '', UNIX_TIMESTAMP(NOW())*1000, '', UNIX_TIMESTAMP(NOW())*1000, 0
 FROM sys_module WHERE name='职工权益' AND platform='pc' LIMIT 1;
 
@@ -115,4 +115,41 @@ WHERE r.code='SYSADMIN' AND r.disabled=0 AND COALESCE(r.delFlag,0)=0
     'inclusiveTherapyV3.unionLineNumberStatistics',
     'inclusiveTherapyV3.travelAgencyMonthlyStatistics');
 
+
+INSERT INTO sys_menu (id, parentId, path, name, aliasName, type, href, target, icon, showit, disabled, permission, note,
+                      location, hasChildren, createdBy, createdAt, updatedBy, updatedAt, delFlag, processKey, platform,
+                      moduleId, isQuickEntry, picIcon, initialPinyinName, isRecommendApp, isRecommendService)
+VALUES ('e08d3515ed2f4ce28591f30703b68f1a', '', '0179', '普惠疗休养', null, 'menu', null, null, null, true, false,
+        'inclusiveTherapyV3.mobile', null, 1025, true, '17a7f8ad3ee947b4a26175049a9c253d', 1793064184942,
+        '17a7f8ad3ee947b4a26175049a9c253d', 1793064184942, false, null, 'H5', '586fffaeddc94a7493c81b6d69e546ab', false,
+        '/platform/sys/file/download?id=5j67fh5qaij5mr4p3q91peu46r', 'p', false, false);
+INSERT INTO sys_menu (id, parentId, path, name, aliasName, type, href, target, icon, showit, disabled, permission, note,
+                      location, hasChildren, createdBy, createdAt, updatedBy, updatedAt, delFlag, processKey, platform,
+                      moduleId, isQuickEntry, picIcon, initialPinyinName, isRecommendApp, isRecommendService)
+VALUES ('a57fbc8998d04acdb9d694841e1d572c', 'e08d3515ed2f4ce28591f30703b68f1a', '01790001', '疗休养报名', null, 'menu',
+        '/platform/inclusiveTherapyV3/mobile/index', null, null, true, false, 'inclusiveTherapyV3.mobile.signup', null,
+        1026, false, '17a7f8ad3ee947b4a26175049a9c253d', 1793064222219, '17a7f8ad3ee947b4a26175049a9c253d',
+        1793064310249, false, null, 'H5', '586fffaeddc94a7493c81b6d69e546ab', false,
+        '/platform/sys/file/download?id=6llemukl0ugaeqdgh7ud7g31ll', 'l', false, false);
+INSERT INTO sys_menu (id, parentId, path, name, aliasName, type, href, target, icon, showit, disabled, permission, note,
+                      location, hasChildren, createdBy, createdAt, updatedBy, updatedAt, delFlag, processKey, platform,
+                      moduleId, isQuickEntry, picIcon, initialPinyinName, isRecommendApp, isRecommendService)
+VALUES ('30f0cfd45c60406aaea5b44da88f828a', 'e08d3515ed2f4ce28591f30703b68f1a', '01790002', '我的报名', null, 'menu',
+        '/platform/inclusiveTherapyV3/mobile/myRecuperation', null, null, true, false,
+        'inclusiveTherapyV3.mobile.mySignup', null, 1027, false, '17a7f8ad3ee947b4a26175049a9c253d', 1793064293963,
+        '17a7f8ad3ee947b4a26175049a9c253d', 1793064317183, false, null, 'H5', '586fffaeddc94a7493c81b6d69e546ab', false,
+        '/platform/sys/file/download?id=v9phasf6roh33ocmnej2h2qbj1', 'w', false, false);
+
+-- 移动端三个菜单授予超级管理员角色。
+INSERT INTO sys_role_menu (roleId, menuId)
+SELECT r.id, m.id FROM sys_role r CROSS JOIN sys_menu m
+WHERE r.code IN ('SYSADMIN', 'superadmin') AND r.disabled=0 AND COALESCE(r.delFlag,0)=0
+  AND m.platform='H5'
+  AND m.id IN (
+    'e08d3515ed2f4ce28591f30703b68f1a',
+    'a57fbc8998d04acdb9d694841e1d572c',
+    '30f0cfd45c60406aaea5b44da88f828a')
+  AND NOT EXISTS (
+    SELECT 1 FROM sys_role_menu rm WHERE rm.roleId=r.id AND rm.menuId=m.id);
+
 COMMIT;

src/main/resources/db/v4_from_v3/init_staff_therapy_recuperation.sql

@@ -1,4 +1,4 @@
--- v4 职工福利 / 普惠疗休养V3独立子模块初始化脚本（MySQL 8）。
+-- v4 职工福利 / 普惠疗休养独立子模块初始化脚本（MySQL 8）。
 -- 在 v4 目标数据库中执行；表结构依据 therapyRecuperation 模块实体定义。
 -- v3 the_rapy_recuperation_* 对应本模块 inclusive_therapy_v3_*，不覆盖 v4 其他疗休养表。
 -- 仅新增表、视图和默认配置，不迁移 v3 历史业务数据。
@@ -353,12 +353,12 @@ SELECT 2750,'审核通过','#67c23a'
 WHERE NOT EXISTS (SELECT 1 FROM `inclusive_therapy_v3_audit_state` WHERE `stateId`=2750);
 
 INSERT INTO `sys_config` (`configKey`,`configValue`,`note`,`createdBy`,`createdAt`,`updatedBy`,`updatedAt`,`delFlag`)
-SELECT 'staffTherapyRecuperationVersion','zjnu','普惠疗休养V3独立子模块报名规则版本','',@inclusive_therapy_v3_now,'',@inclusive_therapy_v3_now,0
+SELECT 'staffTherapyRecuperationVersion','zjnu','普惠疗休养独立子模块报名规则版本','',@inclusive_therapy_v3_now,'',@inclusive_therapy_v3_now,0
 WHERE NOT EXISTS (SELECT 1 FROM `sys_config` WHERE `configKey`='staffTherapyRecuperationVersion');
 
 INSERT INTO `inclusive_therapy_v3_config`
     (`id`,`configName`,`isSnLine`,`isSwLine`,`travelAudit`,`bedInfo`,`familyInfo`,`outsideQuotaProportion`,`unionLineNumberConfigs`)
-SELECT REPLACE(UUID(),'-',''),'普惠疗休养V3配置',0,0,0,1,1,0,JSON_ARRAY()
+SELECT REPLACE(UUID(),'-',''),'普惠疗休养配置',0,0,0,1,1,0,JSON_ARRAY()
 WHERE NOT EXISTS (SELECT 1 FROM `inclusive_therapy_v3_config`);
 
 COMMIT;