缴费项目优化

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/HasFreeCourseTimesDto.java

@@ -30,6 +30,26 @@ public class HasFreeCourseTimesDto {
     @ApiModelProperty(value = "课程类型")
     private CourseSchedule.CourseScheduleType courseType;
 
+    private String organName;
+
+    private Integer organId;
+
+    public String getOrganName() {
+        return organName;
+    }
+
+    public void setOrganName(String organName) {
+        this.organName = organName;
+    }
+
+    public Integer getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(Integer organId) {
+        this.organId = organId;
+    }
+
     public String getMusicGroupId() {
         return musicGroupId;
     }

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

@@ -1014,6 +1014,7 @@
         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 music_group mg ON mg.id_ = mgpc.music_group_id_
+        LEFT JOIN sys_user su ON su.id_ = mgpscd.user_id_
         <include refid="queryHasFreeCourseTimesSql"/>
     </select>
     <resultMap id="HasFreeCourseTimesDto" type="com.ym.mec.biz.dal.dto.HasFreeCourseTimesDto">
@@ -1025,6 +1026,8 @@
         <result property="freeCourseMinutes" column="free_course_minutes_"/>
         <result property="totalCourseMinutes" column="total_course_minutes_"/>
         <result property="usedCourseMinutes" column="used_course_minutes_"/>
+        <result property="organName" column="organ_name_"/>
+        <result property="organId" column="organ_id_"/>
     </resultMap>
     <sql id="queryHasFreeCourseTimesSql">
         <where>
@@ -1046,11 +1049,13 @@
     </sql>
     <select id="queryHasFreeCourseTimes" resultMap="HasFreeCourseTimesDto">
         SELECT mg.id_ music_group_id_,mg.name_ music_group_name_,mgpscd.user_id_,mgpscd.total_course_minutes_,
-        mgpscd.used_course_minutes_,mgpscd.total_course_minutes_ - mgpscd.used_course_minutes_ free_course_minutes_,su.username_
+        mgpscd.used_course_minutes_,mgpscd.total_course_minutes_ - mgpscd.used_course_minutes_ free_course_minutes_,su.username_,
+        mgpscd.course_type_,o.name_ organ_name_,su.organ_id_
         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 music_group mg ON mg.id_ = mgpc.music_group_id_
         LEFT JOIN sys_user su ON su.id_ = mgpscd.user_id_
+        LEFT JOIN organization o ON o.id_ = su.organ_id_
         <include refid="queryHasFreeCourseTimesSql"/>
         ORDER BY mgpscd.update_time_ DESC
         <include refid="global.limit"/>