乐团档案乐团资讯

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

@@ -1128,6 +1128,14 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
                                                          @Param("endClassDate") Date endClassDate);
 
     /**
+     * 根据班级编号获取课程类型
+     *
+     * @param musicGroupTrainPlanSaveDto
+     * @return
+     */
+    List<String> queryCourseTypeByClassGroupIds(@Param("dto") MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto);
+
+    /**
      * 根据班级编号count当前课时(已上总数)
      *
      * @param classGroupIds

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

@@ -0,0 +1,9 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.biz.dal.entity.MusicGroupNews;
+
+public interface MusicGroupNewsDao extends BaseDAO<Long, MusicGroupNews> {
+
+	
+}

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

@@ -0,0 +1,126 @@
+package com.ym.mec.biz.dal.entity;
+
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(music_group_news):
+ */
+public class MusicGroupNews {
+
+	/**  */
+	private Long id;
+	
+	/** 标题 */
+	private String title;
+	
+	/** 状态（1-可见 0-不可见） */
+	private YesOrNoEnum status = YesOrNoEnum.YES;
+	
+	/** 链接地址 */
+	private String linkUrl;
+	
+	/** 顺序号 */
+	private Integer order = 0;
+	
+	/** 乐团编号 */
+	private String musicGroupId;
+	
+	/** 作者 */
+	private String author;
+	
+	/** 添加人 */
+	private Integer operatorId;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	/**  */
+	private java.util.Date updateTime;
+
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setTitle(String title){
+		this.title = title;
+	}
+	
+	public String getTitle(){
+		return this.title;
+	}
+
+	public YesOrNoEnum getStatus() {
+		return status;
+	}
+
+	public void setStatus(YesOrNoEnum status) {
+		this.status = status;
+	}
+
+	public void setLinkUrl(String linkUrl){
+		this.linkUrl = linkUrl;
+	}
+	
+	public String getLinkUrl(){
+		return this.linkUrl;
+	}
+			
+	public void setOrder(Integer order){
+		this.order = order;
+	}
+	
+	public Integer getOrder(){
+		return this.order;
+	}
+			
+	public void setMusicGroupId(String musicGroupId){
+		this.musicGroupId = musicGroupId;
+	}
+	
+	public String getMusicGroupId(){
+		return this.musicGroupId;
+	}
+			
+	public void setAuthor(String author){
+		this.author = author;
+	}
+	
+	public String getAuthor(){
+		return this.author;
+	}
+
+	public Integer getOperatorId() {
+		return operatorId;
+	}
+
+	public void setOperatorId(Integer operatorId) {
+		this.operatorId = operatorId;
+	}
+
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupNewsService.java

@@ -0,0 +1,8 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.MusicGroupNews;
+import com.ym.mec.common.service.BaseService;
+
+public interface MusicGroupNewsService extends BaseService<Long, MusicGroupNews> {
+
+}

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupTrainPlanService.java

@@ -15,4 +15,6 @@ public interface MusicGroupTrainPlanService extends BaseService<Integer, MusicGr
     Map<String,Object> queryPlanPage(MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto);
 
     List<ClassGroup> queryPlanCourseNum(MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto);
+
+    List<String> queryCourseType(MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto);
 }

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

@@ -0,0 +1,22 @@
+package com.ym.mec.biz.service.impl;
+
+import com.ym.mec.common.dal.BaseDAO;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.biz.dal.entity.MusicGroupNews;
+import com.ym.mec.biz.service.MusicGroupNewsService;
+import com.ym.mec.biz.dal.dao.MusicGroupNewsDao;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MusicGroupNewsServiceImpl extends BaseServiceImpl<Long, MusicGroupNews>  implements MusicGroupNewsService {
+	
+	@Autowired
+	private MusicGroupNewsDao musicGroupNewsDao;
+
+	@Override
+	public BaseDAO<Long, MusicGroupNews> getDAO() {
+		return musicGroupNewsDao;
+	}
+	
+}

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

@@ -90,7 +90,13 @@ public class MusicGroupTrainPlanServiceImpl extends BaseServiceImpl<Integer, Mus
 		return classGroups;
 	}
 
-	private MusicGroupTrainPlanSaveDto getCourseDetail(MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto){
+    @Override
+    public List<String> queryCourseType(MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto) {
+		getCourseDetail(musicGroupTrainPlanSaveDto);
+		return courseScheduleDao.queryCourseTypeByClassGroupIds(musicGroupTrainPlanSaveDto);
+    }
+
+    private MusicGroupTrainPlanSaveDto getCourseDetail(MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto){
 		String year = musicGroupTrainPlanSaveDto.getYear();
 		if(musicGroupTrainPlanSaveDto.getTerm() == 0){
 			musicGroupTrainPlanSaveDto.setStartSchoolTerm(DateUtil.stringToDate(year + "-03-01 00:00:00"));

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

@@ -2361,6 +2361,17 @@
         AND cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0 AND cs.is_lock_ = 0
         GROUP BY cs.class_group_id_
     </select>
+    <select id="queryCourseTypeByClassGroupIds" resultType="java.lang.String">
+        SELECT DISTINCT cs.type_ FROM course_schedule cs
+        WHERE cs.class_group_id_ = #{dto.classGroupId}
+        <if test="dto.startClassDate != null">
+            AND cs.class_date_ >= DATE_FORMAT(#{dto.startClassDate}, '%Y%m%d')
+        </if>
+        <if test="dto.endClassDate != null">
+            AND cs.class_date_ &lt;= DATE_FORMAT(#{dto.endClassDate}, '%Y%m%d')
+        </if>
+        AND cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0 AND cs.is_lock_ = 0
+    </select>
     <select id="countCurrentNumByClassGroupId" resultType="java.util.Map">
         SELECT cs.class_group_id_ 'key',COUNT(cs.id_) 'value' FROM course_schedule cs
         WHERE cs.class_group_id_ IN

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

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+这个文件是自动生成的。
+不要修改此文件。所有改动将在下次重新自动生成时丢失。
+-->
+<mapper namespace="com.ym.mec.biz.dal.dao.MusicGroupNewsDao">
+	
+	<resultMap type="com.ym.mec.biz.dal.entity.MusicGroupNews" id="MusicGroupNews">
+		<result column="id_" property="id" />
+		<result column="title_" property="title" />
+		<result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+		<result column="link_url_" property="linkUrl" />
+		<result column="order_" property="order" />
+		<result column="music_group_id_" property="musicGroupId" />
+		<result column="author_" property="author" />
+		<result column="operator_id_" property="operatorId" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="MusicGroupNews" >
+		SELECT * FROM music_group_news WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="MusicGroupNews">
+		SELECT * FROM music_group_news ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupNews" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		INSERT INTO music_group_news (title_,status_,link_url_,order_,music_group_id_,author_,operator_id_,create_time_,update_time_)
+		VALUES(#{title},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{linkUrl},#{order},#{musicGroupId},#{author},#{operatorId},NOW(),NOW())
+	</insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.biz.dal.entity.MusicGroupNews">
+		UPDATE music_group_news <set>
+		<if test="operatorId != null">
+		operator_id_ = #{operatorId},
+		</if>
+		<if test="status != null">
+		status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+		</if>
+		<if test="author != null">
+		author_ = #{author},
+		</if>
+		<if test="title != null">
+		title_ = #{title},
+		</if>
+		<if test="linkUrl != null">
+		link_url_ = #{linkUrl},
+		</if>
+		<if test="order != null">
+		order_ = #{order},
+		</if>
+		<if test="musicGroupId != null">
+		music_group_id_ = #{musicGroupId},
+		</if>
+		update_time_ = NOW()
+		</set> WHERE id_ = #{id}
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM music_group_news WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="MusicGroupNews" parameterType="map">
+		SELECT * FROM music_group_news ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM music_group_news
+	</select>
+</mapper>

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

@@ -0,0 +1,66 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.entity.MusicGroupNews;
+import com.ym.mec.biz.service.MusicGroupNewsService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.page.QueryInfo;
+import com.yonge.log.model.AuditLogAnnotation;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequestMapping("musicGroupNews")
+@Api(tags = "乐团资讯服务")
+@RestController
+public class MusicGroupNewsController extends BaseController {
+
+    @Autowired
+    private MusicGroupNewsService musicGroupNewsService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+    @ApiOperation(value = "新增")
+    @PostMapping("/add")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupNews/add')")
+    @AuditLogAnnotation(operateName = "新增")
+    public Object add(MusicGroupNews musicGroupNews) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            throw new BizException("请登录");
+        }
+        musicGroupNews.setOperatorId(sysUser.getId());
+        return succeed(musicGroupNewsService.insert(musicGroupNews));
+    }
+
+    @ApiOperation(value = "删除")
+    @PostMapping("/del")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupNews/del')")
+    public Object del(Long id) {
+        musicGroupNewsService.delete(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改")
+    @PostMapping("/update")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupNews/update')")
+    public Object update(MusicGroupNews musicGroupNews) {
+        musicGroupNewsService.update(musicGroupNews);
+        return succeed();
+    }
+
+    @ApiOperation(value = "分页查询")
+    @GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupNews/queryPage')")
+    public Object queryPage(QueryInfo queryInfo) {
+        return succeed(musicGroupNewsService.queryPage(queryInfo));
+    }
+
+}

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

@@ -54,4 +54,11 @@ public class MusicGroupTrainPlanController extends BaseController {
 	public Object queryPlanCourseNum(@RequestBody MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto) {
 		return succeed(musicGroupTrainPlanService.queryPlanCourseNum(musicGroupTrainPlanSaveDto));
 	}
+
+	@ApiOperation("获取乐团训练规划课程类型")
+	@PostMapping(value = "queryCourseType")
+	@PreAuthorize("@pcs.hasPermissions('musicGroupTrainPlan/queryCourseType')")
+	public Object queryCourseType(@RequestBody MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto) {
+		return succeed(musicGroupTrainPlanService.queryCourseType(musicGroupTrainPlanSaveDto));
+	}
 }