1、课程实训案例管理-教师端

web/src/main/java/com/ibeetl/jlw/service/ResourcesInfoService.java

@@ -109,7 +109,7 @@ public class ResourcesInfoService extends CoreBaseService<ResourcesInfo> {
 
     /**
      * 获取资源库资源（系统授权课程+开课课程）
-     *
+     * 超级管理端+学校管理端+教师端 共用接口
      * @param query
      * @return
      */

web/src/main/java/com/ibeetl/jlw/web/ResourcesInfoController.java

@@ -351,6 +351,9 @@ public class ResourcesInfoController {
     public JsonResult<PageQuery> getResourceSystemOAndUniversities(ResourcesInfoQuery condition, @SCoreUser CoreUser coreUser) {
         PageQuery page = condition.getPageQuery();
         condition.setOrgId(coreUser.isAdmin() ? null : coreUser.getOrgId());
+        if (coreUser.isTeacher()){
+            condition.setUserId(coreUser.getId());
+        }
         condition.setResourcesInfoStatus(1);
         resourcesInfoService.getResourceSystemOAndUniversities(page);
         return JsonResult.success(page);

web/src/main/resources/sql/jlw/resourcesInfo.md

@@ -670,7 +670,9 @@ bc.teacher_open_course_status = 1
 @if(!isEmpty(orgId)){
 AND b.org_id = #orgId#
 @}
-
+@if(!isEmpty(userId)){
+AND b.user_id = #userId#
+@}
 )
 ) tt
 WHERE

web/src/main/resources/sql/jlw/teacherOpenCourseChatLog.md

@@ -713,8 +713,7 @@ chatLogAnalysisNew
   SELECT
   SUM( chat_log_send_type = 'discuss' ) AS chat_log_count,
   SUM( chat_log_send_type = 'student_ask' ) AS student_send_count,
-  SUM(
+  (SUM( chat_log_send_type = 'specify_ask' )  + SUM( chat_log_send_type = 'random_ask' ) ) AS teacher_send_count
-  FIND_IN_SET( chat_log_send_type, 'specify_ask,random_ask' )) AS teacher_send_count
   FROM
   teacher_open_course_chat_log t
   WHERE