sql脚本更新

project_data/sql/0.0.2/soc/soc.sql

@@ -127,13 +127,22 @@ CALL schema_change();
 -- 新增演练任务推荐状态字典
 delete from sys_dict_type where dict_type='drill_task_rec_status';
 delete from sys_dict_data where dict_type='drill_task_rec_status';
-INSERT INTO sys_dict_type ( dict_name, dict_type, status, create_by, create_time, update_by, update_time, remark) VALUES ( '演练任务推荐状态', 'drill_task_rec_status', '0', '超级管理员', now(), '', null, null);
-INSERT INTO sys_dict_data ( dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES ( 0, '正常案例', '0', 'drill_task_rec_status', null, 'default', 'N', '0', '超级管理员', now(), '超级管理员', now(), null);
-INSERT INTO sys_dict_data ( dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES ( 0, '行社优秀案例', '1', 'drill_task_rec_status', null, 'default', 'N', '0', '超级管理员', now(), '超级管理员', now(), null);
-INSERT INTO sys_dict_data ( dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES ( 0, '已推荐地区优秀案例', '2', 'drill_task_rec_status', null, 'default', 'N', '0', '超级管理员', now(), '', null, null);
-INSERT INTO sys_dict_data ( dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES ( 0, '地区优秀案例', '3', 'drill_task_rec_status', null, 'default', 'N', '0', '超级管理员', now(), '', null, null);
-INSERT INTO sys_dict_data ( dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES ( 0, '已推荐省级优秀案例', '4', 'drill_task_rec_status', null, 'default', 'N', '0', '超级管理员', now(), '', null, null);
-INSERT INTO sys_dict_data ( dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES ( 0, '省级优秀案例', '5', 'drill_task_rec_status', null, 'default', 'N', '0', '超级管理员', now(), '', null, null);
+INSERT INTO sys_dict_type (dict_name, dict_type, status, create_by, create_time, update_by, update_time, remark) VALUES ( '演练任务推荐状态', 'drill_task_rec_status', '0', '超级管理员', now(), '', null, null);
+INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (0, '正常案例', '0', 'drill_task_rec_status', null, 'default', 'N', '0', '超级管理员', now(), '超级管理员', now(), null);
+INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (0, '行社优秀案例', '1', 'drill_task_rec_status', null, 'default', 'N', '0', '超级管理员', now(), '超级管理员', now(), null);
+INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (0, '已推荐地区优秀案例', '2', 'drill_task_rec_status', null, 'default', 'N', '0', '超级管理员', now(), '', null, null);
+INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (0, '地区优秀案例', '3', 'drill_task_rec_status', null, 'default', 'N', '0', '超级管理员', now(), '', null, null);
+INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (0, '已推荐省级优秀案例', '4', 'drill_task_rec_status', null, 'default', 'N', '0', '超级管理员', now(), '', null, null);
+INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (0, '省级优秀案例', '5', 'drill_task_rec_status', null, 'default', 'N', '0', '超级管理员', now(), '', null, null);
+-- 新增演练任务状态字典
+delete from sys_dict_type where dict_type='drill_task_status';
+delete from sys_dict_data where dict_type='drill_task_status';
+INSERT INTO sys_dict_type (dict_name, dict_type, status, create_by, create_time, update_by, update_time, remark) VALUES ('预案演练任务状态', 'drill_task_status', '0', '超级管理员', '2023-09-20 16:06:14', '', null, null);
+INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (0, '待演练', '0', 'drill_task_status', null, 'default', 'N', '0', '超级管理员', '2023-09-20 16:06:46', '', null, null);
+INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (1, '待签名', '1', 'drill_task_status', null, 'default', 'N', '0', '超级管理员', '2023-09-20 16:06:56', '', null, null);
+INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (2, '待评价', '2', 'drill_task_status', null, 'default', 'N', '0', '超级管理员', '2023-09-20 16:07:05', '超级管理员', '2023-09-20 16:07:30', null);
+INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (3, '已完成', '3', 'drill_task_status', null, 'default', 'N', '0', '超级管理员', '2023-09-20 16:07:13', '', null, null);
+INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (4, '已逾期', '4', 'drill_task_status', null, 'default', 'N', '0', '超级管理员', '2023-09-20 16:07:23', '', null, null);
 
 
 -- 公告通知start
@@ -335,11 +344,38 @@ INSERT INTO `core_weather_city`(`AREACODE`, `AREAID`, `NAMEEN`, `NAMECN`, `DISTR
 
 -- 天气预警end
 
--- 预案演练菜单
+-- Web预案演练菜单
 delete from sys_menu where menu_name in ('预案演练管理','演练库管理','演练计划管理','演练任务管理');
-INSERT INTO sys_menu (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 ('演练任务管理', 2205, 3, '/drillTask', 'core/drill/task/index', null, 1, 0, 'C', '0', '0', 'core:drillTask:list', '1', 'druid', null, '超级管理员', now(), '', null, '');
-INSERT INTO sys_menu (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 ('演练计划管理', 2205, 2, '/drillPlan', 'core/drill/plan/index', null, 1, 0, 'C', '0', '0', 'core:drillPlan:list', '1', 'documentation', null, '超级管理员', now(), '', null, '');
-INSERT INTO sys_menu (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 ('演练库管理', 2205, 1, '/dictionary', 'core/drill/drillDictionary/index', null, 1, 0, 'C', '0', '0', 'core:drillDictionary:list', '1', 'component', null, '超级管理员', now(), '超级管理员', now(), '');
 INSERT INTO sys_menu (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 ('预案演练管理', 0, 6, '/drill', null, null, 1, 0, 'M', '0', '0', null, '1', 'dashboard', null, '超级管理员', now(), '', null, '');
+INSERT INTO sys_menu (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 ('演练库管理', 2205, 1, '/dictionary', 'core/drill/drillDictionary/index', null, 1, 0, 'C', '0', '0', 'core:drillDictionary:list', '1', 'component', null, '超级管理员', now(), '超级管理员', now(), '');
+INSERT INTO sys_menu (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 ('演练计划管理', 2205, 2, '/drillPlan', 'core/drill/plan/index', null, 1, 0, 'C', '0', '0', 'core:drillPlan:list', '1', 'documentation', null, '超级管理员', now(), '', null, '');
+INSERT INTO sys_menu (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 ('演练任务管理', 2205, 3, '/drillTask', 'core/drill/task/index', null, 1, 0, 'C', '0', '0', 'core:drillTask:list', '1', 'druid', null, '超级管理员', now(), '', null, '');
+
+
+-- Web演练库按钮及权限
+delete from sys_menu where menu_name in ('演练库新增','演练库查询','演练库编辑','演练库详情','演练库删除');
+INSERT INTO sys_menu (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 ('演练库新增', 2206, 1, '', null, null, 1, 0, 'F', '0', '0', 'core:drillDictionary:add', '1', '#', null, '超级管理员', now(), '', null, '');
+INSERT INTO sys_menu (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 ('演练库查询', 2206, 2, '', null, null, 1, 0, 'F', '0', '0', 'core:drillDictionary:list', '1', '#', null, '超级管理员', now(), '', null, '');
+INSERT INTO sys_menu (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 ('演练库编辑', 2206, 3, '', null, null, 1, 0, 'F', '0', '0', 'core:drillDictionary:edit', '1', '#', null, '超级管理员', now(), '', null, '');
+INSERT INTO sys_menu (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 ('演练库详情', 2206, 4, '', null, null, 1, 0, 'F', '0', '0', 'core:drillDictionary:query', '1', '#', null, '超级管理员', now(), '', null, '');
+INSERT INTO sys_menu (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 ('演练库删除', 2206, 5, '', null, null, 1, 0, 'F', '0', '0', 'core:drillDictionary:remove', '1', '#', null, '超级管理员', now(), '', null, '');
+-- Web演练计划按钮及权限
+delete from sys_menu where menu_name in ('演练计划新增','演练计划列表','演练计划下发','演练计划编辑','演练计划删除');
+INSERT INTO sys_menu (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 ('演练计划新增', 2209, 1, '', null, null, 1, 0, 'F', '0', '0', 'core:drillPlan:add', '1', null, null, '超级管理员', now(), '超级管理员', now(), '');
+INSERT INTO sys_menu (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 ('演练计划列表', 2209, 2, '', null, null, 1, 0, 'F', '0', '0', 'core:drillPlan:list', '1', null, null, '超级管理员', now(), '', null, '');
+INSERT INTO sys_menu (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 ('演练计划下发', 2209, 3, '', null, null, 1, 0, 'F', '0', '0', 'core:drillPlan:publish', '1', null, null, '超级管理员', now(), '超级管理员', now(), '');
+INSERT INTO sys_menu (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 ('演练计划编辑', 2209, 4, '', null, null, 1, 0, 'F', '0', '0', 'core:drillPlan:edit', '1', null, null, '超级管理员', now(), '', null, '');
+INSERT INTO sys_menu (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 ('演练计划删除', 2209, 5, '', null, null, 1, 0, 'F', '0', '0', 'core:drillPlan:remove', '1', null, null, '超级管理员', now(), '', null, '');
+-- Web演练任务按钮及权限
+delete from sys_menu where menu_name in ('演练任务登记','演练任务详情','演练任务签名','演练任务评价');
+INSERT INTO sys_menu (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 ('演练任务评价', 2210, 4, '', null, null, 1, 0, 'F', '0', '0', 'core:drillTask:evaluate', '1', '#', null, '超级管理员', now(), '', null, '');
+INSERT INTO sys_menu (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 ('演练任务签名', 2210, 3, '', null, null, 1, 0, 'F', '0', '0', 'core:drillTask:sign', '1', '#', null, '超级管理员', now(), '', null, '');
+INSERT INTO sys_menu (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 ('演练任务详情', 2210, 2, '', null, null, 1, 0, 'F', '0', '0', 'core:drillTask:query', '1', '#', null, '超级管理员', now(), '', null, '');
+INSERT INTO sys_menu (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 ('演练任务登记', 2210, 1, '', null, null, 1, 0, 'F', '0', '0', 'core:drillTask:edit', '1', '#', null, '超级管理员', now(), '', null, '');
+-- App端预案演练登记菜单目录
+delete from sys_menu where menu_name in ('演练','演练登记','演练统计排名');
+INSERT INTO sys_menu (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 ('演练', 0, 12, '/', null, null, 1, 0, 'M', '0', '0', null, '0', '#', null, '超级管理员', now(), '', null, '');
+INSERT INTO sys_menu (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 ('演练登记', 2211, 1, '/rehearsalTask', null, null, 1, 0, 'C', '0', '0', '', '0', '#', null, '超级管理员', now(), '超级管理员', now(), '');
+INSERT INTO sys_menu (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 ('演练统计排名', 2211, 1, '/drillStatistics', null, null, 1, 0, 'C', '0', '0', null, '0', '#', null, '超级管理员', now(), '', null, '');
 
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillTaskServiceImpl.java

@@ -461,16 +461,16 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
                 .eq(CoreDrillTaskToUser::getType, 1)
                 .eq(CoreDrillTaskToUser::getSign, 0));
         if (null == unSignNums || unSignNums == 0) {
-            DrillTask.setStatus(DrillDoStatus.DONE.getCode());
+            DrillTask.setStatus(DrillDoStatus.WAIT_COMMENT.getCode());
             coreDrillTaskMapper.updateById(DrillTask);
         }
-        final List<CoreDrillTaskToUser> taskToUserList = taskToUserMapper.selectList(new LambdaUpdateWrapper<CoreDrillTaskToUser>()
+       /* final List<CoreDrillTaskToUser> taskToUserList = taskToUserMapper.selectList(new LambdaUpdateWrapper<CoreDrillTaskToUser>()
                 .eq(CoreDrillTaskToUser::getDrillTaskId, request.getId()));
         //如果存在用户数据,筛选出参与人员中签名图片为空的数据,如果count等于0说明全部签名完成
         final long count = taskToUserList.stream().filter(user -> ObjectUtil.equal(user.getType(), 1) && ObjectUtil.equal(user.getSign(), 0)).count();
         if (ObjectUtil.isNotEmpty(taskToUserList) && count < 1) {
             buildEduPdf(request.getId());
-        }
+        }*/
         return sign;
     }