教培计划代码提交

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/controller/CoreEduTrainingPlanController.java

@@ -81,9 +81,9 @@ public class CoreEduTrainingPlanController extends BaseController {
     @ApiOperation(value = "删除CoreEduTrainingPlan")
     @RequiresPermissions("core:plan:remove")
     @Log(title = "教育培训计划", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long ids) {
-        return toAjax(coreEduTrainingPlanService.deleteCoreEduTrainingPlanByIds(ids));
+    @DeleteMapping("/{id}")
+    public AjaxResult remove(@PathVariable(value = "id") Long id) {
+        return toAjax(coreEduTrainingPlanService.deleteCoreEduTrainingPlanByIds(id));
     }
 
     /**

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

@@ -119,6 +119,10 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
             child.setPlanRoleNameList(roleNameList);
         }
 
+        if (record.getStandard() == 1) {
+            final Integer done = coreEduTrainingTaskMapper.checkHasTaskIsDoneByPlanParentId(record.getId());
+            record.setDone(done);
+        }
     }
 
 
@@ -433,10 +437,9 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
                     .select(CoreEduTrainingTask::getId));
             final List<Long> taskIdList = coreEduTrainingTasks.stream().map(CoreEduTrainingTask::getId).collect(Collectors.toList());
             //删除任务相关
-            if (ObjectUtil.isNotEmpty(taskIdList)){
+            if (ObjectUtil.isNotEmpty(taskIdList)) {
                 coreEduTrainingTaskMapper.deleteBatchIds(taskIdList);
-                coreEduTrainingTaskToRoleMapper.deleteByMap(MapUtil.of("edu_training_task_id", taskIdList));
-                return coreEduTrainingPlanMapper.deleteBatchIds(Collections.singletonList((id)));
+                coreEduTrainingTaskToRoleMapper.delete(new LambdaQueryWrapper<CoreEduTrainingTaskToRole>().in(CoreEduTrainingTaskToRole::getEduTrainingTaskId, taskIdList));
             }
             //删除计划
             return coreEduTrainingPlanMapper.deleteBatchIds(Collections.singletonList((id)));
@@ -449,9 +452,9 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
                         .in(CoreEduTrainingTask::getPlanId, planIdList)
                         .select(CoreEduTrainingTask::getId));
                 final List<Long> taskIdList = trainingTaskList.stream().map(CoreEduTrainingTask::getId).collect(Collectors.toList());
-                if (ObjectUtil.isNotEmpty(taskIdList)){
+                if (ObjectUtil.isNotEmpty(taskIdList)) {
                     coreEduTrainingTaskMapper.deleteBatchIds(taskIdList);
-                    coreEduTrainingTaskToRoleMapper.deleteByMap(MapUtil.of("edu_training_task_id", taskIdList));
+                    coreEduTrainingTaskToRoleMapper.delete(new LambdaQueryWrapper<CoreEduTrainingTaskToRole>().in(CoreEduTrainingTaskToRole::getEduTrainingTaskId, taskIdList));
                 }
             }
             //删除计划