Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/PracticeGroupDao.java

@@ -359,6 +359,8 @@ public interface PracticeGroupDao extends com.ym.mec.common.dal.BaseDAO<Long, Pr
 
     List<PracticeCourseDto> getPracticeGroupByIds(@Param("practiceIds") List<Long> practiceIds);
 
+    List<PracticeGroup> getWithIds(@Param("practiceIds") List<Long> practiceIds);
+
     /**
      * @describe 获取网管课类型
      * @author Joburgess

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.entity.CourseSchedule;
+import com.ym.mec.biz.dal.entity.PracticeGroup;
 import com.ym.mec.biz.dal.enums.SignInStatusEnum;
 import com.ym.mec.biz.dal.enums.SignOutStatusEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
@@ -41,14 +42,14 @@ public class CourseScheduleEndDto extends CourseSchedule {
 
     private String settlementTime;
 
-    private String practiceGroupType;
+    private PracticeGroup practiceGroup;
 
-    public String getPracticeGroupType() {
-        return practiceGroupType;
+    public PracticeGroup getPracticeGroup() {
+        return practiceGroup;
     }
 
-    public void setPracticeGroupType(String practiceGroupType) {
-        this.practiceGroupType = practiceGroupType;
+    public void setPracticeGroup(PracticeGroup practiceGroup) {
+        this.practiceGroup = practiceGroup;
     }
 
     public String getSettlementTime() {

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

@@ -3744,10 +3744,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			Map<Long, String> coursesSettlementTimeMap = MapUtil.convertIntegerMap(coursesSettlementTimeMaps);
 
 			List<Long> practiceIds = results.stream().filter(e -> PRACTICE.equals(e.getGroupType())).map(e -> Long.valueOf(e.getMusicGroupId())).collect(Collectors.toList());
-			Map<Long, String> practiceGroupTypeMap=new HashMap<>();
+			Map<Long, PracticeGroup> idPracticeMap=new HashMap<>();
 			if(!CollectionUtils.isEmpty(practiceIds)){
-				List<Map<Long, String>> practiceGroupType = practiceGroupDao.getPracticeGroupType(practiceIds);
-				practiceGroupTypeMap = MapUtil.convertIntegerMap(practiceGroupType);
+				List<PracticeGroup> practiceGroups = practiceGroupDao.getWithIds(practiceIds);
+                idPracticeMap = practiceGroups.stream().collect(Collectors.toMap(PracticeGroup::getId, e->e));
 			}
 
 			//获取班级声部名称
@@ -3758,7 +3758,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				result.setTeacherName(nameIdMap.get(result.getActualTeacherId()));
 				result.setSubjectName(classGroupSubjectNameMap.get(result.getId()));
 				result.setStudentId(studentIdMap.get(result.getId()));
-				result.setPracticeGroupType(practiceGroupTypeMap.get(Long.valueOf(result.getMusicGroupId())));
+				result.setPracticeGroup(idPracticeMap.get(Long.valueOf(result.getMusicGroupId())));
 //				List<TeacherAttendance> courseTeacherAttendances = courseTeacherAttendanceMap.get(result.getId());
 				/*if(!CollectionUtils.isEmpty(courseTeacherAttendances)){
 					TeacherAttendance teacherAttendance=courseTeacherAttendances.get(0);

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

@@ -708,6 +708,14 @@
         </foreach>
     </select>
 
+    <select id="getWithIds" resultMap="PracticeGroup">
+        SELECT * FROM practice_group
+        WHERE id_ IN
+        <foreach collection="practiceIds" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
+
     <select id="getPracticeGroupType" resultType="map">
         SELECT id_ AS 'key', type_ AS 'value' FROM practice_group
         WHERE id_ IN