Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherLeaveRecordDto.java

@@ -17,6 +17,17 @@ public class TeacherLeaveRecordDto extends QueryInfo {
     @ApiModelProperty(value = "教师编号",required = false)
     private Integer teacherId;
 
+    @ApiModelProperty(value = "请假审批状态",required = false)
+    private String status;
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
     public String getStartTime() {
         return startTime;
     }

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

@@ -1052,8 +1052,11 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 			// 获取对应家长的用户编号
 			Map<Integer, String> userIds = MapUtil.convertMybatisMap(studentRegistrationDao.findParentId(StringUtils.join(parentsPhones, ",")));
 			userIds = JSONObject.parseObject(JSONObject.toJSONString(userIds), HashMap.class);
-			String content = sysMessageConfigDao.findContent(MessageTypeEnum.SMS_BASICS_SKILL_APPLY_MESSAGE.getCode());
-			sysMessageService.batchSendMessage(MessageSender.YIMEI, "", content, userIds, new Date(), 0, "", "");
+			if(userIds != null && userIds .size() > 0){
+                String studentApplyUrl = sysConfigDao.findConfigValue(SysConfigService.STUDENT_APPLY_URL) + musicGroupId;
+                String serverPhone = sysConfigDao.findConfigValue(SysConfigService.SERVER_PHONE);
+                sysMessageService.batchSendMessage(MessageSender.YIMEI,MessageTypeEnum.SMS_BASICS_SKILL_APPLY_MESSAGE,userIds,null,0,"",musicGroup.getName(),studentApplyUrl,serverPhone);
+            }
 		}
         Set<Integer> roleIds = new HashSet<>(1);
         roleIds.add(SysUserRole.SECTION_MANAGER);

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

@@ -683,7 +683,7 @@
         LEFT JOIN course_schedule cs ON sa.course_schedule_id_=cs.id_
         LEFT JOIN sys_user su ON sa.teacher_id_=su.id_
         <include refid="queryStudentCourseScheduleRecordCondition"/>
-        ORDER BY sa.id_
+        ORDER BY cs.class_date_ DESC,cs.start_class_time_ DESC
         <include refid="global.limit"/>
     </select>
     <select id="countStudentCourseScheduleRecords" resultType="int">
@@ -712,6 +712,7 @@
         LEFT JOIN sys_user su ON cs.teacher_id_ = su.id_
         LEFT JOIN class_group cg ON cgsm.class_group_id_=cg.id_
         WHERE cs.status_='NOT_START' AND cgsm.user_id_=#{userId} AND cs.class_date_=DATE_FORMAT(#{date},'%Y%m%d')
+        ORDER BY cs.class_date_,cs.start_class_time_
     </select>
     <select id="findCourseScheduleByMusicGroup" resultMap="CourseSchedule">
         SELECT

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

@@ -103,7 +103,7 @@
 		FROM teacher_leave_record tlr
 		LEFT JOIN leave_category lc ON tlr.leave_category_id_ = lc.id_
 		<include refid="queryLeavePage"/>
-		ORDER BY tlr.id_
+		ORDER BY tlr.create_time_ DESC
 		<include refid="global.limit" />
 	</select>
 
@@ -121,6 +121,9 @@
 			<if test="teacherId != null">
 				AND tlr.user_id_ = #{teacherId}
 			</if>
+			<if test="status != null">
+				AND tlr.status_ = #{status}
+			</if>
 		</where>
 	</sql>
 

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

@@ -298,6 +298,7 @@
         LEFT JOIN teacher_attendance ta ON cs.id_ = ta.course_schedule_id_
         LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
         <include refid="queryCloses"/>
+        ORDER BY cs.class_date_ DESC,cs.start_class_time_ DESC
         <include refid="global.limit"/>
     </select>