需求变更

project_data/sql/0.0.3/soc/soc.sql

@@ -486,6 +486,12 @@ DELETE FROM `sys_menu` WHERE id in (1719662219582926849,1719663201104588802,2355
 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 (01719662219582926849, '整改情况跟踪', 2350, 2, 'reform', 'question/reform/index', NULL, 1, 0, 'C', '0', '0', 'question:reform', '1', 'post', NULL, 'jwx', '2023-11-01 18:27:01', '', NULL, '');
 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 (01719663201104588802, '查询', 1719662219582926849, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'question:reform:query', '1', NULL, NULL, '超级管理员', '2023-11-01 18:30:55', '', NULL, '');
 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 (00000000000000002355, '整改', 1719662219582926849, 2, '', NULL, NULL, 1, 0, 'F', '0', '0', 'question:reform:reform', '1', '#', NULL, '超级管理员', '2023-09-23 16:30:16', '超级管理员', '2023-11-01 18:31:21', '');
+-- 安全检查字典变更
+DELETE FROM `sys_dict_data` WHERE `dict_type`='safety_check_status';
+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', 'safety_check_status', NULL, 'default', 'N', '0', '超级管理员', '2023-09-21 10:44:18', '', 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', 'safety_check_status', NULL, 'default', 'N', '0', '超级管理员', '2023-09-21 10:44:29', '', 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 ( 3, '已完成', '3', 'safety_check_status', NULL, 'default', 'N', '0', '超级管理员', '2023-09-21 10:44:36', '省联社账号', '2023-11-03 10:53:52', 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', 'safety_check_status', NULL, 'default', 'N', '0', '超级管理员', '2023-09-21 10:44:43', '', NULL, NULL);
 
 
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/CoreSafecheckPlanServiceImpl.java

@@ -504,7 +504,9 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
                 coreSafecheckPlanToExecOrgMapper.deleteCoreSafecheckPlanToExecOrgByPlanId(plan.getId());
                 coreSafecheckPlanToCheckOrgMapper.deleteCoreSafecheckPlanToCheckOrgByPlanId(plan.getId());
                 coreSafecheckPlanToPointMapper.deleteCoreSafecheckPlanToPointByPlanId(plan.getId());
+                coreSafetyTaskMapper.delete(new LambdaQueryWrapper<CoreSafetyTask>().eq(CoreSafetyTask::getPlanId, plan.getId()));
             }
+            coreSafetyTaskMapper.delete(new LambdaQueryWrapper<CoreSafetyTask>().eq(CoreSafetyTask::getPlanId, l));
         }
         //清理关联数据
         coreSafecheckPlanToRoleMapper.deleteCoreSafecheckPlanToRoleByPlanIds(ids);