diff --git a/doc/庄锐波-工作周报.md b/doc/庄锐波-工作周报.md index 4f001298..e6ee05e8 100644 --- a/doc/庄锐波-工作周报.md +++ b/doc/庄锐波-工作周报.md @@ -183,4 +183,30 @@ │ ├── [❌]送码入企 │ ├── [❌]送码入企查询 ``` -* 可能需要分部分时间处理计划，预约，任务，预告的bug和网络策略通后进行部署方面的工作,上边的迁移工作时间可能会延长. \ No newline at end of file +* 可能需要分部分时间处理计划，预约，任务，预告的bug和网络策略通后进行部署方面的工作,上边的迁移工作时间可能会延长. + +## 时间：2026-06-08 至 2026-06-14 + +**本周工作：** +* 迁移一期中的以下功能,预计时间需要2周左右 +```text + 执法监督码 + ├── [❌]统计查询 + │ ├── [❌]行政执法 + │ │ ├── [❌]涉企执法情况 + │ │ ├── [❌]企业受检次数 + │ │ ├── [❌]企业信息情况 + │ │ ├── [❌]执法单位情况 + │ │ ├── [❌]执法投诉情况 + │ │ ├── [❌]检查计划情况 + │ ├── [❌]非行政执法 + │ │ ├── [❌]非行政执法 + ├── [✅]工作报表 + │ │ ├── [✅]执法分析 + ├── [✅]综合管理 + │ ├── [✅]送码入企 + │ ├── [✅]送码入企查询 +``` +* 可能需要分部分时间处理计划，预约，任务，预告的bug和网络策略通后进行部署方面的工作,上边的迁移工作时间可能会延长. + +**下周工作：** \ No newline at end of file diff --git a/script/sql/zfjd-refactoring-v1/005-2-重新整理二期菜单结构.sql b/script/sql/zfjd-refactoring-v1/005-2-重新整理二期菜单结构.sql index 1b683bec..9e5c7902 100644 --- a/script/sql/zfjd-refactoring-v1/005-2-重新整理二期菜单结构.sql +++ b/script/sql/zfjd-refactoring-v1/005-2-重新整理二期菜单结构.sql @@ -7,17 +7,15 @@ -- 删除菜单类型为authService的记录 DELETE FROM sys_menu WHERE system_code = 'authService'; - - -- ============================================= -- 一级目录 (parent_id = 0, menu_type = 'M') -- ============================================= INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (10, '系统设置', 0, 1, 'system-setting', null, '', 1, 0, '#', '', 'M', '0', '0', '', 'system', 103, 1, '2026-03-31 20:14:46', null, null, '系统设置目录', 'authService', null); INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (20, '机构与权限管理', 0, 2, 'org-permission', null, '', 1, 0, '#', '', 'M', '0', '0', '', 'peoples', 103, 1, '2026-03-31 20:14:46', null, null, '机构与权限管理目录', 'authService', null); -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (30, '日志管理', 0, 3, 'log', null, '', 1, 0, '#', '', 'M', '0', '0', '', 'log', 103, 1, '2026-03-31 20:14:46', null, null, '日志管理目录', 'authService', null); +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (108, '日志管理', 0, 3, 'log', null, '', 1, 0, '#', '', 'M', '0', '0', '', 'log', 103, 1, '2026-03-31 20:14:46', null, null, '日志管理目录', 'authService', null); INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (40, '系统工具', 0, 4, 'tool', null, '', 1, 0, '#', '', 'M', '0', '0', '', 'tool', 103, 1, '2026-03-31 20:14:46', null, null, '系统工具目录', 'authService', null); -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (50, '系统监控', 0, 5, 'monitor', null, '', 1, 0, '#', '', 'M', '0', '0', '', 'monitor', 103, 1, '2026-03-31 20:14:46', null, null, '系统监控目录', 'authService', null); +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (2, '系统监控', 0, 5, 'monitor', null, '', 1, 0, '#', '', 'M', '0', '0', '', 'monitor', 103, 1, '2026-03-31 20:14:46', null, null, '系统监控目录', 'authService', null); INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (60, '系统对接', 0, 6, 'integration', null, '', 1, 0, '#', '', 'M', '0', '0', '', 'international', 103, 1, '2026-03-31 20:14:46', null, null, '系统对接目录', 'authService', null); INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (70, '系统集成模拟', 0, 7, 'system-integration-mock', null, '', 1, 0, '#', '', 'M', '0', '0', '', 'redis', 103, 1, '2026-03-31 20:14:46', null, null, '系统集成模拟目录', 'authService', null); @@ -25,9 +23,9 @@ INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, -- 系统设置 子菜单 (parent_id = 10, menu_type = 'C') -- ============================================= -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (1001, '菜单管理', 10, 1, 'menu', 'system/menu/index-groupby', '', 1, 0, '#', '', 'C', '0', '0', 'system:menu:list', 'tree-table', 103, 1, '2026-03-31 20:14:46', null, null, '菜单管理菜单', 'authService', null); -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (1002, '数据字典', 10, 2, 'dict', 'system/dict/index-manager', '', 1, 0, '#', '', 'C', '0', '0', 'system:dict:list', 'dict', 103, 1, '2026-03-31 20:14:46', null, null, '数据字典菜单', 'authService', null); -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (1003, '参数设置', 10, 3, 'config', 'system/config/index', '', 1, 0, '#', '', 'C', '0', '0', 'system:config:list', 'edit', 103, 1, '2026-03-31 20:14:46', null, null, '参数设置菜单', 'authService', null); +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (102, '菜单管理', 10, 1, 'menu', 'system/menu/index-groupby', '', 1, 0, '#', '', 'C', '0', '0', 'system:menu:list', 'tree-table', 103, 1, '2026-03-31 20:14:46', null, null, '菜单管理菜单', 'authService', null); +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (105, '数据字典', 10, 2, 'dict', 'system/dict/index-manager', '', 1, 0, '#', '', 'C', '0', '0', 'system:dict:list', 'dict', 103, 1, '2026-03-31 20:14:46', null, null, '数据字典菜单', 'authService', null); +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (106, '参数设置', 10, 3, 'config', 'system/config/index', '', 1, 0, '#', '', 'C', '0', '0', 'system:config:list', 'edit', 103, 1, '2026-03-31 20:14:46', null, null, '参数设置菜单', 'authService', null); INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (1004, '文件管理', 10, 4, 'oss', 'system/oss/index', '', 1, 0, '#', '', 'C', '0', '0', 'system:oss:list', 'upload', 103, 1, '2026-03-31 20:14:46', null, null, '文件管理菜单', 'authService', null); INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (1005, '客户端管理', 10, 5, 'client', 'system/client/index', '', 1, 0, '#', '', 'C', '0', '0', 'system:client:list', 'international', 103, 1, '2026-03-31 20:14:46', null, null, '客户端管理菜单', 'authService', null); @@ -52,11 +50,11 @@ INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (2021, '分配角色', 20, 5, 'user-auth/role/:userId', 'system/user/authRole', '', 1, 1, '#', '', 'C', '1', '0', 'system:user:edit', '#', 103, 1, '2026-03-31 20:14:46', null, null, '/system/user', 'authService', null); -- ============================================= --- 日志管理 子菜单 (parent_id = 30, menu_type = 'C') +-- 日志管理 子菜单 (parent_id = 108, menu_type = 'C') -- ============================================= -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (3001, '操作日志', 30, 1, 'operlog', 'monitor/operlog/index', '', 1, 0, '#', '', 'C', '0', '0', 'monitor:operlog:list', 'form', 103, 1, '2026-03-31 20:14:46', null, null, '操作日志菜单', 'authService', null); -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (3002, '登陆日志', 30, 2, 'logininfor', 'monitor/logininfor/index', '', 1, 0, '#', '', 'C', '0', '0', 'monitor:logininfor:list', 'logininfor', 103, 1, '2026-03-31 20:14:46', null, null, '登陆日志菜单', 'authService', null); +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (500, '操作日志', 108, 1, 'operlog', 'monitor/operlog/index', '', 1, 0, '#', '', 'C', '0', '0', 'monitor:operlog:list', 'form', 103, 1, '2026-03-31 20:14:46', null, null, '操作日志菜单', 'authService', null); +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (501, '登陆日志', 108, 2, 'logininfor', 'monitor/logininfor/index', '', 1, 0, '#', '', 'C', '0', '0', 'monitor:logininfor:list', 'logininfor', 103, 1, '2026-03-31 20:14:46', null, null, '登陆日志菜单', 'authService', null); -- ============================================= -- 系统工具 子菜单 (parent_id = 40, menu_type = 'C') @@ -68,22 +66,22 @@ INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (4010, '修改生成配置', 40, 2, 'gen-edit/index/:tableId', 'tool/gen/editTable', '', 1, 1, '#', '', 'C', '1', '0', 'tool:gen:edit', '#', 103, 1, '2026-03-31 20:14:46', null, null, '/tool/gen', 'authService', null); -- ============================================= --- 系统监控 子菜单 (parent_id = 50, menu_type = 'C') +-- 系统监控 子菜单 (parent_id = 2, menu_type = 'C') -- ============================================= -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (5001, '任务调度', 50, 1, 'quartz', 'system/quartz/index', '', 1, 0, '#', '', 'C', '0', '0', 'monitor:snailjob:list', 'job', 103, 1, '2026-03-31 20:14:46', null, null, '任务调度菜单', 'authService', null); -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (5002, '缓存监控', 50, 2, 'cache', 'monitor/cache/index', '', 1, 0, '#', '', 'C', '0', '0', 'monitor:cache:list', 'redis', 103, 1, '2026-03-31 20:14:46', null, null, '缓存监控菜单', 'authService', null); -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (5003, '在线认证用户', 50, 3, 'online-auth', 'monitor/online/index', '', 1, 0, '#', '', 'C', '0', '0', 'monitor:online:list', 'online', 103, 1, '2026-03-31 20:14:46', null, null, '在线认证用户菜单', 'authService', null); -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (5004, '在线企业用户', 50, 4, 'online-enterprise', 'monitor/online/index', '', 1, 0, '#', '', 'C', '0', '0', 'monitor:online:enterprise', 'online', 103, 1, '2026-03-31 20:14:46', null, null, '在线企业用户菜单', 'authService', null); +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (5001, '任务调度', 2, 1, 'quartz', 'system/quartz/index', '', 1, 0, '#', '', 'C', '0', '0', 'monitor:snailjob:list', 'job', 103, 1, '2026-03-31 20:14:46', null, null, '任务调度菜单', 'authService', null); +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (5002, '缓存监控', 2, 2, 'cache', 'monitor/cache/index', '', 1, 0, '#', '', 'C', '0', '0', 'monitor:cache:list', 'redis', 103, 1, '2026-03-31 20:14:46', null, null, '缓存监控菜单', 'authService', null); +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (5003, '在线认证用户', 2, 3, 'online-auth', 'monitor/online/index', '', 1, 0, '#', '', 'C', '0', '0', 'monitor:online:list', 'online', 103, 1, '2026-03-31 20:14:46', null, null, '在线认证用户菜单', 'authService', null); +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (5004, '在线企业用户', 2, 4, 'online-enterprise', 'monitor/online/index', '', 1, 0, '#', '', 'C', '0', '0', 'monitor:online:enterprise', 'online', 103, 1, '2026-03-31 20:14:46', null, null, '在线企业用户菜单', 'authService', null); -- ============================================= -- 系统对接 子菜单 (parent_id = 60, menu_type = 'C') -- ============================================= -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (6001, '密钥管理', 60, 1, 'secret-key', 'efcode/secretkey/index', '', 1, 0, '#', '', 'C', '0', '0', 'efcode:secretkey:list', 'validCode', 103, 1, '2026-03-31 20:14:46', null, null, '密钥管理菜单', 'authService', null); -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (6002, '接口管理', 60, 2, 'api-manage', 'efcode/api/index', '', 1, 0, '#', '', 'C', '0', '0', 'efcode:api:list', 'swagger', 103, 1, '2026-03-31 20:14:46', null, null, '接口管理菜单', 'authService', null); -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (6003, '前置库', 60, 3, 'front-db', 'efcode/frontdb/index', '', 1, 0, '#', '', 'C', '0', '0', 'efcode:frontdb:list', 'server', 103, 1, '2026-03-31 20:14:46', null, null, '前置库菜单', 'authService', null); -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (6004, 'DataX任务', 60, 4, 'datax', 'efcode/datax/index', '', 1, 0, '#', '', 'C', '0', '0', 'efcode:datax:list', 'job', 103, 1, '2026-03-31 20:14:46', null, null, 'DataX任务菜单', 'authService', null); +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (6010, '密钥管理', 60, 1, 'secret-key', 'efcode/secretkey/index', '', 1, 0, '#', '', 'C', '0', '0', 'efcode:secretkey:list', 'validCode', 103, 1, '2026-03-31 20:14:46', null, null, '密钥管理菜单', 'authService', null); +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (6011, '接口管理', 60, 2, 'api-manage', 'efcode/api/index', '', 1, 0, '#', '', 'C', '0', '0', 'efcode:api:list', 'swagger', 103, 1, '2026-03-31 20:14:46', null, null, '接口管理菜单', 'authService', null); +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (6012, '前置库', 60, 3, 'front-db', 'efcode/frontdb/index', '', 1, 0, '#', '', 'C', '0', '0', 'efcode:frontdb:list', 'server', 103, 1, '2026-03-31 20:14:46', null, null, '前置库菜单', 'authService', null); +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (6013, 'DataX任务', 60, 4, 'datax', 'efcode/datax/index', '', 1, 0, '#', '', 'C', '0', '0', 'efcode:datax:list', 'job', 103, 1, '2026-03-31 20:14:46', null, null, 'DataX任务菜单', 'authService', null); -- ============================================= -- 系统集成模拟 子菜单 (parent_id = 70, menu_type = 'C') @@ -97,7 +95,7 @@ INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, -- ============================================= -- 监管端菜单结构 (system_code = 'supervisionCode') --- 一级目录 ID 从 600 开始 +-- 一级目录 ID 沿用旧系统 -- ============================================= -- 删除旧的 supervisionCode 菜单记录（如有需要可取消注释） @@ -107,48 +105,51 @@ DELETE FROM sys_menu WHERE system_code = 'supervisionCode'; -- 一级目录 (parent_id = 0, menu_type = 'M') -- ============================================= -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (600, '统计查询', 0, 1, 'statistics', null, '', 1, 0, '#', '', 'M', '0', '0', '', 'chart', 103, 1, '2026-05-15 00:00:00', null, null, '统计查询目录', 'supervisionCode', null); -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (610, '工作报表', 0, 2, 'work-report', null, '', 1, 0, '#', '', 'M', '0', '0', '', 'form', 103, 1, '2026-05-15 00:00:00', null, null, '工作报表目录', 'supervisionCode', null); +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (5247, '统计查询', 0, 1, 'statistics', null, '', 1, 0, '#', '', 'M', '0', '0', '', 'chart', 103, 1, '2026-05-15 00:00:00', null, null, '统计查询目录', 'supervisionCode', null); +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (5269, '工作报表', 0, 2, 'work-report', null, '', 1, 0, '#', '', 'M', '0', '0', '', 'form', 103, 1, '2026-05-15 00:00:00', null, null, '工作报表目录', 'supervisionCode', null); INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (620, '报表趋势', 0, 3, 'report-trend', null, '', 1, 0, '#', '', 'M', '0', '0', '', 'monitor', 103, 1, '2026-05-15 00:00:00', null, null, '报表趋势目录', 'supervisionCode', null); -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (630, '综合管理', 0, 4, 'general-manage', null, '', 1, 0, '#', '', 'M', '0', '0', '', 'system', 103, 1, '2026-05-15 00:00:00', null, null, '综合管理目录', 'supervisionCode', null); +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (6000, '综合管理', 0, 4, 'general-manage', null, '', 1, 0, '#', '', 'M', '0', '0', '', 'system', 103, 1, '2026-05-15 00:00:00', null, null, '综合管理目录', 'supervisionCode', null); INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (640, '计划管理', 0, 5, 'plan-manage', null, '', 1, 0, '#', '', 'M', '0', '0', '', 'date', 103, 1, '2026-05-15 00:00:00', null, null, '计划管理目录', 'supervisionCode', null); INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (650, '任务管理', 0, 6, 'task-manage', null, '', 1, 0, '#', '', 'M', '0', '0', '', 'job', 103, 1, '2026-05-15 00:00:00', null, null, '任务管理目录', 'supervisionCode', null); INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (660, '预约管理', 0, 7, 'appointment-manage', null, '', 1, 0, '#', '', 'M', '0', '0', '', 'time-range', 103, 1, '2026-05-15 00:00:00', null, null, '预约管理目录', 'supervisionCode', null); INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (670, '预告管理', 0, 8, 'notice-manage', null, '', 1, 0, '#', '', 'M', '0', '0', '', 'message', 103, 1, '2026-05-15 00:00:00', null, null, '预告管理目录', 'supervisionCode', null); -- ============================================= --- 统计查询 子目录 (parent_id = 600, menu_type = 'M') +-- 统计查询 子目录 (parent_id = 5247, menu_type = 'M') -- ============================================= -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (6100, '行政执法', 600, 1, 'administrative', null, '', 1, 0, '#', '', 'M', '0', '0', '', 'list', 103, 1, '2026-05-15 00:00:00', null, null, '行政执法目录', 'supervisionCode', null); -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (6200, '非行政执法', 600, 2, 'non-administrative', null, '', 1, 0, '#', '', 'M', '0', '0', '', 'list', 103, 1, '2026-05-15 00:00:00', null, null, '非行政执法目录', 'supervisionCode', null); +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (5262, '行政执法', 5247, 1, 'administrative', null, '', 1, 0, '#', '', 'M', '0', '0', '', 'list', 103, 1, '2026-05-15 00:00:00', null, null, '行政执法目录', 'supervisionCode', null); +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (5284, '非行政执法', 5247, 2, 'non-administrative', null, '', 1, 0, '#', '', 'M', '0', '0', '', 'list', 103, 1, '2026-05-15 00:00:00', null, null, '非行政执法目录', 'supervisionCode', null); -- ============================================= --- 行政执法 子菜单 (parent_id = 6100, menu_type = 'C') +-- 行政执法 子菜单 (parent_id = 5262, menu_type = 'C') -- ============================================= -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (6101, '涉企执法情况', 6100, 1, 'enterprise-enforcement', 'supervision/statistics/enterpriseEnforcement', '', 1, 0, '#', '', 'C', '0', '0', 'supervision:statistics:enterpriseEnforcement', '#', 103, 1, '2026-05-15 00:00:00', null, null, '涉企执法情况菜单', 'supervisionCode', null); -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (6102, '企业受检次数', 6100, 2, 'enterprise-inspection', 'supervision/statistics/enterpriseInspection', '', 1, 0, '#', '', 'C', '0', '0', 'supervision:statistics:enterpriseInspection', '#', 103, 1, '2026-05-15 00:00:00', null, null, '企业受检次数菜单', 'supervisionCode', null); -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (6103, '企业信息情况', 6100, 3, 'enterprise-info', 'supervision/statistics/enterpriseInfo', '', 1, 0, '#', '', 'C', '0', '0', 'supervision:statistics:enterpriseInfo', '#', 103, 1, '2026-05-15 00:00:00', null, null, '企业信息情况菜单', 'supervisionCode', null); -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (6104, '执法单位情况', 6100, 4, 'enforcement-unit', 'supervision/statistics/enforcementUnit', '', 1, 0, '#', '', 'C', '0', '0', 'supervision:statistics:enforcementUnit', '#', 103, 1, '2026-05-15 00:00:00', null, null, '执法单位情况菜单', 'supervisionCode', null); -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (6105, '执法投诉情况', 6100, 5, 'enforcement-complaint', 'supervision/statistics/enforcementComplaint', '', 1, 0, '#', '', 'C', '0', '0', 'supervision:statistics:enforcementComplaint', '#', 103, 1, '2026-05-15 00:00:00', null, null, '执法投诉情况菜单', 'supervisionCode', null); -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (6106, '检查计划情况', 6100, 6, 'inspection-plan', 'supervision/statistics/inspectionPlan', '', 1, 0, '#', '', 'C', '0', '0', 'supervision:statistics:inspectionPlan', '#', 103, 1, '2026-05-15 00:00:00', null, null, '检查计划情况菜单', 'supervisionCode', null); +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (5249, '涉企执法情况(2)', 5262, 1, 'enterprise-enforcement', 'efcode/report/registration/index', '', 1, 0, '#', '', 'C', '0', '0', 'supervision:statistics:enterpriseEnforcement', '#', 103, 1, '2026-05-15 00:00:00', null, null, '涉企执法情况菜单', 'supervisionCode', null); +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (5278, '企业受检次数(4)', 5262, 2, 'enterprise-inspection', '', '', 1, 0, '#', '', 'C', '0', '0', 'supervision:statistics:enterpriseInspection', '#', 103, 1, '2026-05-15 00:00:00', null, null, '企业受检次数菜单', 'supervisionCode', null); +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (5253, '企业信息情况(5)', 5262, 3, 'enterprise-info', '', '', 1, 0, '#', '', 'C', '0', '0', 'supervision:statistics:enterpriseInfo', '#', 103, 1, '2026-05-15 00:00:00', null, null, '企业信息情况菜单', 'supervisionCode', null); +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (5250, '执法单位情况(5)', 5262, 4, 'enforcement-unit', '', '', 1, 0, '#', '', 'C', '0', '0', 'supervision:statistics:enforcementUnit', '#', 103, 1, '2026-05-15 00:00:00', null, null, '执法单位情况菜单', 'supervisionCode', null); +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (5251, '执法投诉情况(4)', 5262, 5, 'enforcement-complaint', '', '', 1, 0, '#', '', 'C', '0', '0', 'supervision:statistics:enforcementComplaint', '#', 103, 1, '2026-05-15 00:00:00', null, null, '执法投诉情况菜单', 'supervisionCode', null); +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (5254, '检查计划情况(5)', 5262, 6, 'inspection-plan', '', '', 1, 0, '#', '', 'C', '0', '0', 'supervision:statistics:inspectionPlan', '#', 103, 1, '2026-05-15 00:00:00', null, null, '检查计划情况菜单', 'supervisionCode', null); -- ============================================= --- 非行政执法 子菜单 (parent_id = 6200, menu_type = 'C') +-- 非行政执法 子菜单 (parent_id = 5284, menu_type = 'C') -- ============================================= -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (6201, '非行政执法', 6200, 1, 'non-administrative-list', 'supervision/statistics/nonAdministrative', '', 1, 0, '#', '', 'C', '0', '0', 'supervision:statistics:nonAdministrative', '#', 103, 1, '2026-05-15 00:00:00', null, null, '非行政执法菜单', 'supervisionCode', null); +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (5283, '非行政执法(3)', 5284, 1, 'non-administrative-list', 'supervision/statistics/nonAdministrative', '', 1, 0, '#', '', 'C', '0', '0', 'supervision:statistics:nonAdministrative', '#', 103, 1, '2026-05-15 00:00:00', null, null, '非行政执法菜单', 'supervisionCode', null); + +-- 工作报表 子菜单 (parent_id = 5269, menu_type = 'C') +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (5255, '执法分析(1)', 5269, 1, 'enforcement-analysis', 'efcode/report/registration_statistics/index', '', 1, 0, '#', '', 'C', '0', '0', 'supervision:report:enforcementAnalysis', '#', 103, 1, '2026-05-15 00:00:00', null, null, '执法分析菜单', 'supervisionCode', null); -- ============================================= --- 综合管理 子菜单 (parent_id = 630, menu_type = 'C') +-- 综合管理 子菜单 (parent_id = 6000, menu_type = 'C') -- ============================================= -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (6301, '普法服务', 630, 1, 'law-service', 'supervision/general/lawService', '', 1, 0, '#', '', 'C', '0', '0', 'supervision:general:lawService', '#', 103, 1, '2026-05-15 00:00:00', null, null, '普法服务菜单', 'supervisionCode', null); -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (6302, '轮播图管理', 630, 2, 'carousel', 'supervision/general/carousel', '', 1, 0, '#', '', 'C', '0', '0', 'supervision:general:carousel', '#', 103, 1, '2026-05-15 00:00:00', null, null, '轮播图管理菜单', 'supervisionCode', null); -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (6303, '公告管理', 630, 3, 'announcement', 'supervision/general/announcement', '', 1, 0, '#', '', 'C', '0', '0', 'supervision:general:announcement', '#', 103, 1, '2026-05-15 00:00:00', null, null, '公告管理菜单', 'supervisionCode', null); -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (6304, '送码入企', 630, 4, 'send-code', 'supervision/general/sendCode', '', 1, 0, '#', '', 'C', '0', '0', 'supervision:general:sendCode', '#', 103, 1, '2026-05-15 00:00:00', null, null, '送码入企菜单', 'supervisionCode', null); -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (6305, '送码入企查询', 630, 5, 'send-code-query', 'supervision/general/sendCodeQuery', '', 1, 0, '#', '', 'C', '0', '0', 'supervision:general:sendCodeQuery', '#', 103, 1, '2026-05-15 00:00:00', null, null, '送码入企查询菜单', 'supervisionCode', null); +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (6301, '普法服务', 6000, 1, 'law-service', 'supervision/general/lawService', '', 1, 0, '#', '', 'C', '0', '0', 'supervision:general:lawService', '#', 103, 1, '2026-05-15 00:00:00', null, null, '普法服务菜单', 'supervisionCode', null); +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (6302, '轮播图管理', 6000, 2, 'carousel', 'supervision/general/carousel', '', 1, 0, '#', '', 'C', '0', '0', 'supervision:general:carousel', '#', 103, 1, '2026-05-15 00:00:00', null, null, '轮播图管理菜单', 'supervisionCode', null); +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (6303, '公告管理', 6000, 3, 'announcement', 'supervision/general/announcement', '', 1, 0, '#', '', 'C', '0', '0', 'supervision:general:announcement', '#', 103, 1, '2026-05-15 00:00:00', null, null, '公告管理菜单', 'supervisionCode', null); +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (6001, '送码入企', 6000, 4, 'send-code', 'efcode/enterprise_pub_qrcode/index', '', 1, 0, '#', '', 'C', '0', '0', 'supervision:general:sendCode', '#', 103, 1, '2026-05-15 00:00:00', null, null, '送码入企菜单', 'supervisionCode', null); +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (6003, '送码入企查询', 6000, 5, 'send-code-query', 'efcode/enterprise_pub_qrcode/indexForQuery', '', 1, 0, '#', '', 'C', '0', '0', 'supervision:general:sendCodeQuery', '#', 103, 1, '2026-05-15 00:00:00', null, null, '送码入企查询菜单', 'supervisionCode', null); -- ============================================= -- 计划管理 子菜单 (parent_id = 640, menu_type = 'C') diff --git a/script/sql/zfjd-refactoring-v1/014-初始化角色.sql b/script/sql/zfjd-refactoring-v1/014-初始化角色.sql index 8c8f9eed..a141018b 100644 --- a/script/sql/zfjd-refactoring-v1/014-初始化角色.sql +++ b/script/sql/zfjd-refactoring-v1/014-初始化角色.sql @@ -1,4 +1,57 @@ INSERT INTO sys_role (role_id, tenant_id, role_name, role_key, role_sort, data_scope, menu_check_strictly, dept_check_strictly, status, del_flag, create_dept, create_by, create_time, update_by, update_time, remark, tenant_code, user_id, dept_id, sass_id, role_code, is_role_sys) -VALUES (100, '000000', '查看全部业务数据角色', 'ViewAllDataRole', 1, '1', 1, 1, '0', '0', null, 0, '2025-01-10 15:08:12', 0, '2025-01-10 15:10:18', '', null, '1', null, null, null, '0'); +VALUES (1000, '000000', '查看全部业务数据角色', 'ViewAllDataRole', 1, '1', 1, 1, '0', '0', null, 0, '2025-01-10 15:08:12', 0, '2025-01-10 15:10:18', 'roleKey不可修改', null, '1', null, null, null, '1'); INSERT INTO sys_role (role_id, tenant_id, role_name, role_key, role_sort, data_scope, menu_check_strictly, dept_check_strictly, status, del_flag, create_dept, create_by, create_time, update_by, update_time, remark, tenant_code, user_id, dept_id, sass_id, role_code, is_role_sys) -VALUES (101, '000000', '查看本级和下级业务数据角色', 'ViewFilterDataRole', 1, '1', 1, 1, '0', '0', null, 0, '2025-01-10 15:08:12', 0, '2025-01-10 15:10:18', '', null, '1', null, null, null, '0'); +VALUES (1001, '000000', '查看本级和下级业务数据角色', 'ViewFilterDataRole', 2, '1', 1, 1, '0', '0', null, 0, '2025-01-10 15:08:12', 0, '2025-01-10 15:10:18', 'roleKey不可修改', null, '1', null, null, null, '1'); + +-- 各区查看全部数据角色 +INSERT INTO sys_role (role_id, tenant_id, role_name, role_key, role_sort, data_scope, menu_check_strictly, dept_check_strictly, status, del_flag, create_dept, create_by, create_time, update_by, update_time, remark, tenant_code, user_id, dept_id, sass_id, role_code, is_role_sys) +VALUES (1002, '000000', '查看福田区全部数据角色', 'ViewEFDataRole_Area:Area_FuTianQu', 3, '1', 1, 1, '0', '0', null, 0, '2025-01-10 15:08:12', 0, '2025-01-10 15:10:18', '福田区,roleKey不可修改', null, '1', null, null, null, '1'); +INSERT INTO sys_role (role_id, tenant_id, role_name, role_key, role_sort, data_scope, menu_check_strictly, dept_check_strictly, status, del_flag, create_dept, create_by, create_time, update_by, update_time, remark, tenant_code, user_id, dept_id, sass_id, role_code, is_role_sys) +VALUES (1003, '000000', '查看罗湖区全部数据角色', 'ViewEFDataRole_Area:Area_LuoHuQu', 4, '1', 1, 1, '0', '0', null, 0, '2025-01-10 15:08:12', 0, '2025-01-10 15:10:18', '罗湖区,roleKey不可修改', null, '1', null, null, null, '1'); +INSERT INTO sys_role (role_id, tenant_id, role_name, role_key, role_sort, data_scope, menu_check_strictly, dept_check_strictly, status, del_flag, create_dept, create_by, create_time, update_by, update_time, remark, tenant_code, user_id, dept_id, sass_id, role_code, is_role_sys) +VALUES (1004, '000000', '查看盐田区全部数据角色', 'ViewEFDataRole_Area:Area_YanTianQu', 5, '1', 1, 1, '0', '0', null, 0, '2025-01-10 15:08:12', 0, '2025-01-10 15:10:18', '盐田区,roleKey不可修改', null, '1', null, null, null, '1'); +INSERT INTO sys_role (role_id, tenant_id, role_name, role_key, role_sort, data_scope, menu_check_strictly, dept_check_strictly, status, del_flag, create_dept, create_by, create_time, update_by, update_time, remark, tenant_code, user_id, dept_id, sass_id, role_code, is_role_sys) +VALUES (1005, '000000', '查看南山区全部数据角色', 'ViewEFDataRole_Area:Area_NanShanQu', 6, '1', 1, 1, '0', '0', null, 0, '2025-01-10 15:08:12', 0, '2025-01-10 15:10:18', '南山区,roleKey不可修改', null, '1', null, null, null, '1'); +INSERT INTO sys_role (role_id, tenant_id, role_name, role_key, role_sort, data_scope, menu_check_strictly, dept_check_strictly, status, del_flag, create_dept, create_by, create_time, update_by, update_time, remark, tenant_code, user_id, dept_id, sass_id, role_code, is_role_sys) +VALUES (1006, '000000', '查看宝安区全部数据角色', 'ViewEFDataRole_Area:Area_BaoAnQu', 7, '1', 1, 1, '0', '0', null, 0, '2025-01-10 15:08:12', 0, '2025-01-10 15:10:18', '宝安区,roleKey不可修改', null, '1', null, null, null, '1'); +INSERT INTO sys_role (role_id, tenant_id, role_name, role_key, role_sort, data_scope, menu_check_strictly, dept_check_strictly, status, del_flag, create_dept, create_by, create_time, update_by, update_time, remark, tenant_code, user_id, dept_id, sass_id, role_code, is_role_sys) +VALUES (1007, '000000', '查看龙岗区全部数据角色', 'ViewEFDataRole_Area:Area_LongGangQu', 8, '1', 1, 1, '0', '0', null, 0, '2025-01-10 15:08:12', 0, '2025-01-10 15:10:18', '龙岗区,roleKey不可修改', null, '1', null, null, null, '1'); +INSERT INTO sys_role (role_id, tenant_id, role_name, role_key, role_sort, data_scope, menu_check_strictly, dept_check_strictly, status, del_flag, create_dept, create_by, create_time, update_by, update_time, remark, tenant_code, user_id, dept_id, sass_id, role_code, is_role_sys) +VALUES (1008, '000000', '查看龙华区全部数据角色', 'ViewEFDataRole_Area:Area_LongHuaQu', 9, '1', 1, 1, '0', '0', null, 0, '2025-01-10 15:08:12', 0, '2025-01-10 15:10:18', '龙华区,roleKey不可修改', null, '1', null, null, null, '1'); +INSERT INTO sys_role (role_id, tenant_id, role_name, role_key, role_sort, data_scope, menu_check_strictly, dept_check_strictly, status, del_flag, create_dept, create_by, create_time, update_by, update_time, remark, tenant_code, user_id, dept_id, sass_id, role_code, is_role_sys) +VALUES (1009, '000000', '查看坪山区全部数据角色', 'ViewEFDataRole_Area:Area_PingsHanQu', 10, '1', 1, 1, '0', '0', null, 0, '2025-01-10 15:08:12', 0, '2025-01-10 15:10:18', '坪山区,roleKey不可修改', null, '1', null, null, null, '1'); +INSERT INTO sys_role (role_id, tenant_id, role_name, role_key, role_sort, data_scope, menu_check_strictly, dept_check_strictly, status, del_flag, create_dept, create_by, create_time, update_by, update_time, remark, tenant_code, user_id, dept_id, sass_id, role_code, is_role_sys) +VALUES (1010, '000000', '查看光明区全部数据角色', 'ViewEFDataRole_Area:Area_GuangMingQu', 11, '1', 1, 1, '0', '0', null, 0, '2025-01-10 15:08:12', 0, '2025-01-10 15:10:18', '光明区,roleKey不可修改', null, '1', null, null, null, '1'); +INSERT INTO sys_role (role_id, tenant_id, role_name, role_key, role_sort, data_scope, menu_check_strictly, dept_check_strictly, status, del_flag, create_dept, create_by, create_time, update_by, update_time, remark, tenant_code, user_id, dept_id, sass_id, role_code, is_role_sys) +VALUES (1011, '000000', '查看大鹏新区全部数据角色', 'ViewEFDataRole_Area:Area_DapengXinQu', 12, '1', 1, 1, '0', '0', null, 0, '2025-01-10 15:08:12', 0, '2025-01-10 15:10:18', '大鹏新区,roleKey不可修改', null, '1', null, null, null, '1'); +INSERT INTO sys_role (role_id, tenant_id, role_name, role_key, role_sort, data_scope, menu_check_strictly, dept_check_strictly, status, del_flag, create_dept, create_by, create_time, update_by, update_time, remark, tenant_code, user_id, dept_id, sass_id, role_code, is_role_sys) +VALUES (1012, '000000', '查看深汕特别合作区全部数据角色', 'ViewEFDataRole_Area:Area_ShenShanTeBieHeZuoQu', 13, '1', 1, 1, '0', '0', null, 0, '2025-01-10 15:08:12', 0, '2025-01-10 15:10:18', '深汕特别合作区,roleKey不可修改', null, '1', null, null, null, '1'); +INSERT INTO sys_role (role_id, tenant_id, role_name, role_key, role_sort, data_scope, menu_check_strictly, dept_check_strictly, status, del_flag, create_dept, create_by, create_time, update_by, update_time, remark, tenant_code, user_id, dept_id, sass_id, role_code, is_role_sys) +VALUES (1013, '000000', '查看深圳市直全部数据角色', 'ViewEFDataRole_Area:ShenZhen_ShiZhi', 14, '1', 1, 1, '0', '0', null, 0, '2025-01-10 15:08:12', 0, '2025-01-10 15:10:18', '深圳市直,roleKey不可修改', null, '1', null, null, null, '1'); + +-- 更新指定role_id的role_sort，从100开始递增排序 +UPDATE sys_role SET role_sort = 100 WHERE role_id = 177; +UPDATE sys_role SET role_sort = 101 WHERE role_id = 191; +UPDATE sys_role SET role_sort = 102 WHERE role_id = 193; +UPDATE sys_role SET role_sort = 103 WHERE role_id = 194; +UPDATE sys_role SET role_sort = 104 WHERE role_id = 195; +UPDATE sys_role SET role_sort = 105 WHERE role_id = 196; +UPDATE sys_role SET role_sort = 106 WHERE role_id = 197; +UPDATE sys_role SET role_sort = 107 WHERE role_id = 198; +UPDATE sys_role SET role_sort = 108 WHERE role_id = 199; +UPDATE sys_role SET role_sort = 109 WHERE role_id = 200; +UPDATE sys_role SET role_sort = 110 WHERE role_id = 201; +UPDATE sys_role SET role_sort = 111 WHERE role_id = 202; +UPDATE sys_role SET role_sort = 112 WHERE role_id = 203; +UPDATE sys_role SET role_sort = 113 WHERE role_id = 204; +UPDATE sys_role SET role_sort = 114 WHERE role_id = 205; +UPDATE sys_role SET role_sort = 115 WHERE role_id = 206; +UPDATE sys_role SET role_sort = 116 WHERE role_id = 207; +UPDATE sys_role SET role_sort = 117 WHERE role_id = 208; +UPDATE sys_role SET role_sort = 118 WHERE role_id = 209; +UPDATE sys_role SET role_sort = 119 WHERE role_id = 210; +UPDATE sys_role SET role_sort = 120 WHERE role_id = 211; +UPDATE sys_role SET role_sort = 121 WHERE role_id = 212; +UPDATE sys_role SET role_sort = 122 WHERE role_id = 213; +UPDATE sys_role SET role_sort = 123 WHERE role_id = 214; +UPDATE sys_role SET role_sort = 124 WHERE role_id = 215; diff --git a/script/sql/zfjd-refactoring-v1/016-送码入企.sql b/script/sql/zfjd-refactoring-v1/016-送码入企.sql new file mode 100644 index 00000000..4b19c3d9 --- /dev/null +++ b/script/sql/zfjd-refactoring-v1/016-送码入企.sql @@ -0,0 +1,18 @@ +-- 给 enterprise_pub_qrcode 表增加执法单位和市认证机构字段 +ALTER TABLE `enterprise_pub_qrcode` + ADD COLUMN `bureau_dept_id` varchar(50) NULL COMMENT '执法单位ID'; +ALTER TABLE `enterprise_pub_qrcode` + ADD COLUMN `bureau_dept_name` varchar(100) NULL COMMENT '执法单位名称'; +ALTER TABLE `enterprise_pub_qrcode` + ADD COLUMN `organ_id` varchar(50) NULL COMMENT '市认证机构ID'; +ALTER TABLE `enterprise_pub_qrcode` + ADD COLUMN `organ_name` varchar(100) NULL COMMENT '市认证机构名称'; +ALTER TABLE `enterprise_pub_qrcode` + ADD COLUMN `update_by` bigint NULL COMMENT '更新者'; +ALTER TABLE `enterprise_pub_qrcode` + ADD COLUMN `create_dept` varchar(100) NULL COMMENT '创建部门'; +ALTER TABLE `enterprise_pub_qrcode` + ADD COLUMN `update_time` datetime NULL COMMENT '更新时间'; + +ALTER TABLE sys_oper_log MODIFY COLUMN method varchar(255) DEFAULT '' COMMENT '方法名称'; +ALTER TABLE zdxt_file MODIFY COLUMN org_code varchar(100) NULL COMMENT '机构编号'; diff --git a/zdxt-modules/zdxt-enforcement-code-common/src/main/java/com/zdxt/enforcementcode/common/annotation/EfcodeDataFilterInterceptor.java b/zdxt-modules/zdxt-enforcement-code-common/src/main/java/com/zdxt/enforcementcode/common/annotation/EfcodeDataFilterInterceptor.java index 56bb8631..7efdd1ee 100644 --- a/zdxt-modules/zdxt-enforcement-code-common/src/main/java/com/zdxt/enforcementcode/common/annotation/EfcodeDataFilterInterceptor.java +++ b/zdxt-modules/zdxt-enforcement-code-common/src/main/java/com/zdxt/enforcementcode/common/annotation/EfcodeDataFilterInterceptor.java @@ -68,7 +68,7 @@ public class EfcodeDataFilterInterceptor implements InnerInterceptor { * @return SQL 片段；null 表示全部放行；非 null 字符串追加到 WHERE */ private String buildFilterSql(EfcodeDataFilter filter) { - return DataFilterUtil.buildFilterSqlV2( + return DataFilterUtil.buildFilterSql( filter.tableAlias(), filter.column(), filter.includeSearch(), filter.includeStatistics() ); diff --git a/zdxt-modules/zdxt-enforcement-code-common/src/main/java/com/zdxt/enforcementcode/common/util/DataFilterUtil.java b/zdxt-modules/zdxt-enforcement-code-common/src/main/java/com/zdxt/enforcementcode/common/util/DataFilterUtil.java index b09bc2c2..c08bf904 100644 --- a/zdxt-modules/zdxt-enforcement-code-common/src/main/java/com/zdxt/enforcementcode/common/util/DataFilterUtil.java +++ b/zdxt-modules/zdxt-enforcement-code-common/src/main/java/com/zdxt/enforcementcode/common/util/DataFilterUtil.java @@ -238,11 +238,17 @@ public class DataFilterUtil { .collect(Collectors.toList()); } + public static String buildFilterSql(String tableAlias, String column, + boolean includeSearch, boolean includeStatistics) { + return buildFilterSqlV3(tableAlias, column, includeSearch, includeStatistics); + } + // ======================== 角色前缀常量 ======================== /** ViewEFDataRole_Area 角色前缀（role_key 格式: ViewEFDataRole_Area:Area_XxxXxx） */ public static final String ROLE_VIEW_EF_DATA_AREA_PREFIX = "ViewEFDataRole_Area:"; + // ======================== SQL 过滤条件构建方法 ======================== /** @@ -261,7 +267,7 @@ public class DataFilterUtil { * @param includeStatistics 是否包含统计节点 * @return SQL 片段；null 表示全部放行；非 null 则为过滤条件 */ - public static String buildFilterSql(String tableAlias, String column, + public static String buildFilterSqlV1(String tableAlias, String column, boolean includeSearch, boolean includeStatistics) { // 超管或 ViewAllDataRole → 不过滤 if (isFullAccess()) { @@ -336,7 +342,7 @@ public class DataFilterUtil { * @param includeStatistics 是否包含统计节点 * @return SQL 片段；null 表示全部放行；非 null 则为过滤条件 */ - public static String buildFilterSqlV2(String tableAlias, String column, + public static String buildFilterSqlVX(String tableAlias, String column, boolean includeSearch, boolean includeStatistics) { // 超管或 ViewAllDataRole → 不过滤 if (isFullAccess()) { @@ -408,6 +414,107 @@ public class DataFilterUtil { return "1 = 0"; } + /** + * 根据当前用户权限，构建数据过滤 SQL 片段（V3 版本）。 + *

+ * 与 V2 的区别：获取 bureauDeptId 后先在 Java 层转为 VirId， + * SQL 子查询中直接使用 VirId 进行 FIND_IN_SET，避免嵌套子查询做 sys_dept_id → vir_id 转换。 + *

+ * + * @param tableAlias 业务表别名（如 "t"、"e" 等），为空则不使用别名 + * @param column 业务表中用于匹配 sys_dept_id 的列名，默认 "bureau_dept_id" + * @param includeSearch 是否包含查询节点 + * @param includeStatistics 是否包含统计节点 + * @return SQL 片段；null 表示全部放行；非 null 则为过滤条件 + */ + public static String buildFilterSqlV3(String tableAlias, String column, + boolean includeSearch, boolean includeStatistics) { + // 超管或 ViewAllDataRole → 不过滤 + if (isFullAccess()) { + return null; + } + + // ViewFilterDataRole → 构建子查询条件 + if (needFilter()) { + // 获取用户拥有的 ViewEFDataRole_Area 角色对应的 vir_id 列表 + List areaVirIds = getAreaRoleVirIds(); + + // virIds: 用于 FIND_IN_SET 的 vir_id 列表 + List virIds; + + if (CollUtil.isNotEmpty(areaVirIds)) { + // 区角色的值本身就是 vir_id，直接使用 + virIds = areaVirIds; + } else { + // 未拥有 ViewEFDataRole_Area 角色，获取 bureauDeptId 后转为 VirId + String userBureauDeptId = getUserBureauDeptId(LoginHelper.getUserId()); + if (StrUtil.isBlank(userBureauDeptId)) { + return "1 = 0"; + } + // bureauDeptId → VirId + IEfcodeVirtualUnitService service = SpringUtils.getBean(IEfcodeVirtualUnitService.class); + String virId = service.findVirIdBySysDeptId(userBureauDeptId); + if (StrUtil.isBlank(virId)) { + return "1 = 0"; + } + virIds = Collections.singletonList(virId); + } + + if (CollUtil.isEmpty(virIds)) { + return "1 = 0"; + } + + String columnRef = buildColumnRef(tableAlias, column); + + // 构建过滤 SQL：支持多个 VirId + StringBuilder sb = new StringBuilder(); + sb.append("("); + for (int i = 0; i < virIds.size(); i++) { + if (i > 0) { + sb.append(" OR "); + } + String escapedVirId = escapeSql(virIds.get(i)); + // 子查询：使用 vir_id 匹配，SELECT vir_id 而非 sys_dept_id + sb.append(columnRef).append(" IN ("); + sb.append("SELECT eu.sys_dept_id FROM efcode_virtual_unit eu"); + sb.append(" WHERE FIND_IN_SET('").append(escapedVirId).append("', eu.vir_ancestors)"); + sb.append(" AND eu.vir_id IS NOT NULL AND eu.vir_id != ''"); + + // includeSearch / includeStatistics 过滤条件 + if (includeSearch || includeStatistics) { + sb.append(" AND (1=0"); + if (includeSearch) { + sb.append(" OR eu.vir_include_search = '是'"); + } + if (includeStatistics) { + sb.append(" OR eu.vir_include_statistics = '是'"); + } + sb.append(")"); + } + sb.append(")"); + + // 补充自身节点（FIND_IN_SET 只匹配子孙，不含自身） + sb.append(" OR ").append(columnRef).append(" = '").append(escapedVirId).append("'"); + } + sb.append(")"); + + return sb.toString(); + } + + // 无权访问 + return "1 = 0"; + } + /** * 使用默认列名 "bureau_dept_id" 构建数据过滤 SQL 片段。 * @@ -417,7 +524,7 @@ public class DataFilterUtil { * @return SQL 片段；null 表示全部放行；非 null 则为过滤条件 */ public static String buildFilterSql(String tableAlias, boolean includeSearch, boolean includeStatistics) { - return buildFilterSqlV2(tableAlias, "bureau_dept_id", includeSearch, includeStatistics); + return buildFilterSqlV3(tableAlias, "bureau_dept_id", includeSearch, includeStatistics); } /** @@ -428,7 +535,7 @@ public class DataFilterUtil { * @return SQL 片段；null 表示全部放行；非 null 则为过滤条件 */ public static String buildFilterSql(boolean includeSearch, boolean includeStatistics) { - return buildFilterSqlV2("", "bureau_dept_id", includeSearch, includeStatistics); + return buildFilterSqlV3("", "bureau_dept_id", includeSearch, includeStatistics); } /** diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementRegistrationMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementRegistrationMapper.java index 3d1b4563..e42dbf6d 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementRegistrationMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementRegistrationMapper.java @@ -147,8 +147,11 @@ public interface EnforcementRegistrationMapper extends BaseMapperPlus + * 注意：此方法不使用 @EfcodeDataFilter 注解，因为其 SQL 结构为嵌套子查询 + GROUP BY， + * 拦截器会将过滤条件追加到外层 WHERE（GROUP BY 之后），导致非聚合列 bureau_dept_id 值不确定。 + * 应由 Service 层手动计算 dataFilter 传入，注入到内层 WHERE（GROUP BY 之前）。 */ - @EfcodeDataFilter(tableAlias = "t") IPage selectAnalysisPageV2(@Param("page") Page page, @Param("bo") EnforcementRegistrationBo bo, @Param("dataFilter") String dataFilter); diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/impl/EnforcementRegistrationStatisticsServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/impl/EnforcementRegistrationStatisticsServiceImpl.java index a978c097..fe1217e0 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/impl/EnforcementRegistrationStatisticsServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/impl/EnforcementRegistrationStatisticsServiceImpl.java @@ -2,6 +2,7 @@ package com.zdxt.enforcementcode.report.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zdxt.enforcementcode.common.util.DataFilterUtil; import com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo; import com.zdxt.enforcementcode.domain.vo.report.RegistrationAnalysisVo; import com.zdxt.enforcementcode.domain.vo.report.RegistrationStatisticsAnalysisDetailVo; @@ -41,7 +42,20 @@ public class EnforcementRegistrationStatisticsServiceImpl implements IEnforcemen @Override public TableDataInfo list(EnforcementRegistrationBo bo, PageQuery pageQuery) { Page page = pageQuery.build(); - IPage result = registrationMapper.selectAnalysisPageV2(page, bo, null); + // 手动计算数据权限过滤条件，注入到内层子查询 WHERE（GROUP BY 之前） + // 不能使用 @EfcodeDataFilter 注解，因为拦截器会追加到外层 WHERE（GROUP BY 之后） + // 同时匹配 bureau_dept_id（执法单位）和 entrust_dept_id（委托执法部门）， + // 任一列在权限范围内即可保留记录 + String bureauFilter = DataFilterUtil.buildFilterSql("er", "bureau_dept_id", true, true); + String filterSql; + if (bureauFilter == null) { + // 超管或 ViewAllDataRole，全部放行 + filterSql = null; + } else { + String entrustFilter = DataFilterUtil.buildFilterSql("er", "entrust_dept_id", true, true); + filterSql = "AND (" + bureauFilter + " OR " + entrustFilter + ")"; + } + IPage result = registrationMapper.selectAnalysisPageV2(page, bo, filterSql); return TableDataInfo.build(result); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterprisePubQrcodeServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterprisePubQrcodeServiceImpl.java index 55efc675..5cc08420 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterprisePubQrcodeServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterprisePubQrcodeServiceImpl.java @@ -18,6 +18,7 @@ import com.lowagie.text.pdf.PdfPCell; import com.lowagie.text.pdf.PdfPTable; import com.lowagie.text.pdf.PdfWriter; import com.zdxt.enforcementcode.common.util.DataFilterUtil; +import com.zdxt.enforcementcode.common.util.PasswordTools; import com.zdxt.enforcementcode.domain.EnterprisePubQrcode; import com.zdxt.enforcementcode.domain.EnterpriseInformation; import com.zdxt.enforcementcode.domain.bo.EnterprisePubQrcodeBo; @@ -114,8 +115,12 @@ public class EnterprisePubQrcodeServiceImpl implements IEnterprisePubQrcodeServi @Override public TableDataInfo queryPageListForScope(EnterprisePubQrcodeBo bo, PageQuery pageQuery) { - // 数据范围查询 - 按zoneDeptId过滤 + // 数据范围查询 - 通过DataFilterUtil按zone_dept_id过滤 LambdaQueryWrapper lqw = buildQueryWrapper(bo); + String filterSql = DataFilterUtil.buildFilterSql("", "zone_dept_id", true, true); + if (filterSql != null) { + lqw.apply(filterSql); + } Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(result); } @@ -417,7 +422,42 @@ public class EnterprisePubQrcodeServiceImpl implements IEnterprisePubQrcodeServi String enterpriseNumber = record.getEnterpriseNumber(); record.setMatchingStatus("强制匹配"); - // 强制生成二维码（如果企业不存在会自动创建） + // 检查企业是否存在于本地库，不存在则先创建 + EnterpriseInformationVo existingInfo = enterpriseInformationService.queryByEnterpriseNumber(enterpriseNumber); + String targetId = null; + if (existingInfo == null) { + // 优先从市监数据源获取企业信息 + EnterpriseInformation newInfo = enterpriseInformationService.searchEnterpriseByNumber(enterpriseNumber); + if (newInfo != null) { + // 市监存在，写入本地库 + EnterpriseInformationBo insertBo = new EnterpriseInformationBo(); + insertBo.setId(newInfo.getId()); + insertBo.setEnterpriseName(newInfo.getEnterpriseName()); + insertBo.setEnterpriseNumber(newInfo.getEnterpriseNumber()); + insertBo.setSalt(newInfo.getSalt()); + insertBo.setEnterpriseType("送码入企"); + insertBo.setIsUnsubscribe(0L); + insertBo.setIsDelete(0L); + enterpriseInformationService.insertByBo(insertBo); + targetId = insertBo.getId(); + } else { + // 市监也不存在，直接根据导入记录数据创建企业信息 + EnterpriseInformationBo insertBo = new EnterpriseInformationBo(); + insertBo.setId(IdUtil.simpleUUID()); + insertBo.setEnterpriseName(record.getEnterpriseName()); + insertBo.setEnterpriseNumber(enterpriseNumber); + insertBo.setSalt(PasswordTools.encrypt(enterpriseNumber)); + insertBo.setEnterpriseType("送码入企"); + insertBo.setIsUnsubscribe(0L); + insertBo.setIsDelete(0L); + enterpriseInformationService.insertByBo(insertBo); + targetId = insertBo.getId(); + } + } else { + targetId = existingInfo.getId(); + } + + // 强制生成二维码（企业已确保存在） try { QrCodeGenerateHistoryVo historyVo = enterpriseInformationService.forceGenerateQrCode( "zfjd", enterpriseNumber, "EntPubQrcodeService", "送码入企"); @@ -430,13 +470,8 @@ public class EnterprisePubQrcodeServiceImpl implements IEnterprisePubQrcodeServi throw new ServiceException("强制匹配失败: " + e.getMessage()); } - // 查询本地企业信息获取ID - EnterpriseInformationVo infoVo = enterpriseInformationService.queryByEnterpriseNumber(enterpriseNumber); - if (infoVo != null) { - record.setMatchingToType("本地数据源"); - record.setMatchingToId(infoVo.getId()); - } - + record.setMatchingToType("本地数据源"); + record.setMatchingToId(targetId); baseMapper.updateById(record); return "强制匹配成功"; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationReportMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationReportMapper.xml index 3752f130..b7d9a531 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationReportMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationReportMapper.xml @@ -411,10 +411,12 @@ AND er.law_enforcement_item_text LIKE CONCAT('%', #{bo.lawEnforcementItemText}, '%') - AND er.district = #{bo.district} + AND (er.enterprise_address LIKE CONCAT('深圳市', SUBSTRING_INDEX(#{bo.district}, '区', 1), '区%') + OR er.enterprise_address LIKE CONCAT('深圳市', SUBSTRING_INDEX(#{bo.district}, '区', 1), '新区%')) - AND er.street = #{bo.street} + AND (er.enterprise_address LIKE CONCAT('深圳市', SUBSTRING_INDEX(#{bo.district}, '区', 1), '区', #{bo.street}, '%') + OR er.enterprise_address LIKE CONCAT('深圳市', SUBSTRING_INDEX(#{bo.district}, '区', 1), '新区', #{bo.street}, '%')) AND DATE_FORMAT(er.enforcement_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m') @@ -530,10 +532,12 @@ AND er.law_enforcement_item_text LIKE CONCAT('%', #{bo.lawEnforcementItemText}, '%') - AND er.district = #{bo.district} + AND (er.enterprise_address LIKE CONCAT('深圳市', SUBSTRING_INDEX(#{bo.district}, '区', 1), '区%') + OR er.enterprise_address LIKE CONCAT('深圳市', SUBSTRING_INDEX(#{bo.district}, '区', 1), '新区%')) - AND er.street = #{bo.street} + AND (er.enterprise_address LIKE CONCAT('深圳市', SUBSTRING_INDEX(#{bo.district}, '区', 1), '区', #{bo.street}, '%') + OR er.enterprise_address LIKE CONCAT('深圳市', SUBSTRING_INDEX(#{bo.district}, '区', 1), '新区', #{bo.street}, '%')) AND DATE_FORMAT(er.enforcement_time, '%Y-%m-%d') >= #{bo.beginTime} diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/enterprise_pub_qrcode/index.vue b/zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/enterprise_pub_qrcode/index.vue index bbd76d38..ab2de51e 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/enterprise_pub_qrcode/index.vue +++ b/zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/enterprise_pub_qrcode/index.vue @@ -1,5 +1,5 @@