diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseDao.java index 4f439ce8..b00afecd 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseDao.java @@ -33,4 +33,6 @@ public interface TeacherOpenCourseDao extends BaseMapper{ List myCourse(Student student); List getSchoolStartCourse(Long orgId, String courseLabelIdPlural); + + List getTeacherOpenCourseMergeCourseInfo(Long orgId, Long courseLabelId); } diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java index b25372d4..0dfe3db7 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java @@ -412,7 +412,6 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService studentHandsOnVOS = new ArrayList<>(); - BigDecimal b = BigDecimal.ZERO; for (TeacherOpenCourseHandsOn handsOn : handsOnList) { StudentHandsOnVO studentHandsOnVO = new StudentHandsOnVO(); Long handsOnId = handsOn.getHandsOnId(); @@ -492,27 +491,7 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService serviceValues = teacherOpenCourseScoreDashboardService.getValues(dashboard); - if (CollectionUtils.isEmpty(serviceValues)) { - dashboard.setRealOperationScore(b); - teacherOpenCourseScoreDashboardService.insert(dashboard); - dashboard.setCreateTime(new Date()); - } else { - TeacherOpenCourseScoreDashboard dashboard1 = serviceValues.get(0); - dashboard1.setRealOperationScore(b); - teacherOpenCourseScoreDashboardService.update(dashboard1); - } - - } catch (Exception e) { - - } - return JsonResult.success(studentHandsOnVOS); } diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseService.java index 26855d7f..e2968639 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseService.java @@ -74,6 +74,7 @@ public class TeacherOpenCourseService extends CoreBaseService // return ret; // } + @Deprecated public List> queryByConditionQuery(TeacherOpenCourseQuery query, CoreUser coreUser) { List> maps = new ArrayList<>(); List teacherOpenCourses = teacherOpenCourseDao.getSchoolStartCourse(coreUser.getOrgId(),query.getCourseLabelIdPlural()); @@ -98,6 +99,11 @@ public class TeacherOpenCourseService extends CoreBaseService }); return maps; } + public List getTeacherOpenCourseMergeCourseInfo(TeacherOpenCourseQuery query, CoreUser coreUser) { + List teacherOpenCourses = teacherOpenCourseDao.getTeacherOpenCourseMergeCourseInfo(coreUser.getOrgId(),query.getCourseLabelId()); + return teacherOpenCourses; + } + public void deleteByList(List list) { String ids = ""; diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseController.java index 41165e74..b4a6f3af 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseController.java @@ -28,7 +28,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; import java.util.List; -import java.util.Map; /** * TeacherOpenCourse 教师-我的课程-开课 接口 @@ -70,7 +69,7 @@ public class TeacherOpenCourseController{ @PostMapping(API + "/getPageList.do") @ResponseBody - public JsonResult>> getPageList(TeacherOpenCourseQuery condition, @SCoreUser CoreUser coreUser){ + public JsonResult> getPageList(TeacherOpenCourseQuery condition, @SCoreUser CoreUser coreUser){ if(null == coreUser){ return JsonResult.failMessage("请登录后再操作"); }else{ @@ -78,7 +77,7 @@ public class TeacherOpenCourseController{ if (!coreUser.isAdmin()) { condition.setOrgId(coreUser.getOrgId()); } - return JsonResult.success(teacherOpenCourseService.queryByConditionQuery(condition,coreUser)); + return JsonResult.success(teacherOpenCourseService.getTeacherOpenCourseMergeCourseInfo(condition,coreUser)); } } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuery.java index dbef3514..e5bfdcc4 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuery.java @@ -58,6 +58,8 @@ public class TeacherOpenCourseQuery extends PageParam { private String courseLabelIdPlural; + private Long courseLabelId; + private String teacherOpenCourseJsonStr;//json格式 private String _given;//指定更新的特定字段，多个逗号隔开 @@ -246,4 +248,12 @@ public class TeacherOpenCourseQuery extends PageParam { public void setCourseLabelIdPlural(String courseLabelIdPlural) { this.courseLabelIdPlural = courseLabelIdPlural; } + + public Long getCourseLabelId() { + return courseLabelId; + } + + public void setCourseLabelId(Long courseLabelId) { + this.courseLabelId = courseLabelId; + } } diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourse.md b/web/src/main/resources/sql/jlw/teacherOpenCourse.md index a0bc6557..fa235ccb 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourse.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourse.md @@ -377,3 +377,56 @@ getSchoolStartCourse @if(!isEmpty(orgId)){ AND b.org_id =#orgId# @} + + +getTeacherOpenCourseMergeCourseInfo +=== + * 获取教师开课课程，以及授权课程 + + ( + SELECT + 1 `type`, + a.teacher_open_course_id, + a.teacher_open_course_title `course_name`, + a.teacher_open_course_cover `course_cover`, + t.teacher_name `name` + FROM teacher_open_course a + LEFT JOIN teacher_open_course_merge_teacher tocmt on a.teacher_open_course_id = tocmt.teacher_open_course_id + LEFT JOIN teacher t on t.teacher_id = tocmt.teacher_id + WHERE 1 = 1 + AND a.teacher_open_course_status = 1 + AND tocmt.teacher_open_course_merge_teacher_status=1 + AND t.teacher_status=1 + @if(!isEmpty(orgId)){ + AND a.org_id =#orgId# + @} + @if(!isEmpty(courseLabelId)){ + AND a.teacher_open_course_id in ( + select teacher_open_course_id from teacher_open_course_merge_course_info c where c.course_label_id = #courseLabelId# and c.course_info_type = 1 and c.course_info_status = 1 + ) + @} + + ) + UNION ALL + ( + select + 2 `type`, + ci.course_info_id `teacher_open_course_id`, + ci.course_info_name `course_name`, + ci.course_info_thumbnail `course_cover`, + '系统管理员' `name` + from universities_colleges uc + LEFT JOIN universities_colleges_jurisdiction_curriculum_resources ucjcr ON ucjcr.universities_colleges_id = uc.universities_colleges_id + LEFT JOIN course_info ci ON ci.course_info_id = ucjcr.course_info_id AND ci.course_info_type =1 + where 1 = 1 + and uc.universities_colleges_status = 1 + and ci.course_info_status = 1 + and ucjcr.use_type in (1,2) + and now() between ucjcr.use_start_time and ucjcr.use_end_time + @if(!isEmpty(orgId)){ + AND uc.org_id =#orgId# + @} + @if(!isEmpty(courseLabelId)){ + and ci.course_label_id = #courseLabelId# + @} + )