Browse Source

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

Joburgess 5 years ago
parent
commit
746a797e52

+ 1 - 2
mec-biz/src/main/java/com/ym/mec/biz/service/impl/CoursesGroupServiceImpl.java

@@ -400,8 +400,7 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
         studentPaymentOrder.setVersion(0);
 
         if(amount.compareTo(BigDecimal.ZERO)<=0){
-            this.orderCallback(studentPaymentOrder);
-            return BaseController.succeed();
+            return this.orderCallback(studentPaymentOrder);
         }else{
             studentPaymentOrderService.insert(studentPaymentOrder);
 

+ 21 - 1
mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -2731,7 +2731,27 @@
         )
     </select>
     <select id="findGroupNotStartCourses" resultMap="CourseSchedule">
-        SELECT * FROM course_schedule WHERE group_type_=#{groupType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler} AND music_group_id_ = #{groupId} AND CONCAT(class_date_, ' ', start_class_time_)&gt;NOW()
+        SELECT
+            id_,
+            group_type_,
+            music_group_id_,
+            class_group_id_,
+            status_,
+            subsidy_,
+            class_date_,
+            CONCAT(class_date_, ' ', start_class_time_) start_class_time_,
+            CONCAT(class_date_, ' ', end_class_time_)   end_class_time_,
+            teacher_id_,
+            actual_teacher_id_,
+            create_time_,
+            update_time_,
+            teach_mode_,
+            type_,
+            name_,
+            student_num_,
+            leave_student_num_,
+            schoole_id_
+        FROM course_schedule WHERE group_type_=#{groupType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler} AND music_group_id_ = #{groupId} AND CONCAT(class_date_, ' ', start_class_time_)&gt;NOW()
     </select>
     <select id="getSubjectNameById" resultType="java.lang.String">
         SELECT GROUP_CONCAT(DISTINCT s.name_) FROM course_schedule cs