导出修改

mec-biz/src/main/resources/config/mybatis/ActivityUserMapperMapper.xml

@@ -313,14 +313,14 @@
 			t.activity_id_ as activityId,
 			o.name_ as organizationName,
 			vga.name_ as activityName,
-			sum(if(t.sub_course_num_ > 0,1,0)) as subCourseNum,
-			sum(if(t.sub_give_course_num_ > 0,1,0)) as subGiveCourseNum
+			sum(if(t.vip_flag_ = 1 || t.practice_flag_ = 1 ,1,0)) as subCourseNum,
+			sum(if(t.give_vip_flag_ = 1 || t.give_practice_flag_ = 1,1,0)) as subGiveCourseNum
 		from activity_user_mapper t
 				 left join vip_group_activity vga on t.activity_id_ = vga.id_
 				 left join sys_user su on t.user_id_ = su.id_
 				 left join organization o on su.organ_id_ = o.id_
-		where t.tenant_id_ = #{tenantId}
-		and (t.sub_course_num_>0 or t.sub_give_course_num_>0)
+		where t.tenant_id_ = #{tenantId} and t.return_fee_ = 0
+		and (t.vip_flag_ = 1 or t.give_vip_flag_ = 1 or t.practice_flag_ = 1 or t.give_practice_flag_ = 1)
 		<if test="organId != null">
 			AND FIND_IN_SET(su.organ_id_,#{organId})
 		</if>

mec-biz/src/main/resources/config/mybatis/StudentExtracurricularExercisesSituationMapper.xml

@@ -919,7 +919,7 @@
         select
             t.student_id_,
             t.music_group_name_,
-            concat(#{params.monday},'至', #{params.sunday}) as serve_period_,
+            concat(#{params.startTime},'至', #{params.endTime}) as serve_period_,
             t.username_,
             t.organ_name_,
             ifnull(sees.serve_num_,0) as serve_num_,
@@ -961,11 +961,11 @@
                 <if test="params.tenantId != null and params.tenantId > 0">
                     AND sees.tenant_id_ = #{params.tenantId}
                 </if>
-                <if test="params.monday != null and params.monday != ''">
-                    AND DATE_FORMAT(sees.monday_, '%Y-%m-%d') &gt;= #{params.monday}
+                <if test="params.startTime != null and params.startTime != ''">
+                    AND DATE_FORMAT(sees.monday_, '%Y-%m-%d') &gt;= #{params.startTime}
                 </if>
-                <if test="params.sunday != null and params.sunday != ''">
-                    AND DATE_FORMAT(sees.sunday_, '%Y-%m-%d') &lt;= #{params.sunday}
+                <if test="params.endTime != null and params.endTime != ''">
+                    AND DATE_FORMAT(sees.sunday_, '%Y-%m-%d') &lt;= #{params.endTime}
                 </if>
                 <if test="params.organId != null and params.organId != ''">
                     AND FIND_IN_SET(u.organ_id_,#{params.organId})
@@ -983,15 +983,17 @@
             left join sys_user u ON cssp.user_id_ = u.id_
             left join student_attendance sa on cssp.user_id_ = sa.user_id_ and cs.id_ = sa.course_schedule_id_
             <where>
-                cs.group_type_ = 'MUSIC' and cs.id_ is not null
+                cs.del_flag_ = 0 and cs.is_lock_ = 0 AND cs.pre_course_flag_ = 0 AND cs.organ_id_ IS NOT NULL and cs.id_ is not null
+                and cs.group_type_ = 'MUSIC'
+                and (cs.new_course_id_ is null or cs.id = cs.new_course_id_)
                 <if test="params.tenantId != null and params.tenantId > 0">
                     AND cs.tenant_id_ = #{params.tenantId}
                 </if>
-                <if test="params.monday != null and params.monday != ''">
-                    AND DATE_FORMAT(cs.start_class_time_, '%Y-%m-%d') &gt;= #{params.monday}
+                <if test="params.startTime != null and params.startTime != ''">
+                    AND DATE_FORMAT(cs.start_class_time_, '%Y-%m-%d') &gt;= #{params.startTime}
                 </if>
-                <if test="params.sunday != null and params.sunday != ''">
-                    AND DATE_FORMAT(cs.end_class_time_, '%Y-%m-%d') &lt;= #{params.sunday}
+                <if test="params.endTime != null and params.endTime != ''">
+                    AND DATE_FORMAT(cs.end_class_time_, '%Y-%m-%d') &lt;= #{params.endTime}
                 </if>
                 <if test="params.organId != null and params.organId != ''">
                     AND FIND_IN_SET(u.organ_id_,#{params.organId})