Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/PracticeGroup.java

@@ -1,11 +1,10 @@
 package com.ym.mec.biz.dal.entity;
 
-import java.util.Date;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
 import com.ym.mec.biz.dal.enums.GroupStatusEnum;
 import com.ym.mec.biz.dal.enums.PracticeGroupType;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import java.util.Date;
 
 /**
  * 对应数据库表(practice_group):
@@ -40,6 +39,8 @@ public class PracticeGroup {
 	
 	/**  */
 	private java.util.Date coursesStartDate;
+
+	private String coursesStartDates;
 	
 	/**  */
 	private java.util.Date coursesExpireDate;
@@ -65,6 +66,14 @@ public class PracticeGroup {
 
 	private Integer educationalTeacherId;
 
+	public String getCoursesStartDates() {
+		return coursesStartDates;
+	}
+
+	public void setCoursesStartDates(String coursesStartDates) {
+		this.coursesStartDates = coursesStartDates;
+	}
+
 	public Integer getEducationalTeacherId() {
 		return educationalTeacherId;
 	}

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

@@ -45,6 +45,7 @@
         <result column="single_class_minutes_" property="singleClassMinutes"/>
         <result column="organ_id_" property="organId"/>
         <result column="courses_start_date_" property="coursesStartDate"/>
+        <result column="courses_start_dates_" property="coursesStartDates"/>
         <result column="courses_expire_date_" property="coursesExpireDate"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
@@ -610,8 +611,7 @@
             pg.name_,
             pg.user_id_,
             su.real_name_ teacher_name_,
-            MIN(CONCAT(cs.class_date_, ' ', cs.start_class_time_)) courses_start_date_,
-            MAX(CONCAT(cs.class_date_, ' ', cs.end_class_time_)) courses_expire_date_,
+            GROUP_CONCAT(CONCAT(cs.class_date_, ' ', cs.start_class_time_)) courses_start_dates_,
             pg.memo_
         FROM
             practice_group pg