|
@@ -60,7 +60,7 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
|
|
|
@Override
|
|
|
public void verifyCourseInfo(Long schoolId, String courseCode, String courseName, Long userId) {
|
|
|
QueryWrapper<BasicCourse> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.lambda().eq(BasicCourse::getSchoolId, schoolId).eq(BasicCourse::getCode, courseCode);
|
|
|
+ queryWrapper.lambda().eq(BasicCourse::getSchoolId, schoolId).eq(BasicCourse::getCode, courseCode).eq(BasicCourse::getEnable,true);
|
|
|
|
|
|
BasicCourse tmp = this.getOne(queryWrapper);
|
|
|
if (tmp != null) {
|
|
@@ -69,15 +69,17 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
|
|
|
.exception("课程代码和课程名称不匹配,课程代码为 :'" + courseCode + "',输入的课程名称 :'" + courseName + "',实际该代码对应的课程名称 :'" + tmp.getName() + "'。");
|
|
|
}
|
|
|
} else {
|
|
|
- BasicCourse basicCourse = new BasicCourse();
|
|
|
- basicCourse.setName(courseName);
|
|
|
- basicCourse.setCode(courseCode);
|
|
|
- basicCourse.setSchoolId(schoolId);
|
|
|
- basicCourse.setId(SystemConstant.getDbUuid());
|
|
|
- basicCourse.setCreateId(userId);
|
|
|
- basicCourse.setOrgId(sysUserService.getById(userId).getOrgId());
|
|
|
- basicCourse.setCreateTime(System.currentTimeMillis());
|
|
|
- this.saveOrUpdate(basicCourse);
|
|
|
+// BasicCourse basicCourse = new BasicCourse();
|
|
|
+// basicCourse.setName(courseName);
|
|
|
+// basicCourse.setCode(courseCode);
|
|
|
+// basicCourse.setSchoolId(schoolId);
|
|
|
+// basicCourse.setId(SystemConstant.getDbUuid());
|
|
|
+// basicCourse.setCreateId(userId);
|
|
|
+// basicCourse.setOrgId(sysUserService.getById(userId).getOrgId());
|
|
|
+// basicCourse.setCreateTime(System.currentTimeMillis());
|
|
|
+// basicCourse.setTeachingRoomId();
|
|
|
+// this.saveOrUpdate(basicCourse);
|
|
|
+ throw ExceptionResultEnum.ERROR.exception("考务文件中 【课程代码】为 :" + courseCode + ",【课程名称】为 : " + courseName + ",在基础课程信息中不存在,请先添加课程");
|
|
|
}
|
|
|
}
|
|
|
|