From 8d2fa45f494739c4777ec5923b4cc83aebe037b7 Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Fri, 24 Feb 2023 17:11:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20Dao=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E9=87=8D=E8=BD=BD=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jlw/dao/TeacherOpenCourseChatLogDao.java | 2 +- .../dao/TeacherOpenCourseQuestionSettingDao.java | 3 +-- .../jlw/service/StatisticalAnalysisService.java | 4 ++-- .../service/TeacherOpenCourseChatLogService.java | 2 +- .../com/ibeetl/jlw/web/TeacherController.java | 2 +- .../sql/jlw/teacherOpenCourseChatLog.md | 6 ++++++ .../sql/jlw/teacherOpenCourseQuestionSetting.md | 16 +++++++++------- 7 files changed, 21 insertions(+), 14 deletions(-) diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseChatLogDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseChatLogDao.java index 1e4915b3..f958a0b4 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseChatLogDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseChatLogDao.java @@ -24,7 +24,7 @@ import java.util.List; @SqlResource("jlw.teacherOpenCourseChatLog") public interface TeacherOpenCourseChatLogDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); - PageQuery queryByCondition(PageQuery query, Boolean placeholder); + PageQuery queryByCondition2(PageQuery query); PageQuery queryByConditionQuery(PageQuery query); @Update void deleteTeacherOpenCourseChatLogByIds(String ids); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseQuestionSettingDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseQuestionSettingDao.java index 3a29015d..a325c574 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseQuestionSettingDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseQuestionSettingDao.java @@ -40,10 +40,9 @@ public interface TeacherOpenCourseQuestionSettingDao extends BaseMapper getValuesByQueryNotWithPermission(TeacherOpenCourseQuestionSettingQuery teacherOpenCourseQuestionSettingQuery, Boolean placeholder); + List getValuesByQueryNotWithPermission2(TeacherOpenCourseQuestionSettingQuery teacherOpenCourseQuestionSettingQuery); /** * 题目配置，统计分析接口 diff --git a/web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java b/web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java index d2f4952d..94db0238 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java @@ -265,7 +265,7 @@ public class StatisticalAnalysisService { teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingPushStatus(GlobalPushStatusEnum.PUSH); teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingStatus(1); - List courseQuestionSettings = teacherOpenCourseQuestionSettingDao.getValuesByQueryNotWithPermission(teacherOpenCourseQuestionSettingQuery, null); + List courseQuestionSettings = teacherOpenCourseQuestionSettingDao.getValuesByQueryNotWithPermission2(teacherOpenCourseQuestionSettingQuery); List collect1 = courseQuestionSettings.stream().filter(v -> v.getTeacherOpenCourseQuestionSettingType().equals(ResourcesQuestionSnapshotFromTypeEnum.CHAPTER_EXERCISE)).collect(Collectors.toList()); data.put("subjectNum", collect1.size()); //案例 @@ -334,7 +334,7 @@ public class StatisticalAnalysisService { teacherOpenCourseQuestionSettingQuery.setOrgId(uniOrgId); teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingPushStatus(GlobalPushStatusEnum.PUSH); teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingStatus(1); - List courseQuestionSettings = teacherOpenCourseQuestionSettingDao.getValuesByQueryNotWithPermission(teacherOpenCourseQuestionSettingQuery, null); + List courseQuestionSettings = teacherOpenCourseQuestionSettingDao.getValuesByQueryNotWithPermission2(teacherOpenCourseQuestionSettingQuery); List collect2 = courseQuestionSettings.stream() .map(TeacherOpenCourseQuestionSettingPure::getTeacherOpenCourseQuestionSettingId).collect(Collectors.toList()); List select1 = questionLogSummaryDao.createLambdaQuery() diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseChatLogService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseChatLogService.java index 7d242643..f8b85ff2 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseChatLogService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseChatLogService.java @@ -69,7 +69,7 @@ public class TeacherOpenCourseChatLogService extends CoreBaseService queryByCondition(PageQuery query, Boolean placeholder){ - PageQuery ret = teacherOpenCourseChatLogDao.queryByCondition(query, placeholder); + PageQuery ret = teacherOpenCourseChatLogDao.queryByCondition2(query); CollectionUtil.emptyIfNull(ret.getList()).forEach(item -> { String headImg = webPlatformService.getHeadImgByIdentity(item.getUserId()); item.set("headImg", headImg); diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherController.java index 0652cefd..9cdcddb7 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherController.java @@ -185,7 +185,7 @@ public class TeacherController extends BaseController { view.addObject("universitiesCollegesName", null); ResourcesApplication resourcesApplication = new ResourcesApplication(); - if(null != coreUser && "JT_S_02".equals(coreUser.getJobType1())){//教师 + if(!coreUser.isAdmin()){//教师 UniversitiesColleges universitiesColleges = new UniversitiesColleges(); universitiesColleges.setOrgId(coreUser.getOrgId()); List universitiesCollegesList = universitiesCollegesService.getValues(universitiesColleges); diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseChatLog.md b/web/src/main/resources/sql/jlw/teacherOpenCourseChatLog.md index 0d168631..706f8bf4 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseChatLog.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseChatLog.md @@ -117,6 +117,12 @@ queryByCondition @} @} +queryByCondition2 +=== +* 根据不为空的参数进行分页查询 + + #use("queryByCondition")# + queryByConditionQuery === diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionSetting.md b/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionSetting.md index a77a47c7..572f51ea 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionSetting.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionSetting.md @@ -571,15 +571,9 @@ getValuesByQueryNotWithPermission @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)){ + @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# @} @@ -602,6 +596,14 @@ getValuesByQueryNotWithPermission and find_in_set(t.user_id,#userIdPlural#) @} + +getValuesByQueryNotWithPermission2 +=== + +* 根据不为空的参数进行查询 + + #use("getValuesByQueryNotWithPermission")# + analysisOld === * 题目配置，统计分析接口