tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

Browse Source
beetlsql3-dev
wgf 2 years ago
parent 0aebc33859 98c1018974
commit 8ecd8ca448
12 changed files with 197 additions and 42 deletions
Show Stats Download Patch File Download Diff File

BIN
web/filesystem/template/题库导入模板.xlsx
View File

Binary file not shown.

2
web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseQuestionSettingDao.java
Unescape Escape View File

@ -83,4 +83,6 @@ public interface TeacherOpenCourseQuestionSettingDao extends BaseMapper<TeacherO
}
List<TeacherOpenCourseQuestionSetting> queryByConditionQueryNotPage(TeacherOpenCourseQuestionSettingQuery condition);
List<TeacherOpenCourseQuestionSetting> getNotEmptyQuestionSetting(TeacherOpenCourseQuestionSettingQuery teacherOpenCourseQuestionSettingQuery);
}

29
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnSimulationTasksService.java
Unescape Escape View File

@ -443,8 +443,11 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
}
public PageQuery getStudentScore(StudentScoreParam studentScoreParam) {
Long handsOnId = studentScoreParam.getHandsOnId();
if (handsOnId != null) {
if (handsOnId == null) {
throw new PlatformException("请选择实操任务");
}
TeacherOpenCourseHandsOnQuery handsOnQuery = new TeacherOpenCourseHandsOnQuery();
handsOnQuery.setHandsOnId(handsOnId);
List<TeacherOpenCourseHandsOn> handsOns = teacherOpenCourseHandsOnDao.getValuesByQueryNotWithPermission(handsOnQuery);
@ -456,7 +459,6 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
String join = CollectionUtil.join(collect, ",");
studentScoreParam.setClassIds(join);
}
}
PageQuery pageQuery = studentScoreParam.getPageQuery();
pageQuery.setPara("studentStatus", 1);
PageQuery<Student> studentPageQuery = studentService.queryByCondition(pageQuery);
@ -466,9 +468,7 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
for (Student student : list) {
StudentHandsOnTaskVideoQuery studentHandsOnTaskVideoQuery = new StudentHandsOnTaskVideoQuery();
studentHandsOnTaskVideoQuery.setStudentId(student.getStudentId());
if (handsOnId != null) {
studentHandsOnTaskVideoQuery.setHandsOnId(handsOnId);
}
List<StudentHandsOnTaskVideo> valuesByQuery = studentHandsOnTaskVideoService.getValuesByQuery(studentHandsOnTaskVideoQuery);
double sum = valuesByQuery.stream().mapToDouble(v -> v.getVideoScore() == null ? 0 : v.getVideoScore().doubleValue()).sum();
student.set("sumScore", sum);
@ -478,9 +478,7 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
for (Student student : list) {
StudentHandsOnTaskPptQuery studentHandsOnTaskPptQuery = new StudentHandsOnTaskPptQuery();
studentHandsOnTaskPptQuery.setStudentId(student.getStudentId());
if (handsOnId != null) {
studentHandsOnTaskPptQuery.setHandsOnId(handsOnId);
}
List<StudentHandsOnTaskPpt> valuesByQuery = studentHandsOnTaskPptService.getValuesByQuery(studentHandsOnTaskPptQuery);
double sum = valuesByQuery.stream().mapToDouble(v -> v.getPptScore() == null ? 0 : v.getPptScore().doubleValue()).sum();
student.set("sumScore", sum);
@ -490,9 +488,7 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
for (Student student : list) {
StudentHandsOnTaskTheoryQuery studentHandsOnTaskTheoryQuery = new StudentHandsOnTaskTheoryQuery();
studentHandsOnTaskTheoryQuery.setStudentId(student.getStudentId());
if (handsOnId != null) {
studentHandsOnTaskTheoryQuery.setHandsOnId(handsOnId);
}
List<StudentHandsOnTaskTheory> valuesByQuery = studentHandsOnTaskTheoryService.getValuesByQuery(studentHandsOnTaskTheoryQuery);
double sum = valuesByQuery.stream().mapToDouble(v -> v.getTheoryScore() == null ? 0 : v.getTheoryScore().doubleValue()).sum();
student.set("sumScore", sum);
@ -502,9 +498,7 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
for (Student student : list) {
StudentHandsOnTaskStepQuery studentHandsOnTaskStepQuery = new StudentHandsOnTaskStepQuery();
studentHandsOnTaskStepQuery.setStudentId(student.getStudentId());
if (handsOnId != null) {
studentHandsOnTaskStepQuery.setHandsOnId(handsOnId);
}
List<StudentHandsOnTaskStep> valuesByQuery = studentHandsOnTaskStepService.getValuesByQuery(studentHandsOnTaskStepQuery);
double sum = valuesByQuery.stream().mapToDouble(v -> v.getTheoryScore() == null ? 0 : v.getTheoryScore().doubleValue()).sum();
student.set("sumScore", sum);
@ -514,14 +508,25 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
for (Student student : list) {
StudentHandsOnTaskReportQuery studentHandsOnTaskReportQuery = new StudentHandsOnTaskReportQuery();
studentHandsOnTaskReportQuery.setStudentId(student.getStudentId());
if (handsOnId != null) {
studentHandsOnTaskReportQuery.setHandsOnId(handsOnId);
}
List<StudentHandsOnTaskReport> valuesByQuery = studentHandsOnTaskReportService.getValuesByQuery(studentHandsOnTaskReportQuery);
double sum = valuesByQuery.stream().mapToDouble(v -> v.getReportScore() == null ? 0 : v.getReportScore().doubleValue()).sum();
student.set("sumScore", sum);
}
}
if ("ALL".equals(studentScoreParam.getType())) {
for (Student student : list) {
HandsOnAchievement handsOnAchievement = new HandsOnAchievement();
handsOnAchievement.setStudentId(student.getStudentId());
handsOnAchievement.setHandOnId(handsOnId);
handsOnAchievement.setHandOnAchievementStatus(1);
HandsOnAchievement res = studentHandsOnTaskReportService.queryObject(handsOnAchievement);
String totalScore = res.getTotalScore();
student.set("sumScore", totalScore);
}
}
studentPageQuery.setList(list);
return studentPageQuery;
}

23
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java
Unescape Escape View File

@ -344,7 +344,7 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
@NotNull(message = "设置的分数不能为空！") final BigDecimal score, @Nullable String reply) {
TeacherOpenCourseQuestionLogQuery teacherOpenCourseQuestionLogQuery = new TeacherOpenCourseQuestionLogQuery();
teacherOpenCourseQuestionLogQuery.setTeacherOpenCourseQuestionLogIdPlural(teacherOpenCourseQuestionLogIds);
teacherOpenCourseQuestionLogQuery.setTeacherOpenCourseQuestionLogStatus(1);
teacherOpenCourseQuestionLogQuery.setTeacherOpenCourseQuestionLogStatus(GlobalStatusEnum.NORMAL.getCode());
List<TeacherOpenCourseQuestionLog> updateList = teacherOpenCourseQuestionLogDao.getValuesByQueryNotWithPermission(teacherOpenCourseQuestionLogQuery);
Assert.notEmpty(updateList, "未查询到做题记录！");
@ -451,13 +451,30 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
* @param student
*/
private void addFileRelatedLog(@NotBlank(message = "上传的附件不能为空！") String absFilePath, Long questionSettingId, Student student) {
if (questionSettingId == null||StrUtil.isBlank(absFilePath)||student==null) {
throw new PlatformException("参数错误！");
}
//先把之前的数据逻辑删除
TeacherOpenCourseQuestionLog teacherOpenCourseQuestionLog = new TeacherOpenCourseQuestionLog();
teacherOpenCourseQuestionLog.setTeacherOpenCourseQuestionSettingId(questionSettingId);
teacherOpenCourseQuestionLog.setStudentId(student.getStudentId());
teacherOpenCourseQuestionLog.setTeacherOpenCourseQuestionLogStatus(1);
List<TeacherOpenCourseQuestionLog> teacherOpenCourseQuestionLogList = queryObjectList(teacherOpenCourseQuestionLog);
if (CollectionUtil.isNotEmpty(teacherOpenCourseQuestionLogList)) {
teacherOpenCourseQuestionLogList.forEach(log -> {
log.setTeacherOpenCourseQuestionLogStatus(GlobalStatusEnum.DELETED.getCode());
log.setTeacherOpenCourseQuestionLogUpdateTime(new Date());
});
updateBatchTemplate(teacherOpenCourseQuestionLogList);
}
// 重新添加最新的数据
Date now = new Date();
TeacherOpenCourseQuestionLogQuery query = new TeacherOpenCourseQuestionLogQuery();
query.setTeacherOpenCourseQuestionLogUploadFile(absFilePath);
query.setTeacherOpenCourseQuestionSettingId(questionSettingId);
query.setTeacherOpenCourseQuestionLogAddTime(now);
query.setTeacherOpenCourseQuestionLogFinishTime(RandomUtil.randomLong(100, 3600));
query.setTeacherOpenCourseQuestionLogStatus(1);
query.setTeacherOpenCourseQuestionLogStatus(GlobalStatusEnum.NORMAL.getCode());
// 附件作业，只有一题，所有默认是全部提交的方式
query.setQuestionLogAddType(FINALLY_SUBMIT);
query.setOrgId(student.getOrgId());
@ -1230,6 +1247,8 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
}
public FileQuestionLogListVO getFileQuestionLog(TeacherOpenCourseQuestionLogQuery query) {
//附件作业最新的status是1
query.setTeacherOpenCourseQuestionLogStatus(1);
TeacherOpenCourseQuestionLog log = getInfo(query);
if (null == log) {
return null;

19
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScoreDashboardService.java
Unescape Escape View File

@ -18,9 +18,11 @@ import com.ibeetl.jlw.constants.TeacherOpenCourseScoreDashboardConstant;
import com.ibeetl.jlw.dao.*;
import com.ibeetl.jlw.entity.*;
import com.ibeetl.jlw.enums.ChatLogSendTypeEnum;
import com.ibeetl.jlw.enums.GlobalPushStatusEnum;
import com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum;
import com.ibeetl.jlw.enums.SignInTypeEnum;
import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeStudentQuery;
import com.ibeetl.jlw.web.query.TeacherOpenCourseQuestionSettingQuery;
import com.ibeetl.jlw.web.query.TeacherOpenCourseScoreDashboardQuery;
import com.ibeetl.jlw.web.query.TeacherOpenCourseStudentSigninLogQuery;
import lombok.extern.slf4j.Slf4j;
@ -468,12 +470,12 @@ public class TeacherOpenCourseScoreDashboardService extends CoreBaseService<Teac
teacherOpenCourseChatLog.setTeacherOpenCourseChatLogStatus(1);
List<TeacherOpenCourseChatLog> teacherOpenCourseChatLogList = teacherOpenCourseChatLogService.queryObjectList(teacherOpenCourseChatLog);
//查询章节练习配置
List<TeacherOpenCourseQuestionSetting> chapterExerciseList = teacherOpenCourseQuestionSettingDao.createLambdaQuery()
.andEq(TeacherOpenCourseQuestionSetting::getTeacherOpenCourseId, teacherOpenCourseId)
.andEq(TeacherOpenCourseQuestionSetting::getTeacherOpenCourseQuestionSettingType, ResourcesQuestionSnapshotFromTypeEnum.CHAPTER_EXERCISE)
.andEq(TeacherOpenCourseQuestionSetting::getTeacherOpenCourseQuestionSettingStatus, 1).select();
//查询章节练习配置,查有题目的，上架的
TeacherOpenCourseQuestionSettingQuery teacherOpenCourseQuestionSettingQuery = new TeacherOpenCourseQuestionSettingQuery();
teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseId(teacherOpenCourseId);
teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingType(ResourcesQuestionSnapshotFromTypeEnum.CHAPTER_EXERCISE);
teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingStatus(1);
List<TeacherOpenCourseQuestionSetting> chapterExerciseList = teacherOpenCourseQuestionSettingDao.getNotEmptyQuestionSetting(teacherOpenCourseQuestionSettingQuery);
//查询本课程的所有实操任务
TeacherOpenCourseHandsOn param = new TeacherOpenCourseHandsOn();
@ -502,13 +504,16 @@ public class TeacherOpenCourseScoreDashboardService extends CoreBaseService<Teac
.andEq(TeacherOpenCourseQuestionSetting::getTeacherOpenCourseId, teacherOpenCourseId)
.andEq(TeacherOpenCourseQuestionSetting::getTeacherOpenCourseQuestionSettingStatus, 1)
.andIn(TeacherOpenCourseQuestionSetting::getTeacherOpenCourseQuestionSettingType, Arrays.asList(ResourcesQuestionSnapshotFromTypeEnum.HOMEWORK_QUESTION, ResourcesQuestionSnapshotFromTypeEnum.HOMEWORK_FILE))
.andEq(TeacherOpenCourseQuestionSetting::getTeacherOpenCourseQuestionSettingPushStatus, GlobalPushStatusEnum.PUSH)
.select();
//查该课程的所有考试
List<TeacherOpenCourseQuestionSetting> examList = teacherOpenCourseQuestionSettingDao.createLambdaQuery()
.andEq(TeacherOpenCourseQuestionSetting::getTeacherOpenCourseId, teacherOpenCourseId)
.andEq(TeacherOpenCourseQuestionSetting::getTeacherOpenCourseQuestionSettingStatus, 1)
.andEq(TeacherOpenCourseQuestionSetting::getTeacherOpenCourseQuestionSettingType, ResourcesQuestionSnapshotFromTypeEnum.EXAM).select();
.andEq(TeacherOpenCourseQuestionSetting::getTeacherOpenCourseQuestionSettingType, ResourcesQuestionSnapshotFromTypeEnum.EXAM)
.andEq(TeacherOpenCourseQuestionSetting::getTeacherOpenCourseQuestionSettingPushStatus, GlobalPushStatusEnum.PUSH)
.select();
//查询权重

2
web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java
Unescape Escape View File

@ -193,7 +193,7 @@ public class TeacherOpenCourseQuestionLogController extends BaseController {
/**
* 教师端-手动批改一些题目的分数
* 教师端-手动批改一些题目的分数,这里被附件作业评阅调用了
*
* @param questionSettingId 题目配置ID
* @param studentId 学生ID

11
web/src/main/java/com/ibeetl/jlw/web/query/QuestionLogSummaryQuery.java
Unescape Escape View File

@ -66,8 +66,9 @@ public class QuestionLogSummaryQuery extends PageParam {
private String personIdPlural;
private String questionLogSummaryStatusPlural;
private String orgIdPlural;
private String userIdPlural;
private Long studentId;
private String userIdPlural;
private String questionLogSummaryJsonStr;//json格式
private String _given;//指定更新的特定字段，多个逗号隔开
@ -309,4 +310,12 @@ public class QuestionLogSummaryQuery extends PageParam {
public void setSchoolClassIdPlural(String schoolClassIdPlural) {
this.schoolClassIdPlural = schoolClassIdPlural;
}
public Long getStudentId() {
return studentId;
}
public void setStudentId(Long studentId) {
this.studentId = studentId;
}
}

3
web/src/main/java/com/ibeetl/jlw/web/query/StudentScoreParam.java
Unescape Escape View File

@ -1,6 +1,5 @@
package com.ibeetl.jlw.web.query;
import com.ibeetl.admin.core.web.query.PageParam;
import lombok.Data;
/**
@ -24,7 +23,7 @@ public class StudentScoreParam extends StudentQuery {
private Long classId;
/**
* 1:视频 2:ppt 3:理论 4:实操 5:报告
* 1:视频 2:ppt 3:理论 4:实操 5:报告,All:全部
*/
private String type;

4
web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionLogQuery.java
Unescape Escape View File

@ -134,6 +134,10 @@ public class TeacherOpenCourseQuestionLogQuery extends PageParam {
private String schoolClassIdPlural;
private Long schoolClassId;
private String studentOrName;
// 题目配置来源类型
private ResourcesQuestionSnapshotFromTypeEnum questionSettingType;

3
web/src/main/resources/sql/jlw/questionLogSummary.md
Unescape Escape View File

@ -146,6 +146,9 @@ queryByConditionQuery
@if(!isEmpty(personId)){
and t.person_id =#personId#
@}
@if(!isEmpty(studentId)){
and t.person_id =#studentId#
@}
@if(!isEmpty(personIdPlural)){
and find_in_set(t.person_id,#personIdPlural#)
@}

21
web/src/main/resources/sql/jlw/teacherOpenCourseQuestionLog.md
Unescape Escape View File

@ -181,6 +181,8 @@ queryByConditionQuery
and qls.person_id =t.student_id
@}
and qls.question_log_summary_status=1
order by qls.question_log_summary_add_time desc
limit 1
)
)
@}
@ -327,7 +329,22 @@ studentScoreList
LEFT JOIN student ta ON ta.student_id = t.student_id
WHERE
1 = 1
AND ta.student_sn IS NOT NULL
@// AND ta.student_sn IS NOT NULL
@if(!isEmpty(questionSettingType)&&questionSettingType=="HOMEWORK_FILE"){
@//附件作业不需要查，因为没评阅之前，是没有成绩表数据的，只需要查status=1的数据，逻辑保证了只有一条
and t.teacher_open_course_question_log_status = 1
@}else{
@//不这么写会把多次考试的分数都加起来
AND find_in_set(t.teacher_open_course_question_log_id ,(
select question_log_ids from (select question_log_ids from question_log_summary qls where qls.question_setting_id = t.teacher_open_course_question_setting_id and qls.person_id = t.student_id and qls.question_log_summary_status=1 order by qls.question_log_summary_add_time desc limit 1) tt
))
@}
@if(!isEmpty(schoolClassId)){
and ta.class_id =#schoolClassId#
@}
@if(!isEmpty(studentOrName)){
and (ta.student_sn like #'%'+studentOrName+'%'# or ta.student_name like #'%'+studentOrName+'%'#)
@}
@if(!isEmpty(teacherOpenCourseQuestionLogId)){
and t.teacher_open_course_question_log_id =#teacherOpenCourseQuestionLogId#
@}
@ -1107,6 +1124,8 @@ getPageList
and qls.person_id =t.student_id
@}
and qls.question_log_summary_status=1
order by qls.question_log_summary_add_time desc
limit 1
)
)
@}

90
web/src/main/resources/sql/jlw/teacherOpenCourseQuestionSetting.md
Unescape Escape View File

@ -774,3 +774,93 @@ queryByConditionQueryNotPage
@}
ORDER BY
CONVERT(regexp_replace ( t.teacher_open_course_question_setting_name, '[^0-9]+', '' ),unsigned) asc
getNotEmptyQuestionSetting
===
* 查询不为空的题目配置
select
t.*
from teacher_open_course_question_setting t
where 1=1
@//题目不为空
and ( SELECT count( 1 ) FROM resources_question_snapshot tb WHERE tb.teacher_open_course_question_setting_id = t.teacher_open_course_question_setting_id AND tb.question_status = 1 ) > 1
@if(!isEmpty(teacherOpenCourseQuestionSettingId)){
and t.teacher_open_course_question_setting_id =#teacherOpenCourseQuestionSettingId#
@}
@if(!isEmpty(teacherOpenCourseQuestionSettingIdPlural)){
and find_in_set(t.teacher_open_course_question_setting_id,#teacherOpenCourseQuestionSettingIdPlural#)
@}
@if(!isEmpty(teacherOpenCourseId)){
and t.teacher_open_course_id =#teacherOpenCourseId#
@}
@if(!isEmpty(teacherOpenCourseIdPlural)){
and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
@}
@if(!isEmpty(teacherOpenCourseQuestionSettingSchoolClassIds)){
and t.teacher_open_course_question_setting_school_class_ids =#teacherOpenCourseQuestionSettingSchoolClassIds#
@}
@if(!isEmpty(teacherOpenCourseQuestionSettingDoCount)){
and t.teacher_open_course_question_setting_do_count =#teacherOpenCourseQuestionSettingDoCount#
@}
@if(!isEmpty(teacherOpenCourseQuestionSettingQuestionNoOrder)){
and t.teacher_open_course_question_setting_question_no_order =#teacherOpenCourseQuestionSettingQuestionNoOrder#
@}
@if(!isEmpty(teacherOpenCourseQuestionSettingOptionNoOrder)){
and t.teacher_open_course_question_setting_option_no_order =#teacherOpenCourseQuestionSettingOptionNoOrder#
@}
@if(!isEmpty(teacherOpenCourseQuestionSettingEndShowQa)){
and t.teacher_open_course_question_setting_end_show_qa =#teacherOpenCourseQuestionSettingEndShowQa#
@}
@if(!isEmpty(teacherOpenCourseQuestionSettingEndShowTrueFalse)){
and t.teacher_open_course_question_setting_end_show_true_false =#teacherOpenCourseQuestionSettingEndShowTrueFalse#
@}
@if(!isEmpty(teacherOpenCourseQuestionSettingName)){
and t.teacher_open_course_question_setting_name =#teacherOpenCourseQuestionSettingName#
@}
@if(!isEmpty(teacherOpenCourseQuestionStartTime)){
and t.teacher_open_course_question_start_time =#teacherOpenCourseQuestionStartTime#
@}
@if(!isEmpty(teacherOpenCourseQuestionEndTime)){
and t.teacher_open_course_question_end_time =#teacherOpenCourseQuestionEndTime#
@}
@if(!isEmpty(teacherOpenCourseQuestionSettingType)){
and t.teacher_open_course_question_setting_type =#teacherOpenCourseQuestionSettingType#
@}
@if(!isEmpty(teacherOpenCourseQuestionSettingFile)){
and t.teacher_open_course_question_setting_file =#teacherOpenCourseQuestionSettingFile#
@}
@if(!isEmpty(teacherOpenCourseQuestionSettingPushStatus)){
and t.teacher_open_course_question_setting_push_status =#teacherOpenCourseQuestionSettingPushStatus#
@}
@if(isEmpty(teacherOpenCourseQuestionSettingStatus) && isEmpty(teacherOpenCourseQuestionSettingStatusPlural)){
and t.teacher_open_course_question_setting_status != 2
@}else{
@if(!isEmpty(teacherOpenCourseQuestionSettingStatus)){
and t.teacher_open_course_question_setting_status =#teacherOpenCourseQuestionSettingStatus#
@}else if(!isEmpty(teacherOpenCourseQuestionSettingStatusPlural)){
and find_in_set(t.teacher_open_course_question_setting_status,#teacherOpenCourseQuestionSettingStatusPlural#)
@}
@}
@if(!isEmpty(teacherOpenCourseQuestionSettingAddTime)){
and t.teacher_open_course_question_setting_add_time =#teacherOpenCourseQuestionSettingAddTime#
@}
@if(!isEmpty(teacherOpenCourseQuestionSettingRequire)){
and t.teacher_open_course_question_setting_require =#teacherOpenCourseQuestionSettingRequire#
@}
@if(!isEmpty(teacherOpenCourseMergeCourseInfoId)){
and t.teacher_open_course_merge_course_info_id =#teacherOpenCourseMergeCourseInfoId#
@}
@if(!isEmpty(orgId)){
and t.org_id =#orgId#
@}
@if(!isEmpty(orgIdPlural)){
and find_in_set(t.org_id,#orgIdPlural#)
@}
@if(!isEmpty(userId)){
and t.user_id =#userId#
@}
@if(!isEmpty(userIdPlural)){
and find_in_set(t.user_id,#userIdPlural#)
@}

Write Preview
Loading…
Cancel
Save