乐团档案

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

@@ -18,6 +18,16 @@ public class CourseScheduleRateDto {
 
     private Boolean isDefault = false;
 
+    private String coursePlan;
+
+    public String getCoursePlan() {
+        return coursePlan;
+    }
+
+    public void setCoursePlan(String coursePlan) {
+        this.coursePlan = coursePlan;
+    }
+
     public Boolean getIsDefault() {
         return isDefault;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupNews.java

@@ -31,6 +31,9 @@ public class MusicGroupNews {
 	
 	/** 添加人 */
 	private Integer operatorId;
+
+	/** 添加人 */
+	private String operatorName;
 	
 	/**  */
 	private java.util.Date createTime;
@@ -38,6 +41,14 @@ public class MusicGroupNews {
 	/**  */
 	private java.util.Date updateTime;
 
+	public String getOperatorName() {
+		return operatorName;
+	}
+
+	public void setOperatorName(String operatorName) {
+		this.operatorName = operatorName;
+	}
+
 	public void setId(Long id){
 		this.id = id;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/PhotoAlbum.java

@@ -3,6 +3,8 @@ package com.ym.mec.biz.dal.entity;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import java.util.Date;
+
 /**
  * 对应数据库表(photo_album_):
  */
@@ -36,11 +38,22 @@ public class PhotoAlbum {
 	private Integer order;
 	
 	/**  */
+	private java.util.Date timeLine;
+
+	/**  */
 	private java.util.Date createTime;
 	
 	/**  */
 	private java.util.Date updateTime;
 
+	public Date getTimeLine() {
+		return timeLine;
+	}
+
+	public void setTimeLine(Date timeLine) {
+		this.timeLine = timeLine;
+	}
+
 	public Long getPhotoNum() {
 		return photoNum;
 	}

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

@@ -5593,18 +5593,32 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		List<CourseScheduleReview> courseReviews = courseScheduleReviewDao.findByCourseSchedules(courseScheduleIds);
 		Map<Integer, List<CourseScheduleReview>> reviews = courseReviews.stream().collect(Collectors.groupingBy(CourseScheduleReview::getCourseScheduleId));
 
-		//标记当前课程的上一节课
-		if(courseSchedule != null){
-			for (CourseScheduleRateDto e:courseScheduleRateDtos) {
-				if(reviews.containsKey(e.getCourseScheduleId().intValue())){
-					List<CourseScheduleReview> review = reviews.get(e.getCourseScheduleId().intValue());
-					e.setTeachingContent(review.get(0).getTeachingMaterial());
+		MusicGroupTrainPlanSaveDto schoolTerm = null;
+		List<MusicGroupTrainPlan> planList = null;
+		for (CourseScheduleRateDto scheduleRateDto : courseScheduleRateDtos) {
+			if(schoolTerm == null){
+				schoolTerm = musicGroupTrainPlanService.getSchoolTerm(courseSchedule);
+				planList = musicGroupTrainPlanService.queryPlan(schoolTerm);
+			}else {
+				MusicGroupTrainPlanSaveDto schoolTerm1 = musicGroupTrainPlanService.getSchoolTerm(courseSchedule);
+				if(!DateUtil.format(schoolTerm1.getStartSchoolTerm(),DateUtil.ISO_EXPANDED_DATE_FORMAT).
+						equals(DateUtil.format(schoolTerm.getStartSchoolTerm(),DateUtil.ISO_EXPANDED_DATE_FORMAT))){
+					schoolTerm = schoolTerm1;
+					planList = musicGroupTrainPlanService.queryPlan(schoolTerm);
 				}
 			}
-			for (CourseScheduleRateDto e:courseScheduleRateDtos) {
-				if(e.getCourseScheduleId().equals(courseSchedule.getId())){
-					e.setIsDefault(true);
-					break;
+			int courseNumNo = courseScheduleDao.getCourseNumNo(schoolTerm);
+			if(planList.size() >= courseNumNo){
+				scheduleRateDto.setCoursePlan(planList.get(courseNumNo - 1).getPlan());
+			}
+			//获取课程规划
+			if(courseSchedule != null){
+				if(reviews.containsKey(scheduleRateDto.getCourseScheduleId().intValue())){
+					List<CourseScheduleReview> review = reviews.get(scheduleRateDto.getCourseScheduleId().intValue());
+					scheduleRateDto.setTeachingContent(review.get(0).getTeachingMaterial());
+				}
+				if(scheduleRateDto.getCourseScheduleId().equals(courseSchedule.getId())){
+					scheduleRateDto.setIsDefault(true);
 				}
 			}
 		}

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

@@ -15,6 +15,7 @@
 		<result column="music_group_id_" property="musicGroupId" />
 		<result column="author_" property="author" />
 		<result column="operator_id_" property="operatorId" />
+		<result column="real_name_" property="operatorName" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 	</resultMap>
@@ -70,7 +71,10 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="MusicGroupNews" parameterType="map">
-		SELECT * FROM music_group_news ORDER BY id_ <include refid="global.limit"/>
+		SELECT mgn.*,su.real_name_ FROM music_group_news mgn
+		LEFT JOIN sys_user su ON  su.id_ = mgn.operator_id_
+		ORDER BY mgn.id_
+		<include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->

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

@@ -15,6 +15,7 @@
 		<result column="cover_url_" property="coverUrl" />
 		<result column="cover_thumbnail_url_" property="coverThumbnailUrl" />
 		<result column="order_" property="order" />
+		<result column="time_line_" property="timeLine" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 	</resultMap>
@@ -31,40 +32,47 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.PhotoAlbum" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO photo_album_ (music_group_id_,name_,client_show_,type_,cover_url_,cover_thumbnail_url_,create_time_,update_time_,order_)
-		VALUES(#{musicGroupId},#{name},#{clientShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{type},#{coverUrl},#{coverThumbnailUrl},NOW(),NOW(),#{order})
+		INSERT INTO photo_album_ (music_group_id_,name_,client_show_,type_,cover_url_,cover_thumbnail_url_,create_time_,update_time_,order_,time_line_)
+		VALUES(#{musicGroupId},#{name},#{clientShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+		       #{type},#{coverUrl},#{coverThumbnailUrl},NOW(),NOW(),#{order},#{timeLine})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.PhotoAlbum">
 		UPDATE photo_album_ <set>
+		<if test="timeLine != null">
+			time_line_ = #{timeLine},
+		</if>
 		<if test="coverUrl != null">
-		cover_url_ = #{coverUrl},
+			cover_url_ = #{coverUrl},
 		</if>
 		<if test="order != null">
 			order_ = #{order},
 		</if>
 		<if test="coverThumbnailUrl != null">
-		cover_thumbnail_url_ = #{coverThumbnailUrl},
+			cover_thumbnail_url_ = #{coverThumbnailUrl},
 		</if>
 		<if test="clientShow != null">
-		client_show_ = #{clientShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+			client_show_ = #{clientShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		</if>
 		<if test="musicGroupId != null">
-		music_group_id_ = #{musicGroupId},
+			music_group_id_ = #{musicGroupId},
 		</if>
 		<if test="type != null">
-		type_ = #{type},
+			type_ = #{type},
 		</if>
 		<if test="name != null">
-		name_ = #{name},
+			name_ = #{name},
 		</if>
-		update_time_ = NOW()
+			update_time_ = NOW()
 		</set> WHERE id_ = #{id}
 	</update>
 	<update id="batchUpdate">
 		<foreach collection="photoAlbumList" item="album" separator=";">
 			UPDATE photo_album_ <set>
+			<if test="album.timeLine != null">
+				time_line_ = #{album.timeLine},
+			</if>
 			<if test="album.coverUrl != null">
 				cover_url_ = #{album.coverUrl},
 			</if>