Merge remote-tracking branch 'origin/dev_1.1.2' into dev_1.1.2

sop-api/src/main/java/com/qmth/sop/server/api/ServiceUnitAnalyseController.java

@@ -78,7 +78,7 @@ public class ServiceUnitAnalyseController {
     }
 
     @ApiOperation(value = "详情导出")
-    @RequestMapping(value = "/export", method = RequestMethod.POST)
+    @RequestMapping(value = "/detail/export", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "返回信息", response = Object.class) })
     @OperationLog(logType = LogTypeEnum.EXPORT)
     public void export(@ApiParam(value = "服务单元ID", required = true) @RequestParam(required = true) Long serviceUnitId,

sop-business/src/main/resources/db/log/haoguanghui_update_log.sql

@@ -52,4 +52,40 @@ INSERT INTO sys_privilege(`id`, `name`, `url`, `type`, `parent_id`, `sequence`,
 INSERT INTO sys_privilege(`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (291, '客户表查询', '/api/sys/custom/list/by/serviceUnit', 'URL', 64, 34, 'SYS', NULL, 1, 1, 0);
 
 -- 2024-09-18
-update sys_privilege set property='SYS' where id=426;
+update sys_privilege set property='SYS' where id=426;
+
+
+
+-- 以下为数据驾驶舱相关脚本
+
+-- 2024-09-20
+-- 删除以前的关联
+delete from sys_privilege where id in (1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,1072) and parent_id=1102;
+delete from sys_privilege where id in (1094,1095,1097) and parent_id=1104;
+delete from sys_privilege where id in (1057,1058,1059,1060,1061) and parent_id=1103;
+
+-- 服务单元、项目进度监控、sop预警报表脚本
+INSERT INTO sys_privilege(`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1140, '查询条件', 'Condition', 'CONDITION', 1102, 1, 'AUTH', '1146,1147,1148', 1, 0, 1);
+INSERT INTO sys_privilege(`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1141, '查询', 'Select', 'BUTTON', 1102, 1, 'AUTH', '1146,1147,1148', 1, 0, 1);
+INSERT INTO sys_privilege(`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1142, '列表', 'List', 'LIST', 1102, 1, 'AUTH', '1146,1147,1148', 1, 1, 1);
+INSERT INTO sys_privilege(`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1143, '详情', 'Detail', 'LINK', 1102, 1, 'AUTH', '1149,1150', 1, 1, 1);
+INSERT INTO sys_privilege(`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1146, '服务单元概况接口', '/api/admin/service/analyse/overview', 'URL', 1102, 1, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO sys_privilege(`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1147, '项目整体进度接口', '/api/admin/service/analyse/progress', 'URL', 1102, 2, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO sys_privilege(`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1148, '区域概况接口', '/api/admin/service/analyse/province', 'URL', 1102, 3, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO sys_privilege(`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1149, '详情接口', '/api/admin/service/analyse/detail', 'URL', 1102, 4, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO sys_privilege(`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1150, '导出接口', '/api/admin/service/analyse/detail/export', 'URL', 1102, 5, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO sys_privilege(`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1151, '查询条件', 'Condition', 'CONDITION', 1104, 1, 'AUTH', '1155,1156,1157', 1, 0, 1);
+INSERT INTO sys_privilege(`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1152, '查询', 'Select', 'BUTTON', 1104, 1, 'AUTH', '1155,1156,1157', 1, 0, 1);
+INSERT INTO sys_privilege(`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1153, '列表', 'List', 'LIST', 1104, 1, 'AUTH', '1155,1156,1157', 1, 1, 1);
+INSERT INTO sys_privilege(`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1154, '详情', 'Detail', 'LINK', 1104, 1, 'AUTH', '1149,1150', 1, 1, 1);
+INSERT INTO sys_privilege(`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1155, '按大区进度统计接口', '/api/admin/crm/process/monitor/region', 'URL', 1104, 1, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO sys_privilege(`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1156, '按人力商进度统计接口', '/api/admin/crm/process/monitor/supplier', 'URL', 1104, 2, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO sys_privilege(`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1157, '按区域协调人进度统计接口', '/api/admin/crm/process/monitor/coordinator', 'URL', 1104, 3, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO sys_privilege(`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1160, '查询条件', 'Condition', 'CONDITION', 1103, 1, 'AUTH', '1164,1165,1166', 1, 0, 1);
+INSERT INTO sys_privilege(`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1161, '查询', 'Select', 'BUTTON', 1103, 1, 'AUTH', '1164,1165,1166', 1, 0, 1);
+INSERT INTO sys_privilege(`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1162, '列表', 'List', 'LIST', 1103, 1, 'AUTH', '1164,1165,1166', 1, 1, 1);
+INSERT INTO sys_privilege(`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1163, '详情', 'Detail', 'LINK', 1103, 1, 'AUTH', '1149,1150', 1, 1, 1);
+INSERT INTO sys_privilege(`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1164, '按大区预警统计接口', '/api/admin/sop/warn/monitor/region', 'URL', 1103, 1, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO sys_privilege(`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1165, '按人力商预警统计接口', '/api/admin/sop/warn/monitor/supplier', 'URL', 1103, 2, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO sys_privilege(`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1166, '按区域协调人预警统计接口', '/api/admin/sop/warn/monitor/coordinator', 'URL', 1103, 3, 'AUTH', NULL, 1, 1, 1);
+