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

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -1042,6 +1042,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         if (musicGroup == null) {
             throw new BizException("乐团不存在");
         }
+        if(classGroup4MixDto.getCourseTimes().compareTo(0) <= 0){
+            throw new BizException("排课次数必须大于0");
+        }
         Date entryDate = DateUtil.stringToDate(sysConfigDao.findByParamName(SysConfigService.TEACHER_ENTRY_DATE).getParanValue(),"yyyy-MM-dd");
         Integer schoolId = musicGroup.getSchoolId();
 
@@ -1293,6 +1296,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         if (classGroup == null) {
             throw new BizException("班级不存在");
         }
+        if(classGroup4MixDto.getCourseTimes().compareTo(0) <= 0){
+            throw new BizException("排课次数必须大于0");
+        }
         Integer courseTimes = classGroup4MixDto.getCourseTimes();
 
         Date entryDate = DateUtil.stringToDate(sysConfigDao.findByParamName(SysConfigService.TEACHER_ENTRY_DATE).getParanValue(),"yyyy-MM-dd");
@@ -1532,6 +1538,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         if (musicGroup == null) {
             throw new BizException("乐团不存在");
         }
+        if(classGroup4MixDto.getCourseTimes().compareTo(0) <= 0){
+            throw new BizException("排课次数必须大于0");
+        }
         Integer schoolId = musicGroup.getSchoolId();
 
         Date entryDate = DateUtil.stringToDate(sysConfigDao.findByParamName(SysConfigService.TEACHER_ENTRY_DATE).getParanValue(),"yyyy-MM-dd");

mec-biz/src/main/resources/config/contracts/courses.ftl

@@ -91,7 +91,7 @@
                     <span>身份证号：${studentInfo.idCardNo!}</span>
                 </div>
                 <div class="iInfo">
-                    <span>学生姓名：${studentInfo.name!}</span>
+                    <span>学生姓名：${studentInfo.username!}</span>
                 </div>
                 <#if studentInfo.grade?default("")?trim?length gt 1>
                 <div class="iInfo">

mec-biz/src/main/resources/config/contracts/goods.ftl

@@ -90,7 +90,7 @@
                     <span>身份证号：${studentInfo.idCardNo!}</span>
                 </div>
                 <div class="iInfo">
-                    <span>学生姓名：${studentInfo.name!}</span>
+                    <span>学生姓名：${studentInfo.username!}</span>
                 </div>
                 <#if studentInfo.grade?default("")?trim?length gt 1>
                 <div class="iInfo">

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

@@ -793,7 +793,7 @@
     </update>
 
     <select id="findClassGroupByType" resultMap="ClassGroupTeachers">
-        SELECT * FROM class_group WHERE music_group_id_=#{musicGroupId}
+        SELECT * FROM class_group WHERE music_group_id_=#{musicGroupId} AND group_type = 'MUSIC'
         <if test="type !=null ">
             AND type_=#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
         </if>