|
@@ -4,14 +4,14 @@ import cn.hutool.core.bean.BeanUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
import com.zhongzheng.common.exception.CustomException;
|
|
import com.zhongzheng.common.exception.CustomException;
|
|
import com.zhongzheng.common.utils.DateUtils;
|
|
import com.zhongzheng.common.utils.DateUtils;
|
|
-import com.zhongzheng.modules.course.bo.CourseMenuAddBo;
|
|
|
|
-import com.zhongzheng.modules.course.bo.CourseMenuEditBo;
|
|
|
|
-import com.zhongzheng.modules.course.bo.CourseMenuListAddBo;
|
|
|
|
-import com.zhongzheng.modules.course.bo.CourseMenuQueryBo;
|
|
|
|
|
|
+import com.zhongzheng.modules.course.bo.*;
|
|
import com.zhongzheng.modules.course.domain.CourseMenu;
|
|
import com.zhongzheng.modules.course.domain.CourseMenu;
|
|
|
|
+import com.zhongzheng.modules.course.domain.CourseMenuExam;
|
|
import com.zhongzheng.modules.course.domain.CourseModuleBusiness;
|
|
import com.zhongzheng.modules.course.domain.CourseModuleBusiness;
|
|
|
|
+import com.zhongzheng.modules.course.domain.CourseModuleChapter;
|
|
import com.zhongzheng.modules.course.mapper.CourseChapterMapper;
|
|
import com.zhongzheng.modules.course.mapper.CourseChapterMapper;
|
|
import com.zhongzheng.modules.course.mapper.CourseMenuMapper;
|
|
import com.zhongzheng.modules.course.mapper.CourseMenuMapper;
|
|
|
|
+import com.zhongzheng.modules.course.service.ICourseMenuExamService;
|
|
import com.zhongzheng.modules.course.service.ICourseMenuService;
|
|
import com.zhongzheng.modules.course.service.ICourseMenuService;
|
|
import com.zhongzheng.modules.course.vo.CourseMenuVo;
|
|
import com.zhongzheng.modules.course.vo.CourseMenuVo;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -24,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import java.util.Collection;
|
|
import java.util.Collection;
|
|
import java.util.Collections;
|
|
import java.util.Collections;
|
|
|
|
+import java.util.HashSet;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@@ -39,6 +40,9 @@ public class CourseMenuServiceImpl extends ServiceImpl<CourseMenuMapper, CourseM
|
|
@Autowired
|
|
@Autowired
|
|
private CourseMenuMapper courseMenuMapper;
|
|
private CourseMenuMapper courseMenuMapper;
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private ICourseMenuExamService iCourseMenuExamService;
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public CourseMenuVo queryById(Long id){
|
|
public CourseMenuVo queryById(Long id){
|
|
CourseMenu db = this.baseMapper.selectById(id);
|
|
CourseMenu db = this.baseMapper.selectById(id);
|
|
@@ -93,6 +97,18 @@ public class CourseMenuServiceImpl extends ServiceImpl<CourseMenuMapper, CourseM
|
|
add.setUpdateTime(DateUtils.getNowTime());
|
|
add.setUpdateTime(DateUtils.getNowTime());
|
|
result = this.save(add);
|
|
result = this.save(add);
|
|
}
|
|
}
|
|
|
|
+ if(result){
|
|
|
|
+ if(bo.getMenuExamList()!=null){
|
|
|
|
+ Collection<CourseMenuExam> coll = new HashSet<>();
|
|
|
|
+ for(int i=0;i<bo.getMenuExamList().size();i++){
|
|
|
|
+ CourseMenuExam addItem = BeanUtil.toBean(bo.getMenuExamList().get(i), CourseMenuExam.class);
|
|
|
|
+ addItem.setType(1);
|
|
|
|
+ addItem.setCourseId(bo.getCourseId());
|
|
|
|
+ coll.add(addItem);
|
|
|
|
+ }
|
|
|
|
+ iCourseMenuExamService.saveBatch(coll);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -109,6 +125,17 @@ public class CourseMenuServiceImpl extends ServiceImpl<CourseMenuMapper, CourseM
|
|
add.setUpdateTime(DateUtils.getNowTime());
|
|
add.setUpdateTime(DateUtils.getNowTime());
|
|
result = this.save(add);
|
|
result = this.save(add);
|
|
}
|
|
}
|
|
|
|
+ if(bo.getMenuExamList()!=null){
|
|
|
|
+ iCourseMenuExamService.remove(new LambdaQueryWrapper<CourseMenuExam>().eq(CourseMenuExam::getCourseId, bo.getCourseId()));
|
|
|
|
+ Collection<CourseMenuExam> coll = new HashSet<>();
|
|
|
|
+ for(int i=0;i<bo.getMenuExamList().size();i++){
|
|
|
|
+ CourseMenuExam addItem = BeanUtil.toBean(bo.getMenuExamList().get(i), CourseMenuExam.class);
|
|
|
|
+ addItem.setType(1);
|
|
|
|
+ addItem.setCourseId(bo.getCourseId());
|
|
|
|
+ coll.add(addItem);
|
|
|
|
+ }
|
|
|
|
+ iCourseMenuExamService.saveBatch(coll);
|
|
|
|
+ }
|
|
return result;
|
|
return result;
|
|
/* CourseMenu update = BeanUtil.toBean(bo, CourseMenu.class);
|
|
/* CourseMenu update = BeanUtil.toBean(bo, CourseMenu.class);
|
|
validEntityBeforeSave(update);
|
|
validEntityBeforeSave(update);
|