课程转换

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleConvertServiceImpl.java

@@ -224,8 +224,14 @@ public class CourseScheduleConvertServiceImpl implements CourseScheduleConvertSe
         String newCourseIds = courseConvertLog.getNewCourseIds();
         List<Long> courseIdList = Arrays.stream(newCourseIds.split(",")).map(e -> Long.parseLong(e)).collect(Collectors.toList());
         List<CourseSchedule> courseSchedules = courseScheduleService.getDao().findByCourseScheduleIds(courseIdList);
+        if(CollectionUtils.isEmpty(courseSchedules)){
+            throw new BizException("操作失败：没有可转换的课程");
+        }
         if(courseSchedules.stream().anyMatch(e->e.getStatus() != CourseStatusEnum.NOT_START)){
-            throw new BizException("操作失败：有已结束课程");
+            throw new BizException("操作失败：存在已结束课程");
+        }
+        if(courseSchedules.size() < courseIdList.size()){
+            throw new BizException("操作失败：存在被删除的课程");
         }
         //学员课表是否变动
         List<CourseScheduleStudentPayment> studentPayments = courseScheduleStudentPaymentService.getDao().findByCourseScheduleIds(courseIdList);

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -518,6 +518,7 @@
         <foreach collection="courseScheduleIds" item="id" open="(" close=")" separator=",">
             #{id}
         </foreach>
+        AND del_flag_ = 0
         ORDER BY cs.create_time_ DESC
     </select>
 

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupController.java

@@ -27,10 +27,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @RequestMapping("musicGroup")
@@ -314,7 +311,7 @@ public class MusicGroupController extends BaseController {
     @GetMapping("/getGradeList")
     @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String")})
     public HttpResponseResult<Map<Integer, String>> getGradeList(String musicGroupId) {
-        MusicGroup musicGroup = musicGroupService.get(musicGroupId);
+        MusicGroup musicGroup = Optional.ofNullable(musicGroupService.get(musicGroupId)).orElseThrow(()->new BizException("乐团信息不存在"));
         return succeed(organizationService.getGradeList(musicGroup.getOrganId()));
     }
 }

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherController.java

@@ -9,6 +9,7 @@ import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.*;
@@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 @RequestMapping("teacher")
@@ -63,7 +65,8 @@ public class TeacherController extends BaseController {
     @ApiOperation(value = "根据教师编号查询教师基本信息")
     @GetMapping("/queryUserInfo")
     public Object queryUserInfo() {
-		Teacher teacher = teacherService.get(sysUserService.getUserId());
+		Teacher teacher = Optional.ofNullable(teacherService.get(sysUserService.getUserId())).
+                orElseThrow(()->new BizException("老师信息不存在"));
 		//专业技能
 		if(StringUtils.isNotEmpty(teacher.getSubjectId())){
 			teacher.setSubjectName(subjectDao.findBySubIds(teacher.getSubjectId()));