教育培训代码提交

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

@@ -85,8 +85,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
     private ICoreEduTrainingTaskToUserService coreEduTrainingTaskToUserService;
     @Autowired
     private CoreEduTrainingPlanMapper coreEduTrainingPlanMapper;
-    @Autowired
-    private ICoreEduTrainingPlanService planService;
+
 
     @Override
     public TableDataInfo<CoreEduTrainingTaskPageVo> selectPage(CoreEduTrainingTaskPageDto request) {
@@ -212,8 +211,8 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         taskToUserMapper.deleteByMap(MapUtil.of("edu_training_task_id", request.getId()));
         BeanUtils.copyProperties(request, coreEduTrainingTask);
         coreEduTrainingTask.setRecorderId(SecurityUtils.getUserId());
-//        coreEduTrainingTask.setImageList(request.getImageList());
-//        coreEduTrainingTask.setImageList(ObjectUtil.isNotEmpty(request.getImageList()) ? JSON.toJSONString(request.getImageList()) : null);
+        //主持人默认取网点负责人,具体还没落实,暂时处理成这样   TODO
+        coreEduTrainingTask.setHostId(SecurityUtils.getUserId());
         List<CoreEduTrainingTaskToUser> taskUserList = request.getTaskUserList();
         if (taskUserList != null && taskUserList.size() > 0) {
             for (CoreEduTrainingTaskToUser taskToUser : taskUserList) {
@@ -509,7 +508,9 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         //此list中Plan对象仅id与planCycle字段有值，
         for (CoreEduTrainingPlan plan : planList) {
             CompletableFuture.runAsync(() -> {
-                CoreEduTrainingPlanDataVo detailPlanData = planService.getCoreEduTrainingPlanDataVo(plan.getId());
+                //此处因为planService会导致循环依赖
+                final CoreEduTrainingPlanDataVo detailPlanData = coreEduTrainingPlanMapper.getDetailPlanData(plan.getId());
+                detailPlanData.setFileList(ObjectUtil.isNotEmpty(detailPlanData.getFile()) ? JSON.parseArray(detailPlanData.getFile(), String.class) : null);
                 DateRange range = DateUtils.getStartAndEnd(finalDate, plan.getPlanCycle());
                 this.createTaskForNow(detailPlanData, range.getStartTime(), range.getEndTime());
             });