Merge branch 'master' of https://gitee.com/paidaxing444/benyi

ruoyi/src/main/resources/mybatis/system/ByTeacherJbxxMapper.xml

@@ -69,6 +69,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${dataScope}
     </select>
+
+    <select id="selectByTeacherJbGroupXw" parameterType="ByTeacherJbxx" resultMap="ByTeacherJbxxResult">
+        select (CASE WHEN (select dict_label from sys_dict_data where dict_type='sys_jsxl' and dict_value=t.xl ) is null THEN '未设置' ELSE (select dict_label from sys_dict_data where dict_type='sys_jsxl' and dict_value=t.xl ) END )xl,count(*) byyx
+        from by_teacher_jbxx t
+        left join sys_user u on t.userid = u.user_id
+        where u.del_flag='0'
+
+        <!-- 数据范围过滤 -->
+        ${dataScope}
+
+        group by t.xl
+    </select>
     
     <select id="selectByTeacherJbxxById" parameterType="Long" resultMap="ByTeacherJbxxResult">
         <include refid="selectByTeacherJbxxVo"/>