|
@@ -11,6 +11,7 @@
|
|
<result column="music_group_id_" property="musicGroupId" />
|
|
<result column="music_group_id_" property="musicGroupId" />
|
|
<result column="teacher_id_" property="teacherId" />
|
|
<result column="teacher_id_" property="teacherId" />
|
|
<result column="username_" property="teacher.username" />
|
|
<result column="username_" property="teacher.username" />
|
|
|
|
+ <result column="classGroupId" property="classGroupId" />
|
|
<result column="student_id_list_" property="studentIdList" />
|
|
<result column="student_id_list_" property="studentIdList" />
|
|
<result column="batch_no_" property="batchNo" />
|
|
<result column="batch_no_" property="batchNo" />
|
|
<result column="title_" property="title" />
|
|
<result column="title_" property="title" />
|
|
@@ -25,6 +26,7 @@
|
|
<result column="tenant_id_" property="tenantId" />
|
|
<result column="tenant_id_" property="tenantId" />
|
|
<result column="music_score_id_" property="musicScoreId" />
|
|
<result column="music_score_id_" property="musicScoreId" />
|
|
<result column="assignTime" property="assignTime" />
|
|
<result column="assignTime" property="assignTime" />
|
|
|
|
+ <result column="musicGroupName" property="musicGroupName" />
|
|
</resultMap>
|
|
</resultMap>
|
|
|
|
|
|
<sql id="queryPageCondition">
|
|
<sql id="queryPageCondition">
|
|
@@ -60,6 +62,23 @@
|
|
<if test="type != null">
|
|
<if test="type != null">
|
|
and ee.group_type_ = #{type}
|
|
and ee.group_type_ = #{type}
|
|
</if>
|
|
</if>
|
|
|
|
+ <if test="search != null ">
|
|
|
|
+ and (su.username_ like '%' #{search} '%' or mg.name_ like '%' #{search} '%')
|
|
|
|
+ </if>
|
|
|
|
+ <if test="type != null">
|
|
|
|
+ and ee.group_type_ = #{type}
|
|
|
|
+ </if>
|
|
|
|
+ <if test="studentExerciseId != null">
|
|
|
|
+ and ee.id_ = #{studentExerciseId}
|
|
|
|
+ </if>
|
|
|
|
+ <if test="studentAssignFlag != null">
|
|
|
|
+ <if test="studentAssignFlag == true">
|
|
|
|
+ and ee.music_group_id_ is null
|
|
|
|
+ </if>
|
|
|
|
+ <if test="studentAssignFlag == false">
|
|
|
|
+ and ee.student_id_list_ is not null
|
|
|
|
+ </if>
|
|
|
|
+ </if>
|
|
</where>
|
|
</where>
|
|
</sql>
|
|
</sql>
|
|
|
|
|
|
@@ -128,10 +147,12 @@
|
|
<select id="queryPage" resultMap="ExtracurricularExercises" parameterType="map">
|
|
<select id="queryPage" resultMap="ExtracurricularExercises" parameterType="map">
|
|
SELECT ee.id_,ee.teacher_id_,ee.student_id_list_,ee.batch_no_,ee.title_,ee.attachments_,ee.music_group_id_,
|
|
SELECT ee.id_,ee.teacher_id_,ee.student_id_list_,ee.batch_no_,ee.title_,ee.attachments_,ee.music_group_id_,
|
|
ee.content_,ee.expire_date_,ee.completed_num_,ee.expect_num_,ee.create_time_,ee.update_time_,ee.tenant_id_
|
|
ee.content_,ee.expire_date_,ee.completed_num_,ee.expect_num_,ee.create_time_,ee.update_time_,ee.tenant_id_
|
|
- ,u.real_name_ username_,o.name_ organ_name_,eer.music_score_id_,ee.create_time_ as assignTime
|
|
|
|
|
|
+ ,u.real_name_ username_,o.name_ organ_name_,eer.music_score_id_,ee.create_time_ as assignTime,mg.name_ as musicGroupName,ee.class_group_id_ as classGroupId
|
|
FROM extracurricular_exercises ee LEFT JOIN sys_user u ON ee.teacher_id_ = u.id_
|
|
FROM extracurricular_exercises ee LEFT JOIN sys_user u ON ee.teacher_id_ = u.id_
|
|
LEFT JOIN teacher t ON t.id_ = ee.teacher_id_
|
|
LEFT JOIN teacher t ON t.id_ = ee.teacher_id_
|
|
|
|
+ left join sys_user su on t.id_ = su.id_
|
|
LEFT JOIN organization o ON o.id_ = t.organ_id_
|
|
LEFT JOIN organization o ON o.id_ = t.organ_id_
|
|
|
|
+ left join music_group mg on mg.id_ = ee.music_group_id_
|
|
LEFT JOIN extracurricular_exercises_reply eer ON ee.id_ = eer.extracurricular_exercises_id_
|
|
LEFT JOIN extracurricular_exercises_reply eer ON ee.id_ = eer.extracurricular_exercises_id_
|
|
<include refid="queryPageCondition"/>
|
|
<include refid="queryPageCondition"/>
|
|
GROUP BY ee.id_
|
|
GROUP BY ee.id_
|
|
@@ -142,7 +163,9 @@
|
|
<select id="queryCount" resultType="int">
|
|
<select id="queryCount" resultType="int">
|
|
SELECT COUNT(DISTINCT ee.id_) FROM extracurricular_exercises ee left join sys_user u on ee.teacher_id_ = u.id_
|
|
SELECT COUNT(DISTINCT ee.id_) FROM extracurricular_exercises ee left join sys_user u on ee.teacher_id_ = u.id_
|
|
left join teacher t on t.id_ = ee.teacher_id_
|
|
left join teacher t on t.id_ = ee.teacher_id_
|
|
|
|
+ left join sys_user su on t.id_ = su.id_
|
|
left join organization o on o.id_ = t.organ_id_
|
|
left join organization o on o.id_ = t.organ_id_
|
|
|
|
+ left join music_group mg on mg.id_ = ee.music_group_id_
|
|
LEFT JOIN extracurricular_exercises_reply eer ON ee.id_ = eer.extracurricular_exercises_id_
|
|
LEFT JOIN extracurricular_exercises_reply eer ON ee.id_ = eer.extracurricular_exercises_id_
|
|
<include refid="queryPageCondition"/>
|
|
<include refid="queryPageCondition"/>
|
|
</select>
|
|
</select>
|