乐团档案

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

@@ -1,12 +1,17 @@
 package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.dto.WaitCourseTrainPlanDto;
 import com.ym.mec.biz.dal.entity.MusicGroupTrainPlan;
 import com.ym.mec.biz.dal.entity.MusicGroupTrainPlanSaveDto;
 import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface MusicGroupTrainPlanDao extends BaseDAO<Integer, MusicGroupTrainPlan> {
 
 
     int add(@Param("dto") MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto);
+
+    List<WaitCourseTrainPlanDto> queryWaitCourseTrainPlan(String musicGroupId);
 }

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

@@ -0,0 +1,46 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.CourseSchedule;
+
+public class WaitCourseTrainPlanDto {
+
+    private Integer classGroupId;
+
+    private CourseSchedule.CourseScheduleType scheduleType;
+
+    private Integer num;
+
+    private String classGroupName;
+
+    public Integer getClassGroupId() {
+        return classGroupId;
+    }
+
+    public void setClassGroupId(Integer classGroupId) {
+        this.classGroupId = classGroupId;
+    }
+
+    public CourseSchedule.CourseScheduleType getScheduleType() {
+        return scheduleType;
+    }
+
+    public void setScheduleType(CourseSchedule.CourseScheduleType scheduleType) {
+        this.scheduleType = scheduleType;
+    }
+
+    public Integer getNum() {
+        return num;
+    }
+
+    public void setNum(Integer num) {
+        this.num = num;
+    }
+
+    public String getClassGroupName() {
+        return classGroupName;
+    }
+
+    public void setClassGroupName(String classGroupName) {
+        this.classGroupName = classGroupName;
+    }
+}

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.biz.dal.dao.CourseScheduleDao;
 import com.ym.mec.biz.dal.dao.MusicGroupTrainPlanDao;
+import com.ym.mec.biz.dal.dto.WaitCourseTrainPlanDto;
 import com.ym.mec.biz.dal.entity.MusicGroupTrainPlan;
 import com.ym.mec.biz.dal.entity.MusicGroupTrainPlanSaveDto;
 import com.ym.mec.biz.service.MusicGroupTrainPlanService;
@@ -54,7 +55,8 @@ public class MusicGroupTrainPlanServiceImpl extends BaseServiceImpl<Integer, Mus
 		resultMap.put("classDates",classDates);
 		resultMap.put("musicGroupTrainPlans",musicGroupTrainPlans);
 		//未规划的课程明细
-		//获取课程
+		//获取乐团当前学期每个班级不同课程类型数量
+		List<WaitCourseTrainPlanDto> waitCourseTrainPlanDtos = musicGroupTrainPlanDao.queryWaitCourseTrainPlan(musicGroupTrainPlanSaveDto.getMusicGroupId());
 		return resultMap;
 	}
 

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

@@ -95,4 +95,21 @@
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM music_group_train_plan
 	</select>
+	<resultMap id="WaitCourseTrainPlanDto" type="com.ym.mec.biz.dal.dto.WaitCourseTrainPlanDto">
+		<result property="classGroupId" column="class_group_id_"/>
+		<result property="classGroupName" column="name_"/>
+		<result property="num" column="num_"/>
+		<result property="scheduleType" column="type_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+	</resultMap>
+    <select id="queryWaitCourseTrainPlan" resultType="com.ym.mec.biz.dal.dto.WaitCourseTrainPlanDto">
+		SELECT c.class_group_id_,c.type_,c.course_num_ - t.course_num_ num_,c.name_ FROM (
+		SELECT cs.class_group_id_,cs.type_,COUNT(cs.id_) course_num_,cg.name_ FROM course_schedule cs
+																					   LEFT JOIN class_group cg ON cg.id_ = cs.class_group_id_
+		WHERE cs.music_group_id_ = #{musicGroupId}
+		GROUP BY cs.class_group_id_,cs.type_) c
+		LEFT JOIN (SELECT tp.class_group_id_,tp.course_type_ type_,COUNT(tp.id_) course_num_,'' name_ FROM music_group_train_plan tp
+				   WHERE tp.music_group_id_ = #{musicGroupId}
+				   GROUP BY tp.class_group_id_,tp.course_type_) t ON 1=1
+		WHERE c.class_group_id_ = t.class_group_id_ AND c.type_ = t.type_ AND c.course_num_ > t.course_num_
+	</select>
 </mapper>

mec-web/src/main/resources/logback-spring.xml

@@ -65,6 +65,13 @@
 		</root>
 	</springProfile>
 
+	<springProfile name="dev_server">
+		<root level="INFO">
+			<appender-ref ref="stdout" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
+
 	<!--生产环境:输出到文件 -->
 	<springProfile name="prod">
 		<root level="WARN">
@@ -73,4 +80,4 @@
 		</root>
 	</springProfile>
 
-</configuration>
+</configuration>