Merge branch 'V0.0.5' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.0.5

project_data/sql/0.0.5/soc/soc.sql

@@ -65,4 +65,15 @@ END ??
 DELIMITER;
 CALL schema_change ();
 
-update sys_menu set component='safetycheck/plan/index' WHERE menu_name='检查任务下发' and menu_type='C' and platform_type='1';
+update sys_menu set component='safetycheck/plan/index' WHERE menu_name='检查任务下发' and menu_type='C' and platform_type='1';
+delete from sys_menu where id=1734903034555719682;
+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 (1734903034555719682, '导出安全保卫工作情况统计', 103, 8, '', null, null, 1, 0, 'F', '0', '0', 'system:dept:exportConstructionDetails', '1', null, null, null, now(), '', null, '');
+delete from sys_role_menu where menu_id =1734903034555719682;
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (114, 1734903034555719682);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (115, 1734903034555719682);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (116, 1734903034555719682);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (117, 1734903034555719682);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (118, 1734903034555719682);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (119, 1734903034555719682);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (120, 1734903034555719682);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -813,7 +813,6 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
             tMonitoringRetrievalPlan.setIsDeleted(2L);
             tMonitoringRetrievalPlan.setId(id);
             TMonitoringRetrievalPlan monitoringRetrievalPlan = tMonitoringRetrievalPlanMapper.selectById(id);
-
       /*      List<CoreMonitoringRetrievalTask> coreMonitoringRetrievalTasks = iCoreMonitoringRetrievalTaskService.selectComplete(id);
             if (CollectionUtils.isNotEmpty(coreMonitoringRetrievalTasks)) {
                 throw new ServiceException("计划有已完成或者已逾期的任务，不能被删除。");

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

@@ -346,7 +346,13 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
                     }
                 }, threadPoolTaskExecutor);
             }
-
+        } else {
+            //使用中 状态，支持编辑名称,所以这里只需要修改计划名称就行了
+            this.update(new LambdaUpdateWrapper<CoreDrillPlan>().in(CoreDrillPlan::getId, list)
+                    .set(CoreDrillPlan::getPlanName, plan.getPlanName())
+                    .set(CoreDrillPlan::getUpdateTime, new Date())
+                    .set(CoreDrillPlan::getUpdateBy, String.valueOf(SecurityUtils.getLoginUser().getSysUser().getId()))
+            );
         }
 
     }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingPlanServiceImpl.java

@@ -337,7 +337,7 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
             coreEduTrainingTaskService.delByStartTimeAndEndTimeAndPlanIdList(list, null, null);
             //使用中 状态，支持编辑名称,所以这里只需要修改计划名称就行了
             this.update(new LambdaUpdateWrapper<CoreEduTrainingPlan>().in(CoreEduTrainingPlan::getId, list)
-                    .set(CoreEduTrainingPlan::getPlanName, plan.getPlanName())
+                    .set(CoreEduTrainingPlan::getPlanName, request.getPlanName())
                     .set(CoreEduTrainingPlan::getUpdateTime, new Date())
                     .set(CoreEduTrainingPlan::getUpdateBy, String.valueOf(SecurityUtils.getLoginUser().getSysUser().getId()))
             );
@@ -352,7 +352,13 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
                     }
                 }, threadPoolTaskExecutor);
             }
-
+        } else {
+            //使用中 状态，支持编辑名称,所以这里只需要修改计划名称就行了
+            this.update(new LambdaUpdateWrapper<CoreEduTrainingPlan>().in(CoreEduTrainingPlan::getId, list)
+                    .set(CoreEduTrainingPlan::getPlanName, request.getPlanName())
+                    .set(CoreEduTrainingPlan::getUpdateTime, new Date())
+                    .set(CoreEduTrainingPlan::getUpdateBy, String.valueOf(SecurityUtils.getLoginUser().getSysUser().getId()))
+            );
         }
 
     }
@@ -458,7 +464,7 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
 
             List<CoreEduTrainingPlan> planList = null;
             if (plan.getIssue() == 1) {
-                planList = buildPlanData(plan, null, false,0);
+                planList = buildPlanData(plan, null, false, 0);
             } else {
                 planList = ListUtil.list(true, plan);
             }
@@ -687,7 +693,7 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
                 .eq(CoreEduTrainingPlan::getParentId, planId)
                 .select(CoreEduTrainingPlan::getId).list();
         if (planList.isEmpty()) {
-            planList = buildPlanData(plan, new ArrayList<>(), true,status);
+            planList = buildPlanData(plan, new ArrayList<>(), true, status);
         } else {
             planList.forEach(plan1 -> plan1.setPlanStatus(EduTrainingPlanStatus.USING.getCode()));
             List<Long> collect = planList.stream().map(CoreEduTrainingPlan::getId).collect(Collectors.toList());
@@ -696,7 +702,7 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
         //下发后修改为使用中
         plan.setPlanStatus(EduTrainingPlanStatus.USING.getCode());
         plan.setIssue(1);
-       this.updatePlanTime(plan,status);
+        this.updatePlanTime(plan, status);
         this.updateById(plan);
         if (ObjectUtil.equal(status, 1)) {
             //status=1:立即生效  status=0:下周期生效
@@ -751,7 +757,7 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
         return collect;
     }
 
-    private List<CoreEduTrainingPlan> buildPlanData(CoreEduTrainingPlan plan, List<CoreEduTrainingPlanToRole> planRoleList, Boolean isPublish,int  status) {
+    private List<CoreEduTrainingPlan> buildPlanData(CoreEduTrainingPlan plan, List<CoreEduTrainingPlanToRole> planRoleList, Boolean isPublish, int status) {
         /*if (ObjectUtil.isEmpty(planRoleList)) {
             //获取执行角色
             LambdaQueryWrapper<CoreEduTrainingPlanToRole> ros = new LambdaQueryWrapper<>();
@@ -797,7 +803,7 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
             coreEduTrainingPlan.setParentId(plan.getId());
             coreEduTrainingPlan.setCreateTime(new Date());
             coreEduTrainingPlan.setUpdateTime(new Date());
-            this.updatePlanTime(coreEduTrainingPlan,status);
+            this.updatePlanTime(coreEduTrainingPlan, status);
             list.add(coreEduTrainingPlan);
 
             if (ObjectUtil.isNotEmpty(planExecOrgList)) {