feat：乐团改造

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

@@ -163,6 +163,15 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      */
     List<CourseSchedule> getClassGroupCourses(@Param("classGroupId") Long classGroupId);
 
+    /**
+     * @describe 统计课程上被合课程的数量
+     * @author qnc99
+     * @date 2020/12/8 0008
+     * @param courseIds:
+     * @return java.util.List<java.lang.Long>
+     */
+    List<Map<Long, Integer>> countCourseMergeCourseNum(@Param("courseIds") List<Long> courseIds);
+
 
     /**
      * @param teacherId: 教师编号

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

@@ -46,6 +46,16 @@ public class CourseScheduleEndDto extends CourseSchedule {
     
     private String isComplaints;
 
+    private boolean beMerged;
+
+    public boolean getBeMerged() {
+        return beMerged;
+    }
+
+    public void setBeMerged(boolean beMerged) {
+        this.beMerged = beMerged;
+    }
+
     public PracticeGroup getPracticeGroup() {
         return practiceGroup;
     }

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

@@ -4447,6 +4447,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                 idPracticeMap = practiceGroups.stream().collect(Collectors.toMap(PracticeGroup::getId, e->e));
 			}
 
+			List<Map<Long, Integer>> courseMergeCourseNum = courseScheduleDao.countCourseMergeCourseNum(courseScheduleIds);
+			Map<Long, Integer> courseMergeCourseNumMap = new HashMap<>();
+			if(!CollectionUtils.isEmpty(courseMergeCourseNum)){
+				courseMergeCourseNumMap = MapUtil.convertIntegerMap(courseMergeCourseNum);
+			}
+
 			Set<Long> mergeCourseIds = results.stream().filter(e -> Objects.nonNull(e.getNewCourseId())).map(e -> e.getNewCourseId()).collect(Collectors.toSet());
 
 			//获取班级声部名称
@@ -4477,6 +4483,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 //				}
 				result.setSettlementTime(coursesSettlementTimeMap.get(result.getId()));
 				result.setIsSettlement(Objects.isNull(result.getSettlementTime())?0:1);
+				if(courseMergeCourseNumMap.containsKey(result.getId())){
+					result.setBeMerged(courseMergeCourseNumMap.get(result.getId())>0?true:false);
+				}
 			}
         }
         pageInfo.setRows(results);

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

@@ -3426,4 +3426,19 @@
         SELECT * FROM course_schedule WHERE id_ = #{courseId} FOR UPDATE
     </select>
 
+    <select id="countCourseMergeCourseNum" resultType="java.util.Map">
+        SELECT
+            new_course_id_ AS 'key',
+            COUNT( id_ ) AS 'value'
+        FROM
+            course_schedule
+        WHERE
+            new_course_id_ IN
+            <foreach collection="courseIds" item="courseId" open="(" close=")" separator=",">
+                #{courseId}
+            </foreach>
+        GROUP BY
+            new_course_id_
+    </select>
+
 </mapper>

mec-web/src/main/java/com/ym/mec/web/controller/TaskController.java

@@ -80,9 +80,6 @@ public class TaskController extends BaseController {
 	private StudentGoodsSellService studentGoodsSellService;
 
 	@Autowired
-	private CourseScheduleStudentPaymentService courseScheduleStudentPaymentService;
-
-	@Autowired
 	private CourseEventSource courseEventSource;
 
 	@GetMapping(value = "/autoAffirmReceiveTask")
@@ -298,7 +295,6 @@ public class TaskController extends BaseController {
 
 	@GetMapping("/updateCourseActualPrice")
 	public void updateCourseActualPrice(){
-//		courseScheduleStudentPaymentService.updateCourseActualPrice();
 		courseEventSource.courseStatusChange(null);
 	}
 }