yonge 5 years ago
parent
commit
0a11097e11

+ 10 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/VipGroupCourseSchduleRecordDto.java

@@ -30,6 +30,8 @@ public class VipGroupCourseSchduleRecordDto {
 
     @ApiModelProperty(value = "上课人数")
     private Integer attendanceNum;
+    
+    private String schoolName;
 
     public Integer getAttendanceNum() {
         return attendanceNum;
@@ -78,4 +80,12 @@ public class VipGroupCourseSchduleRecordDto {
     public void setIsSalary(YesOrNoEnum isSalary) {
         this.isSalary = isSalary;
     }
+
+	public String getSchoolName() {
+		return schoolName;
+	}
+
+	public void setSchoolName(String schoolName) {
+		this.schoolName = schoolName;
+	}
 }

+ 3 - 2
mec-biz/src/main/resources/config/mybatis/VipGroupMapper.xml

@@ -542,6 +542,7 @@
         <result column="give_teach_mode_" property="giveTeachMode" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="is_salary_" property="isSalary" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="student_num_" property="attendanceNum"/>
+        <result column="school_name_" property="schoolName"/>
     </resultMap>
 
     <sql id="teachingRecordQueryCondition">
@@ -565,11 +566,11 @@
             CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
             cs.status_,
             cs.teach_mode_,
-            cs.student_num_,
+            cs.student_num_,s.name_ school_name_,
             csts.actual_salary_ IS NOT NULL is_salary_
         FROM
             course_schedule cs
-            LEFT JOIN course_schedule_teacher_salary csts ON cs.id_=csts.course_schedule_id_
+            LEFT JOIN course_schedule_teacher_salary csts ON cs.id_=csts.course_schedule_id_ left join school s on cs.schoole_id_ = s.id_
         <include refid="teachingRecordQueryCondition"/>
         ORDER BY start_class_time_
         <include refid="global.limit"/>