Merge branch 'music_detail' of http://git.dayaedu.com/yonge/mec into music_detail

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupQuestionnaireDao.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.MusicGroupQuestionnaire;
+
+public interface MusicGroupQuestionnaireDao extends BaseDAO<Integer, MusicGroupQuestionnaire> {
+
+	
+}

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

@@ -14,7 +14,19 @@ public interface MusicGroupTrainPlanDao extends BaseDAO<Integer, MusicGroupTrain
 
     int add(@Param("dto") MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto);
 
+    /**
+     * 课程数量大于课程规划
+     * @param musicGroupId
+     * @return
+     */
     List<WaitCourseTrainPlanDto> queryWaitCourseTrainPlan(String musicGroupId);
 
+    /**
+     * 课程数量小于课程规划
+     * @param musicGroupId
+     * @return
+     */
+    List<WaitCourseTrainPlanDto> queryWaitCourseTrainPlan1(String musicGroupId);
+
     List<String> findAllPlan(Map<String, Object> paramMap);
 }

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

@@ -0,0 +1,103 @@
+package com.ym.mec.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(music_group_questionnaire):
+ */
+public class MusicGroupQuestionnaire {
+
+	/**  */
+	private Integer id;
+	
+	/** 问题编号 */
+	private Integer questionnaireQuestionId;
+	
+	/** 乐团编号 */
+	private String musicGroupId;
+	
+	/** 调查对象 */
+	private String target;
+	
+	/** 调查人 */
+	private Integer operatorId;
+	
+	/** 调查时间 */
+	private java.util.Date questionTime;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	/**  */
+	private java.util.Date updateTime;
+	
+	public void setId(Integer id){
+		this.id = id;
+	}
+	
+	public Integer getId(){
+		return this.id;
+	}
+			
+	public void setQuestionnaireQuestionId(Integer questionnaireQuestionId){
+		this.questionnaireQuestionId = questionnaireQuestionId;
+	}
+	
+	public Integer getQuestionnaireQuestionId(){
+		return this.questionnaireQuestionId;
+	}
+			
+	public void setMusicGroupId(String musicGroupId){
+		this.musicGroupId = musicGroupId;
+	}
+	
+	public String getMusicGroupId(){
+		return this.musicGroupId;
+	}
+			
+	public void setTarget(String target){
+		this.target = target;
+	}
+	
+	public String getTarget(){
+		return this.target;
+	}
+
+	public void setOperatorId(Integer operatorId){
+		this.operatorId = operatorId;
+	}
+	
+	public Integer getOperatorId(){
+		return this.operatorId;
+	}
+			
+	public void setQuestionTime(java.util.Date questionTime){
+		this.questionTime = questionTime;
+	}
+	
+	public java.util.Date getQuestionTime(){
+		return this.questionTime;
+	}
+			
+	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/MusicGroupQuestionnaireService.java

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

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

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

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupQuestionnaireServiceImpl.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.MusicGroupQuestionnaire;
+import com.ym.mec.biz.service.MusicGroupQuestionnaireService;
+import com.ym.mec.biz.dal.dao.MusicGroupQuestionnaireDao;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MusicGroupQuestionnaireServiceImpl extends BaseServiceImpl<Integer, MusicGroupQuestionnaire>  implements MusicGroupQuestionnaireService {
+	
+	@Autowired
+	private MusicGroupQuestionnaireDao musicGroupQuestionnaireDao;
+
+	@Override
+	public BaseDAO<Integer, MusicGroupQuestionnaire> getDAO() {
+		return musicGroupQuestionnaireDao;
+	}
+	
+}

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

@@ -55,13 +55,15 @@ public class MusicGroupTrainPlanServiceImpl extends BaseServiceImpl<Integer, Mus
 		paramMap.put("endSchoolTerm",musicGroupTrainPlanSaveDto.getEndSchoolTerm());
 		//课程规划
 		List<MusicGroupTrainPlan> musicGroupTrainPlans = musicGroupTrainPlanDao.findAll(paramMap);
-		Map<String,Object> resultMap = new HashMap<>(2);
+		Map<String,Object> resultMap = new HashMap<>(4);
 		resultMap.put("classDates",classDates);
 		resultMap.put("musicGroupTrainPlans",musicGroupTrainPlans);
 		//未规划的课程明细
 		//获取乐团当前学期每个班级不同课程类型数量
 		List<WaitCourseTrainPlanDto> waitCourseTrainPlanDtos = musicGroupTrainPlanDao.queryWaitCourseTrainPlan(musicGroupTrainPlanSaveDto.getMusicGroupId());
 		resultMap.put("waitCourseTrainPlanDtos",waitCourseTrainPlanDtos);
+		List<WaitCourseTrainPlanDto> queryWaitCourseTrainPlan1 = musicGroupTrainPlanDao.queryWaitCourseTrainPlan1(musicGroupTrainPlanSaveDto.getMusicGroupId());
+		resultMap.put("waitCourseTrainPlanDtos1",queryWaitCourseTrainPlan1);
 		return resultMap;
 	}
 
@@ -96,7 +98,19 @@ public class MusicGroupTrainPlanServiceImpl extends BaseServiceImpl<Integer, Mus
 		return courseScheduleDao.queryCourseTypeByClassGroupIds(musicGroupTrainPlanSaveDto);
     }
 
-    private MusicGroupTrainPlanSaveDto getCourseDetail(MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto){
+	@Override
+	public Map<String, Object> queryExceptionPlan(MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto) {
+		getCourseDetail(musicGroupTrainPlanSaveDto);
+		Map<String,Object> resultMap = new HashMap<>(2);
+		//获取乐团当前学期每个班级不同课程类型数量
+		List<WaitCourseTrainPlanDto> waitCourseTrainPlanDtos = musicGroupTrainPlanDao.queryWaitCourseTrainPlan(musicGroupTrainPlanSaveDto.getMusicGroupId());
+		resultMap.put("waitCourseTrainPlanDtos",waitCourseTrainPlanDtos);
+		List<WaitCourseTrainPlanDto> queryWaitCourseTrainPlan1 = musicGroupTrainPlanDao.queryWaitCourseTrainPlan1(musicGroupTrainPlanSaveDto.getMusicGroupId());
+		resultMap.put("waitCourseTrainPlanDtos1",queryWaitCourseTrainPlan1);
+		return resultMap;
+	}
+
+	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

@@ -2364,11 +2364,11 @@
     <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 test="dto.startSchoolTerm != null">
+            AND cs.class_date_ >= DATE_FORMAT(#{dto.startSchoolTerm}, '%Y%m%d')
         </if>
-        <if test="dto.endClassDate != null">
-            AND cs.class_date_ &lt;= DATE_FORMAT(#{dto.endClassDate}, '%Y%m%d')
+        <if test="dto.endSchoolTerm != null">
+            AND cs.class_date_ &lt;= DATE_FORMAT(#{dto.endSchoolTerm}, '%Y%m%d')
         </if>
         AND cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0 AND cs.is_lock_ = 0
     </select>

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

@@ -0,0 +1,72 @@
+<?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.MusicGroupQuestionnaireDao">
+	
+	<resultMap type="com.ym.mec.biz.dal.entity.MusicGroupQuestionnaire" id="MusicGroupQuestionnaire">
+		<result column="id_" property="id" />
+		<result column="questionnaire_question_id_" property="questionnaireQuestionId" />
+		<result column="music_group_id_" property="musicGroupId" />
+		<result column="target_" property="target" />
+		<result column="operator_id_" property="operatorId" />
+		<result column="question_time_" property="questionTime" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="MusicGroupQuestionnaire" >
+		SELECT * FROM music_group_questionnaire WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="MusicGroupQuestionnaire">
+		SELECT * FROM music_group_questionnaire ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupQuestionnaire" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		INSERT INTO music_group_questionnaire (questionnaire_question_id_,music_group_id_,target_,operator_id_,question_time_,create_time_,update_time_)
+		VALUES(#{questionnaireQuestionId},#{musicGroupId},#{target},#{operatorId},#{questionTime},NOW(),NOW())
+	</insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.biz.dal.entity.MusicGroupQuestionnaire">
+		UPDATE music_group_questionnaire <set>
+		<if test="operatorId != null">
+		operator_id_ = #{operatorId},
+		</if>
+		<if test="target != null">
+		target_ = #{target},
+		</if>
+		<if test="questionnaireQuestionId != null">
+		questionnaire_question_id_ = #{questionnaireQuestionId},
+		</if>
+		<if test="questionTime != null">
+		question_time_ = #{questionTime},
+		</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_questionnaire WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="MusicGroupQuestionnaire" parameterType="map">
+		SELECT * FROM music_group_questionnaire ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM music_group_questionnaire
+	</select>
+</mapper>

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

@@ -122,7 +122,7 @@
     <select id="queryWaitCourseTrainPlan" resultMap="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_
+		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
@@ -130,4 +130,16 @@
 				   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>
+    <select id="queryWaitCourseTrainPlan1" resultMap="WaitCourseTrainPlanDto">
+		SELECT c.class_group_id_,c.type_,t.course_num_ - c.course_num_ num_,c.name_
+		FROM (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
+		LEFT JOIN (
+		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 ON 1=1
+		WHERE c.class_group_id_ = t.class_group_id_ AND c.type_ = t.type_ AND c.course_num_ &lt; t.course_num_;
+	</select>
 </mapper>

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

@@ -1,22 +1,16 @@
 package com.ym.mec.web.controller;
 
 import com.ym.mec.biz.dal.dto.MusicGroupGoodsAndDiscountDto;
-import com.ym.mec.biz.dal.dto.MusicGroupSubjectGoodsAndInfoDto;
-import com.ym.mec.biz.dal.entity.ChargeTypeSubjectMapper;
-import com.ym.mec.biz.dal.entity.Goods;
 import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
+import com.ym.mec.biz.service.MusicGroupSubjectPlanService;
+import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
 import io.swagger.annotations.*;
-
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-
-import com.ym.mec.biz.service.MusicGroupSubjectPlanService;
-import com.ym.mec.common.controller.BaseController;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

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

@@ -48,6 +48,13 @@ public class MusicGroupTrainPlanController extends BaseController {
 		return succeed(musicGroupTrainPlanService.queryPlanPage(musicGroupTrainPlanSaveDto));
 	}
 
+	@ApiOperation("获取乐团训练规划异常规划")
+	@PostMapping(value = "queryExceptionPlan")
+	@PreAuthorize("@pcs.hasPermissions('musicGroupTrainPlan/queryExceptionPlan')")
+	public Object queryExceptionPlan(@RequestBody MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto) {
+		return succeed(musicGroupTrainPlanService.queryExceptionPlan(musicGroupTrainPlanSaveDto));
+	}
+
 	@ApiOperation("获取乐团训练规划课时")
 	@PostMapping(value = "queryPlanCourseNum")
 	@PreAuthorize("@pcs.hasPermissions('musicGroupTrainPlan/queryPlanCourseNum')")

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

@@ -6,16 +6,16 @@ import com.ym.mec.biz.dal.page.QuestionnaireUserResultQueryInfo;
 import com.ym.mec.biz.service.QuestionnaireUserResultService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.exception.BizException;
-import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.excel.POIUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;