代码提交

mec-biz/src/main/java/com/ym/mec/biz/dal/page/StudentSubTotalCourseTimesQueryInfo.java

@@ -10,6 +10,8 @@ public class StudentSubTotalCourseTimesQueryInfo extends QueryInfo {
     private Boolean hastimer;
     @ApiModelProperty(value = "班级类型")
     private String courseType;
+    @ApiModelProperty(value = "班级id")
+    private String classGroupId;
 
     public String getMusicGroupId() {
         return musicGroupId;
@@ -34,4 +36,12 @@ public class StudentSubTotalCourseTimesQueryInfo extends QueryInfo {
     public void setCourseType(String courseType) {
         this.courseType = courseType;
     }
+
+    public String getClassGroupId() {
+        return classGroupId;
+    }
+
+    public void setClassGroupId(String classGroupId) {
+        this.classGroupId = classGroupId;
+    }
 }

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

@@ -296,6 +296,9 @@
         <if test="courseType != null and courseType != ''">
             and mgpscd.course_type_ = #{courseType}
         </if>
+        <if test="classGroupId != null and classGroupId != ''">
+            AND find_in_set(#{classGroupId},v.class_group_id_)
+        </if>
     </sql>
 
     <!-- 查询当前表的总记录数 -->
@@ -306,6 +309,13 @@
         FROM music_group_payment_student_course_detail mgpscd
         LEFT JOIN music_group_payment_calender mgpc ON mgpc.id_ = mgpscd.music_group_payment_calender_id_
         LEFT JOIN sys_user su ON su.id_ = mgpscd.user_id_
+        left join (
+            SELECT
+                user_id_ ,GROUP_CONCAT(class_group_id_) as class_group_id_
+            FROM class_group_student_mapper
+            WHERE music_group_id_ = #{musicGroupId} AND status_ = 'NORMAL'
+            GROUP BY user_id_
+        ) v on mgpscd.user_id_ = v.user_id_
         <include refid="sqlStudentSubTotalCourseTimes"/>
         GROUP BY mgpscd.user_id_,mgpscd.course_type_
     ) a
@@ -318,6 +328,13 @@
         FROM music_group_payment_student_course_detail mgpscd
         LEFT JOIN music_group_payment_calender mgpc ON mgpc.id_ = mgpscd.music_group_payment_calender_id_
         LEFT JOIN sys_user su ON su.id_ = mgpscd.user_id_
+        left join (
+            SELECT
+                user_id_ ,GROUP_CONCAT(class_group_id_) as class_group_id_
+            FROM class_group_student_mapper
+            WHERE music_group_id_ = #{musicGroupId} AND status_ = 'NORMAL'
+            GROUP BY user_id_
+        ) v on mgpscd.user_id_ = v.user_id_
         <include refid="sqlStudentSubTotalCourseTimes"/>
         GROUP BY mgpscd.user_id_,mgpscd.course_type_
         <include refid="global.limit"/>

mec-web/src/main/resources/exportColumnMapper.ini

@@ -280,4 +280,8 @@ fieldColumns = ["organName", "username", "userId", "teacherName", "teacherId", "
 
 [服务指标导出]
 headColumns = ["分部","老师编号","老师姓名","预计安排(人次)","实际安排(人次)","布置率(%)","提交人数","点评次数","点评率(%)","及时点评次数","及时点评率(%)"]
-fieldColumns = ["organName","teacherId","teacherName","expectExercisesNum","actualExercisesNum", "100 * actualExercisesNum / expectExercisesNum","exercisesReplyNum","exercisesMessageNum", "100 * exercisesMessageNum / exercisesReplyNum", "exercisesMessageTimelyNum","100 * exercisesMessageTimelyNum / exercisesReplyNum"]
+fieldColumns = ["organName","teacherId","teacherName","expectExercisesNum","actualExercisesNum", "100 * actualExercisesNum / expectExercisesNum","exercisesReplyNum","exercisesMessageNum", "100 * exercisesMessageNum / exercisesReplyNum", "exercisesMessageTimelyNum","100 * exercisesMessageTimelyNum / exercisesReplyNum"]
+
+[活动资格导出]
+headColumns = ["分部","学员编号","学员姓名","活动编号","活动名称","剩余排课资格"]
+fieldColumns = ["organizationName","userId","username","activityId","activityName", "subCourseNum"]