瀏覽代碼

1、添加教务老师字段
2、布置作业

Joburgess 5 年之前
父節點
當前提交
42faacbe0c

+ 2 - 3
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseHomeworkListDto.java

@@ -1,12 +1,11 @@
 package com.ym.mec.biz.dal.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.ym.mec.biz.dal.enums.YesOrNoEnum;
-
 /**
  * @Author Joburgess
  * @Date 2019/9/19

+ 2 - 1
mec-biz/src/main/resources/config/mybatis/CourseHomeworkMapper.xml

@@ -183,12 +183,13 @@
 			cg.total_class_times_,
 			cg.current_class_times_,
 			cg.music_group_id_,
-			cg.name_ music_group_name_
+			mg.name_ music_group_name_
 		FROM
 			course_homework ch
 			LEFT JOIN course_schedule cs ON ch.course_schedule_id_=cs.id_
 			LEFT JOIN course_schedule_teacher_salary csts ON ch.course_schedule_id_=csts.course_schedule_id_
 			LEFT JOIN class_group cg ON ch.class_group_id_=cg.id_
+			LEFT JOIN music_group mg ON cg.music_group_id_=mg.id_
 			WHERE
 			(cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
 			AND csts.user_id_=#{userId}

+ 1 - 0
mec-biz/src/main/resources/config/mybatis/StudentCourseHomeworkMapper.xml

@@ -170,6 +170,7 @@
             ch.*,
             mg.name_ music_group_name_,
             cg.name_ class_group_name_,
+            CONCAT( class_date_, ' ', start_class_time_ ) start_class_time_,
             temp.next_class_date_,
             sch.remark_,
             sch.status_,