修bug

project_data/sql/0.0.3/soc/soc.sql

@@ -582,14 +582,21 @@ ALTER TABLE `core_protection_log`
 MODIFY COLUMN `status_updator_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '上报人姓名' AFTER `status_updator_id`;
 -- 修改安全指数机构分数表机构path字段长度
 alter table core_safe_month_score modify org_path varchar(225) null comment '机构path';
-DELETE FROM sys_menu WHERE id IN(01719287834364436482,01719288533101928450,01719892877586239490);
+DELETE FROM sys_menu WHERE id IN(01719287834364436482,01719288533101928450,01719892877586239490,01720000571298115585);
 INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
 VALUES (01719287834364436482, '统计报表', 0, 1, 'reportForms', NULL, NULL, 1, 0, 'M', '0', '0', 'core:send:list', '1', 'chart', NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
 INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
 VALUES (01719288533101928450, '安全检查统计报表', 1719287834364436482, 1, 'core/reportForms', 'core/reportForms/safetyInspectReport', NULL, 1, 1, 'C', '0', '0', 'core:safetyInspectReport:list', '1', 'chart', NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
 INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
-VALUES (01719892877586239490, '外包履职评价统计表', 1719287834364436482, 1, 'evaluateTable', 'evaluateTable/index', NULL, 1, 1, 'C', '0', '0', 'core:safetyInspectReport:list', '1', 'chart', NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
-delete from sys_role_menu where menu_id IN(01719287834364436482,01719288533101928450,01719892877586239490);
+VALUES (01719892877586239490, '外包履职评价统计表', 1719287834364436482, 2, 'evaluateTable', 'evaluateTable/index', NULL, 1, 1, 'C', '0', '0', 'core:safetyInspectReport:list', '1', 'chart', NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
+INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
+VALUES (01720000571298115585, '监控调阅统计报表', 1719287834364436482, 3, 'core', 'core/reportForms/monitorAccessReport', NULL, 1, 1, 'C', '0', '0', 'core:monitorAccessReport:list', '1', 'chart', NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
+
+delete from sys_role_menu where menu_id IN(01719287834364436482,01719288533101928450,01719892877586239490,01720000571298115585);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 01720000571298115585);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (120, 01720000571298115585);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (121, 01720000571298115585);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (122, 01720000571298115585);
 
 INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 01719287834364436482);
 INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (120, 01719287834364436482);
@@ -661,6 +668,44 @@ INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `co
 VALUES (01717076927401005058, '评价计划管理', 01720259442805620738, 1, 'resumption', 'resumptionEvaluate/evaluate/index', NULL, 1, 1, 'C', '0', '0', 'core:evaluatePlan:list', '1', 'excel', NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
 INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
 VALUES (01717079254782545922, '外包评价', 01720259442805620738, 2, 'wbpj', 'resumptionEvaluate/evaluatePlan/index', NULL, 1, 1, 'C', '0', '0', 'core:evaluateTask:list', '1', 'checkbox', NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
+
+DELETE from `sys_role_menu` WHERE `menu_id` in(01720259442805620738,01717076927401005058,01717079254782545922);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (114, 01720259442805620738);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (115, 01720259442805620738);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (116, 01720259442805620738);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (117, 01720259442805620738);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (118, 01720259442805620738);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (119, 01720259442805620738);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (120, 01720259442805620738);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (121, 01720259442805620738);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (122, 01720259442805620738);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (128, 01720259442805620738);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (129, 01720259442805620738);
+
+
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (114, 01717076927401005058);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (115, 01717076927401005058);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (116, 01717076927401005058);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (117, 01717076927401005058);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (118, 01717076927401005058);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (119, 01717076927401005058);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (120, 01717076927401005058);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (121, 01717076927401005058);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (122, 01717076927401005058);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (128, 01717076927401005058);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (129, 01717076927401005058);
+
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (114, 01717079254782545922);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (115, 01717079254782545922);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (116, 01717079254782545922);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (117, 01717079254782545922);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (118, 01717079254782545922);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (119, 01717079254782545922);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (120, 01717079254782545922);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (121, 01717079254782545922);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (122, 01717079254782545922);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (128, 01717079254782545922);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (129, 01717079254782545922);
 -- 天气接口配置
 delete from sys_config where config_key='WEATHER_URL';
 INSERT INTO sys_config (config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark) VALUES (191, '天气接口', 'WEATHER_URL', 'https://ali-weather.showapi.com', 'Y', NULL, now(), NULL, now(), NULL);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/dto/EvaluateTaskStatisticsDTO.java

@@ -23,4 +23,5 @@ public class EvaluateTaskStatisticsDTO {
     @TableField(exist = false)
     @ApiModelProperty(value = "每页大小")
     private Long pageSize;
+    private Integer type;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/impl/CoreEvaluateTaskServiceImpl.java

@@ -117,6 +117,11 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
         }
         SysOrg sysOrg = remoteOrgService.selectSysOrgById(evaluateTaskStatisticsDTO.getOrgId(), SecurityConstants.INNER);
         evaluateTaskStatisticsDTO.setOrgPath(sysOrg.getPath());
+        if (sysOrg.getType().equals(1)){
+            evaluateTaskStatisticsDTO.setType(3);
+        }else {
+            evaluateTaskStatisticsDTO.setType(4);
+        }
         evaluateTaskStatisticsDTO.setOrgId(null);
         evaluateTaskStatisticsDTO.setOrgPath(null);
         List<LinkedHashMap> rows = baseMapper.statisticsAll(evaluateTaskStatisticsDTO);
@@ -133,6 +138,7 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
                     total += score;
                 }
                 rows.get(i).put("合计", total);
+                rows.get(i).put("平均值",total/contentByTaskId.size());
             }
         }
         return rows;

soc-modules/soc-modules-core/src/main/resources/mapper/evaluate/CoreEvaluateTaskMapper.xml

@@ -140,7 +140,7 @@
               ( b.content_type = 1, 0, SUM( b.score ) ) score
       FROM
           core_evaluate_task_user_content b
-              LEFT JOIN core_evaluate_task_user a ON a.id = b.task_user_id AND b.`code`!=1
+              LEFT JOIN core_evaluate_task_user a ON a.id = b.task_user_id AND b.`code`!=0
       WHERE
           a.id = #{id}
       GROUP BY
@@ -191,11 +191,15 @@
             d.score AS '被评价机构名称'
             FROM
             core_evaluate_task_user_content d LEFT JOIN
-            core_evaluate_task_user c ON d.task_user_id=c.id AND d.code=1 LEFT JOIN
+            core_evaluate_task_user c ON d.task_user_id=c.id AND d.code=0 LEFT JOIN
             core_evaluate_task a ON a.id=c.task_id
             LEFT JOIN core_evaluate_plan b ON a.plan_id = b.id
-            WHERE
-            a.`status` = 2
+        LEFT JOIN sys_org e ON e.id=a.org_id
+        WHERE
+        a.`status` = 2
+        <if test="request.type != null">
+            AND   e.type= #{request.type}
+        </if>
             <if test="request.orgPath != null  and request.orgPath != ''">
                 AND a.org_path like concat(#{request.orgPath}, '%')
             </if>

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysOrgServiceImpl.java

@@ -552,6 +552,9 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
     public SysOrg selectByShortName(String shortName) {
         List<SysOrg> sysOrgs = baseMapper.selectByShortName(shortName);
         if (!CollectionUtil.isEmpty(sysOrgs)) {
+            if(sysOrgs.size()>1){
+                throw new RuntimeException("机构名称重复，导入失败；请检查后重试");
+            }
             return sysOrgs.get(0);
         }
         return null;