Merge remote-tracking branch 'origin/master'

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

@@ -1,7 +1,6 @@
 package com.ym.mec.biz.service.impl;
 
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -12,7 +11,6 @@ import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.DateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -652,7 +650,7 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
         Map<String, Object> params = new HashMap<>();
         MapUtil.populateMap(params, queryInfo);
 
-        List<StudentAttendance> dataList = null;
+        List<StudentAttendance> dataList = new ArrayList<StudentAttendance>();
         int count = studentAttendanceDao.countStudentAttendance(params);
         if (count > 0) {
             pageInfo.setTotal(count);

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

@@ -215,6 +215,9 @@
             <if test="updateTime != null">
                 update_time_ = NOW(),
             </if>
+            <if test="createTime != null">
+                create_time_ = #{createTime},
+            </if>
             <if test="parentsCompany != null">
                 parents_company_ = #{parentsCompany},
             </if>
@@ -719,8 +722,9 @@
     	select sr.*,s.name_ subject_name_,mg.status_ music_group_status_,mg.name_ music_group_name_,mgq.status_ music_group_quit_status_ 
     	from student_registration sr left join subject s on s.id_ = sr.actual_subject_id_
     	left join music_group mg on sr.music_group_id_ = mg.id_
-    	left join music_group_quit mgq  on mgq.music_group_id_ = mg.id_ and mgq.join_date_ = sr.create_time_
+    	left join (select mgq.* from music_group_quit mgq LEFT JOIN student_registration sr ON mgq.music_group_id_ = sr.music_group_id_ AND mgq.user_id_ = sr.user_id_ AND mgq.join_date_ = sr.create_time_
+		 where mgq.id_ in (select max(id_) from music_group_quit group by music_group_id_,user_id_)) mgq  on mgq.music_group_id_ = mg.id_
     	where sr.user_id_ = #{userId}
-    	order by sr.id_ 
+    	order by sr.id_
     </select>
 </mapper>