Merge branch 'online1' of http://git.dayaedu.com/yonge/mec into active_course_2021-09-26～29

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

@@ -26,6 +26,10 @@ public interface StudentPreRegistrationDao extends BaseDAO<Long, StudentPreRegis
 
 	List<Mapper> querySecondSubjectNum(String musicGroupId);
 
+	List<Mapper> queryTeacherRecommandSubjectNum(String musicGroupId);
+
+	List<Mapper> querySelectionSubjectNum(String musicGroupId);
+
 	/**
 	 * 获取乐团预报名人数
 	 * @param musicGroupIds

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

@@ -31,5 +31,5 @@ public interface SysMusicScoreAccompanimentDao extends BaseDAO<Integer, SysMusic
      * 获取伴奏声部列表
      * @return
      */
-    List<Subject> querySubjectIds();
+    List<Subject> querySubjectIds(@Param("categoriesIdList") List<Integer> categoriesIdList);
 }

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

@@ -3,10 +3,11 @@ package com.ym.mec.biz.dal.dto;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.ym.mec.biz.dal.entity.CourseSchedule.CourseScheduleType;
 import com.ym.mec.biz.dal.entity.Goods;
 import com.ym.mec.biz.dal.entity.MemberPrivilegesItem;
 import com.ym.mec.biz.dal.entity.MusicGroup;
@@ -51,6 +52,8 @@ public class MusicGroupSubjectGoodsAndInfoDto {
     private List<MemberPrivilegesItem> memberPrivilegesItemList;
     
     private List<StudentPaymentOrderDetail> studentPaymentOrderDetailList;
+    
+    private Map<CourseScheduleType, BigDecimal> memberCoursePrice = new HashMap<CourseScheduleType, BigDecimal>();
 
     public Map getCourseScheduleInfo() {
         return CourseScheduleInfo;
@@ -139,4 +142,12 @@ public class MusicGroupSubjectGoodsAndInfoDto {
 	public void setStudentPaymentOrderDetailList(List<StudentPaymentOrderDetail> studentPaymentOrderDetailList) {
 		this.studentPaymentOrderDetailList = studentPaymentOrderDetailList;
 	}
+
+	public Map<CourseScheduleType, BigDecimal> getMemberCoursePrice() {
+		return memberCoursePrice;
+	}
+
+	public void setMemberCoursePrice(Map<CourseScheduleType, BigDecimal> memberCoursePrice) {
+		this.memberCoursePrice = memberCoursePrice;
+	}
 }

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

@@ -5,8 +5,12 @@ public class PreRegisterSubjectDto {
 	private String subjectName;
 	
 	private int firstSubjectNum;
-	
+
 	private int secondSubjectNum;
+	
+	private int teacherRecommandSubjectNum;
+	
+	private int selectionSubjectNum;
 
 	public String getSubjectName() {
 		return subjectName;
@@ -31,4 +35,20 @@ public class PreRegisterSubjectDto {
 	public void setSecondSubjectNum(int secondSubjectNum) {
 		this.secondSubjectNum = secondSubjectNum;
 	}
+
+	public int getTeacherRecommandSubjectNum() {
+		return teacherRecommandSubjectNum;
+	}
+
+	public void setTeacherRecommandSubjectNum(int teacherRecommandSubjectNum) {
+		this.teacherRecommandSubjectNum = teacherRecommandSubjectNum;
+	}
+
+	public int getSelectionSubjectNum() {
+		return selectionSubjectNum;
+	}
+
+	public void setSelectionSubjectNum(int selectionSubjectNum) {
+		this.selectionSubjectNum = selectionSubjectNum;
+	}
 }

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

@@ -9,6 +9,10 @@ public class StudentPreRegistrationDto extends StudentPreRegistration {
 	private String subjectFirstName;
 	
 	private String subjectSecondName;
+	
+	private String teacherRecommandSubjectName;
+	
+	private String selectionSubjectName;
 
 	public boolean getIsRegistered() {
 		return isRegistered;
@@ -33,4 +37,20 @@ public class StudentPreRegistrationDto extends StudentPreRegistration {
 	public void setSubjectSecondName(String subjectSecondName) {
 		this.subjectSecondName = subjectSecondName;
 	}
+
+	public String getTeacherRecommandSubjectName() {
+		return teacherRecommandSubjectName;
+	}
+
+	public void setTeacherRecommandSubjectName(String teacherRecommandSubjectName) {
+		this.teacherRecommandSubjectName = teacherRecommandSubjectName;
+	}
+
+	public String getSelectionSubjectName() {
+		return selectionSubjectName;
+	}
+
+	public void setSelectionSubjectName(String selectionSubjectName) {
+		this.selectionSubjectName = selectionSubjectName;
+	}
 }

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

@@ -186,6 +186,19 @@ public class MusicGroup {
 	private Integer cloudTeacherType;
 	
 	private Integer musicalInstrumentsProvideStatus;
+	
+	private Boolean memberCourseShowFlag;
+
+	@ApiModelProperty(value = "作业是否发送消息",required = true)
+	private Integer homeworkPushFlag = 1;
+
+	public Integer getHomeworkPushFlag() {
+		return homeworkPushFlag;
+	}
+
+	public void setHomeworkPushFlag(Integer homeworkPushFlag) {
+		this.homeworkPushFlag = homeworkPushFlag;
+	}
 
 	public Integer getCloudTeacherType() {
 		return cloudTeacherType;
@@ -644,4 +657,12 @@ public class MusicGroup {
 	public void setMusicalInstrumentsProvideStatus(Integer musicalInstrumentsProvideStatus) {
 		this.musicalInstrumentsProvideStatus = musicalInstrumentsProvideStatus;
 	}
+
+	public Boolean getMemberCourseShowFlag() {
+		return memberCourseShowFlag;
+	}
+
+	public void setMemberCourseShowFlag(Boolean memberCourseShowFlag) {
+		this.memberCourseShowFlag = memberCourseShowFlag;
+	}
 }

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

@@ -39,6 +39,12 @@ public class StudentPreRegistration {
 	/** 第二专业 */
 	private Integer subjectSecond;
 	
+	/** 老师推荐声部 */
+	private Integer teacherRecommandSubjectId;
+	
+	/** 选报声部 */
+	private Integer selectionSubjectId;
+	
 	/** 是否允许调剂 */
 	private boolean isAllowAdjust;
 	
@@ -131,6 +137,22 @@ public class StudentPreRegistration {
 		return this.subjectSecond;
 	}
 			
+	public Integer getTeacherRecommandSubjectId() {
+		return teacherRecommandSubjectId;
+	}
+
+	public void setTeacherRecommandSubjectId(Integer teacherRecommandSubjectId) {
+		this.teacherRecommandSubjectId = teacherRecommandSubjectId;
+	}
+
+	public Integer getSelectionSubjectId() {
+		return selectionSubjectId;
+	}
+
+	public void setSelectionSubjectId(Integer selectionSubjectId) {
+		this.selectionSubjectId = selectionSubjectId;
+	}
+
 	public void setIsAllowAdjust(boolean isAllowAdjust){
 		this.isAllowAdjust = isAllowAdjust;
 	}

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

@@ -18,7 +18,7 @@ public interface SysMusicScoreAccompanimentService extends BaseService<Integer,
 
     List<SysMusicScoreAccompaniment> queryAccPage(SysExamSongQueryInfo queryInfo);
 
-    List<Subject> querySubjectIds();
+    List<Subject> querySubjectIds(Integer categoriesId);
 
     PageInfo<SysMusicScoreAccompaniment> queryScorePage(SysExamSongQueryInfo queryInfo);
 }

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.service.impl;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -25,6 +26,7 @@ import com.ym.mec.biz.dal.dto.MusicGroupGoodsAndDiscountDto;
 import com.ym.mec.biz.dal.dto.MusicGroupRegRespDto;
 import com.ym.mec.biz.dal.dto.MusicGroupSubjectGoodsAndInfoDto;
 import com.ym.mec.biz.dal.entity.ChargeTypeSubjectMapper;
+import com.ym.mec.biz.dal.entity.CourseSchedule.CourseScheduleType;
 import com.ym.mec.biz.dal.entity.Goods;
 import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
@@ -32,6 +34,7 @@ import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderCourseSettings;
 import com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup;
 import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
 import com.ym.mec.biz.dal.entity.OrganizationCloudTeacherFee;
+import com.ym.mec.biz.dal.entity.OrganizationCourseUnitPriceSettings;
 import com.ym.mec.biz.dal.entity.Subject;
 import com.ym.mec.biz.dal.enums.CourseViewTypeEnum;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
@@ -41,6 +44,7 @@ import com.ym.mec.biz.service.MemberRankPrivilegesService;
 import com.ym.mec.biz.service.MusicGroupService;
 import com.ym.mec.biz.service.MusicGroupSubjectGoodsGroupService;
 import com.ym.mec.biz.service.MusicGroupSubjectPlanService;
+import com.ym.mec.biz.service.OrganizationCourseUnitPriceSettingsService;
 import com.ym.mec.biz.service.StudentRegistrationService;
 import com.ym.mec.biz.service.SubjectService;
 import com.ym.mec.common.dal.BaseDAO;
@@ -83,6 +87,9 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
 	@Autowired
 	private MemberRankPrivilegesService memberRankPrivilegesService;
 	
+	@Autowired
+	private OrganizationCourseUnitPriceSettingsService organizationCourseUnitPriceSettingsService;
+	
     @Resource
     private SysUserFeignService sysUserFeignService;
 
@@ -176,6 +183,19 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
 			} else{
 				musicGroupSubjectGoodsAndInfo.setMemberPrivilegesItemList(memberRankPrivilegesService.queryByMemberRankId(1));
 			}
+			
+			Map<CourseScheduleType, BigDecimal> memberCoursePrice = new HashMap<CourseScheduleType, BigDecimal>();
+			
+			OrganizationCourseUnitPriceSettings singleUnitPriceSettings = organizationCourseUnitPriceSettingsService.queryByOrganIdAndCourseTypeAndChargeType(musicGroup.getOrganId(), CourseScheduleType.SINGLE, musicGroup.getChargeTypeId());
+			if (singleUnitPriceSettings != null) {
+				memberCoursePrice.put(CourseScheduleType.SINGLE,
+						singleUnitPriceSettings.getUnitPrice().multiply(new BigDecimal(1980)).setScale(0, BigDecimal.ROUND_HALF_UP));
+			}
+			OrganizationCourseUnitPriceSettings mixUnitPriceSettings = organizationCourseUnitPriceSettingsService.queryByOrganIdAndCourseTypeAndChargeType(musicGroup.getOrganId(), CourseScheduleType.MIX, musicGroup.getChargeTypeId());
+			if (mixUnitPriceSettings != null) {
+				memberCoursePrice.put(CourseScheduleType.MIX,
+						mixUnitPriceSettings.getUnitPrice().multiply(new BigDecimal(1980)).setScale(0, BigDecimal.ROUND_HALF_UP));
+			}
 		}
 		
 		// 查询已购买内容

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

@@ -175,20 +175,23 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
             String notifyUrl = "9?courseScheduleID=" + bean.getId() + "&userId=" + bean.getUserId() + "&studentCourseHomeworkId=" + bean.getId() + "&extra=0";
             String extra = "dayaedu?courseScheduleID=" + courseSchedule.getId() + "&userId=" + bean.getUserId() + "&studentCourseHomeworkId=" + bean.getId() + "&extra=0";
             String courseDate = DateUtil.dateToString(courseSchedule.getClassDate(), "yyyy年MM月dd日");
-            sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_SUBMIT_PUSH, bean.getUserId().toString(), extra,
-                    new String[]{courseSchedule.getActualTeacherId().toString()},
-                    null, courseDate, courseSchedule.getName());
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.TEACHER_PUSH_HOMEWORK_SUBMIT,
                     userMap, null, 0, notifyUrl, "TEACHER", courseSchedule.getName(), courseDate, user.getUsername());
+            MusicGroup musicGroup = musicGroupDao.get(courseSchedule.getMusicGroupId());
 
-            Date date = new Date();
-            if (date.before(courseHomework.getExpiryDate())) {
-                ClassGroup classGroup = classGroupDao.findByCourseSchedule(existHomework.getCourseScheduleId().intValue(), 0);
-                if (classGroup != null) {
-                    SysUser sysUser = sysUserFeignService.queryUserById(existHomework.getUserId());
-                    sysMessageService.batchSendImGroupMessage(MessageTypeEnum.IM_HOMEWORK_SUBMIT_PUSH_GROUP, existHomework.getUserId().toString(), null,
-                            new String[]{classGroup.getId().toString()},
-                            null, sysUser.getUsername());
+            sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_SUBMIT_PUSH, bean.getUserId().toString(), extra,
+                    new String[]{courseSchedule.getActualTeacherId().toString()},
+                    null, courseDate, courseSchedule.getName());
+            if(musicGroup != null && musicGroup.getHomeworkPushFlag() == 1){
+                Date date = new Date();
+                if (date.before(courseHomework.getExpiryDate())) {
+                    ClassGroup classGroup = classGroupDao.findByCourseSchedule(existHomework.getCourseScheduleId().intValue(), 0);
+                    if (classGroup != null) {
+                        SysUser sysUser = sysUserFeignService.queryUserById(existHomework.getUserId());
+                        sysMessageService.batchSendImGroupMessage(MessageTypeEnum.IM_HOMEWORK_SUBMIT_PUSH_GROUP, existHomework.getUserId().toString(), null,
+                                new String[]{classGroup.getId().toString()},
+                                null, sysUser.getUsername());
+                    }
                 }
             }
         }

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

@@ -58,6 +58,8 @@ public class StudentPreRegistrationServiceImpl extends BaseServiceImpl<Long, Stu
 		Set<String> subjectNames = new HashSet<String>();
 		Map<String, Integer> firstMap = new HashMap<String, Integer>();
 		Map<String, Integer> secondMap = new HashMap<String, Integer>();
+		Map<String, Integer> teacherRecommandMap = new HashMap<String, Integer>();
+		Map<String, Integer> selectionMap = new HashMap<String, Integer>();
 
 		List<Mapper> firstMapperList = studentPreRegistrationDao.queryFirstSubjectNum(musicGroupId);
 		for (Mapper mapper : firstMapperList) {
@@ -71,12 +73,26 @@ public class StudentPreRegistrationServiceImpl extends BaseServiceImpl<Long, Stu
 			subjectNames.add(String.valueOf(mapper.getKey()));
 		}
 
+		List<Mapper> teacherRecommandMapperList = studentPreRegistrationDao.queryTeacherRecommandSubjectNum(musicGroupId);
+		for (Mapper mapper : teacherRecommandMapperList) {
+			teacherRecommandMap.put(String.valueOf(mapper.getKey()), Integer.parseInt(mapper.getValue().toString()));
+			subjectNames.add(String.valueOf(mapper.getKey()));
+		}
+
+		List<Mapper> selectionMapperList = studentPreRegistrationDao.querySelectionSubjectNum(musicGroupId);
+		for (Mapper mapper : selectionMapperList) {
+			selectionMap.put(String.valueOf(mapper.getKey()), Integer.parseInt(mapper.getValue().toString()));
+			subjectNames.add(String.valueOf(mapper.getKey()));
+		}
+
 		List<PreRegisterSubjectDto> list = new ArrayList<PreRegisterSubjectDto>();
 		for (String subjectName : subjectNames) {
 			PreRegisterSubjectDto dto = new PreRegisterSubjectDto();
 			dto.setSubjectName(subjectName);
 			dto.setFirstSubjectNum(firstMap.get(subjectName) == null ? 0 : firstMap.get(subjectName));
 			dto.setSecondSubjectNum(secondMap.get(subjectName) == null ? 0 : secondMap.get(subjectName));
+			dto.setTeacherRecommandSubjectNum(teacherRecommandMap.get(subjectName) == null ? 0 : teacherRecommandMap.get(subjectName));
+			dto.setSelectionSubjectNum(selectionMap.get(subjectName) == null ? 0 : selectionMap.get(subjectName));
 
 			list.add(dto);
 		}

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
@@ -24,6 +25,7 @@ import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -54,6 +56,9 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 	private StudentVisitDao studentVisitDao;
 	@Autowired
 	private SysMessageService sysMessageService;
+	
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
 
 	@Autowired
 	private SysConfigDao sysConfigDao;
@@ -185,6 +190,12 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 			}
 		}
 		head.setStudentNum(studentDao.countStudentsWithOrgan(null));
+		if(StringUtils.isBlank(head.getAvatar())){
+			SysUser user = sysUserFeignService.queryUserById(queryInfo.getUserId());
+			if(user != null){
+				head.setAvatar(user.getAvatar());
+			}
+		}
 		result.setHead(head);
 		detail.sort(Comparator.comparing(MusicCompareRankingDto::getRankNum).thenComparing(MusicCompareRankingDto::getUserId));
 		result.setDetail(detail);

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

@@ -79,8 +79,26 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Integ
 	}
 
 	@Override
-	public List<Subject> querySubjectIds() {
-		return sysMusicScoreAccompanimentDao.querySubjectIds();
+	public List<Subject> querySubjectIds(Integer categoriesId) {
+		List<Integer> categoriesIdList = new ArrayList<>();
+		if(categoriesId != null){
+			MusicScoreQueryInfo musicScoreQueryInfo = new MusicScoreQueryInfo();
+			musicScoreQueryInfo.setParentId(categoriesId);
+			List<SysMusicScoreCategories> scoreCategories = sysMusicScoreCategoriesService.queryTree(musicScoreQueryInfo);
+			if(scoreCategories.size() > 0){
+				List<SysMusicScoreCategories> allScoreCategories = new ArrayList<>();
+				allScoreCategories.addAll(scoreCategories);
+				for (SysMusicScoreCategories scoreCategory : scoreCategories) {
+					if(scoreCategory.getSysMusicScoreCategoriesList() != null){
+						allScoreCategories.addAll(scoreCategory.getSysMusicScoreCategoriesList());
+					}
+				}
+				categoriesIdList = allScoreCategories.stream().map(e->e.getId()).collect(Collectors.toList());
+			}else {
+				categoriesIdList.add(categoriesId);
+			}
+		}
+		return sysMusicScoreAccompanimentDao.querySubjectIds(categoriesIdList);
 	}
 
     @Override

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

@@ -45,6 +45,8 @@
                 typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="is_show_record_of_student_" property="isShowRecordOfStudent"/>
         <result column="musical_instruments_provide_status_" property="musicalInstrumentsProvideStatus"/>
+        <result column="member_course_show_flag_" property="memberCourseShowFlag"/>
+        <result column="homework_push_flag_" property="homeworkPushFlag"/>
     </resultMap>
     
     <resultMap type="com.ym.mec.biz.dal.dto.MusicGroupBasicDto" id="MusicGroupBasicDto" extends="MusicGroup">
@@ -104,7 +106,7 @@
                  settlement_type_, cooperation_organ_id_, enlightenment_course_time_,
                  parent_meeting_time_, img_, director_user_id_, is_classroom_lessons_, memo_, expect_start_group_date_,
                  ownership_type_, repair_user_id_, del_flag_, payment_valid_start_date_, payment_valid_end_date_,
-                 payment_pattern_, course_view_type_, transaction_teacher_id_)
+                 payment_pattern_, course_view_type_, transaction_teacher_id_,homework_push_flag_,member_course_show_flag_)
         VALUES (#{id}, #{name}, #{organId}, #{schoolId}, #{applyExpireDate}, #{preApplyExpireDate}, #{teamTeacherId},
                 #{educationalTeacherId},
                 #{chargeTypeId}, #{courseForm}, now(), now(),
@@ -116,13 +118,16 @@
                 #{isClassroomLessons}, #{memo}, #{expectStartGroupDate},
                 #{ownershipType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{repairUserId},
                 #{delFlag}, #{paymentValidStartDate}, #{paymentValidEndDate}, #{paymentPattern},
-                #{courseViewType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{transactionTeacherId})
+                #{courseViewType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{transactionTeacherId},#{homeworkPushFlag},#{memberCourseShowFlag})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.MusicGroup">
         UPDATE music_group
         <set>
+            <if test="homeworkPushFlag != null">
+                homework_push_flag_ = #{homeworkPushFlag},
+            </if>
             <if test="paymentPattern != null">
                 payment_pattern_ = #{paymentPattern},
             </if>
@@ -219,6 +224,9 @@
             <if test="musicalInstrumentsProvideStatus != null">
                 musical_instruments_provide_status_ = #{musicalInstrumentsProvideStatus},
             </if>
+            <if test="memberCourseShowFlag != null">
+                member_course_show_flag_ = #{memberCourseShowFlag},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>

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

@@ -22,6 +22,7 @@
         <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <association property="musicGroup" javaType="com.ym.mec.biz.dal.entity.MusicGroup">
             <result column="music_group_name_" property="name"/>
+            <result column="organ_name_" property="organName"/>
             <result column="course_view_type_" property="courseViewType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         </association>
         <association property="user" javaType="com.ym.mec.auth.api.entity.SysUser">
@@ -109,10 +110,11 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="MusicGroupQuit" parameterType="map">
-        SELECT mgq.*,mg.name_ music_group_name_,su.username_,mg.course_view_type_
+        SELECT mgq.*,mg.name_ music_group_name_,su.username_,mg.course_view_type_,o.name_ organ_name_
         FROM music_group_quit mgq
         LEFT JOIN sys_user su ON su.id_ = mgq.user_id_
         LEFT JOIN music_group mg ON mg.id_ = mgq.music_group_id_
+        left join organization o on o.id_ = mg.organ_id_
         <include refid="queryPageSql"/>
         ORDER BY id_ desc
         <include refid="global.limit"/>

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

@@ -18,6 +18,8 @@
         <result column="current_class_" property="currentClass"/>
         <result column="subject_first_" property="subjectFirst"/>
         <result column="subject_second_" property="subjectSecond"/>
+        <result column="teacher_recommand_subject_id_" property="teacherRecommandSubjectId"/>
+        <result column="selection_subject_id_" property="selectionSubjectId"/>
         <result column="is_allow_adjust_" property="isAllowAdjust"/>
         <result column="kit_purchase_method_" property="kitPurchaseMethod"/>
         <result column="cloud_teacher_method_" property="cloudTeacherMethod"/>
@@ -29,6 +31,8 @@
                extends="StudentPreRegistration">
         <result column="subject_first_name_" property="subjectFirstName"/>
         <result column="subject_second_name_" property="subjectSecondName"/>
+        <result column="teacher_recommand_subject_name_" property="teacherRecommandSubjectName"/>
+        <result column="selection_subject_name_" property="selectionSubjectName"/>
         <result column="is_registered_" property="isRegistered"/>
     </resultMap>
 
@@ -84,8 +88,8 @@
         </selectKey>
         -->
         INSERT INTO student_pre_registration
-        (id_,music_group_id_,user_id_,phone_,user_name_,gender_,current_grade_,current_grade_num_,current_class_,subject_first_,subject_second_,is_allow_adjust_,kit_purchase_method_,cloud_teacher_method_,create_time_)
-        VALUES(#{id},#{musicGroupId},#{userId},#{phone},#{userName},#{gender},#{currentGrade},#{currentGradeNum},#{currentClass},#{subjectFirst},#{subjectSecond},#{isAllowAdjust},#{kitPurchaseMethod},#{cloudTeacherMethod},#{createTime})
+        (id_,music_group_id_,user_id_,phone_,user_name_,gender_,current_grade_,current_grade_num_,current_class_,subject_first_,subject_second_,teacher_recommand_subject_id_,selection_subject_id_,is_allow_adjust_,kit_purchase_method_,cloud_teacher_method_,create_time_)
+        VALUES(#{id},#{musicGroupId},#{userId},#{phone},#{userName},#{gender},#{currentGrade},#{currentGradeNum},#{currentClass},#{subjectFirst},#{subjectSecond},#{teacherRecommandSubjectId},#{selectionSubjectId},#{isAllowAdjust},#{kitPurchaseMethod},#{cloudTeacherMethod},#{createTime})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -122,6 +126,12 @@
             <if test="subjectSecond != null">
                 subject_second_ = #{subjectSecond},
             </if>
+            <if test="teacherRecommandSubjectId != null">
+                teacher_recommand_subject_id_ = #{teacherRecommandSubjectId},
+            </if>
+            <if test="selectionSubjectId != null">
+                selection_subject_id_ = #{selectionSubjectId},
+            </if>
             <if test="currentClass != null">
                 current_class_ = #{currentClass},
             </if>
@@ -151,9 +161,11 @@
     <!-- 分页查询 -->
     <select id="queryListForPage" resultMap="StudentPreRegistrationDto" parameterType="map">
         SELECT spr.*,case when sr.id_ is null then false else true end is_registered_,s1.name_
-        subject_first_name_,s2.name_ subject_second_name_ FROM student_pre_registration spr
+        subject_first_name_,s2.name_ subject_second_name_,s3.name_ teacher_recommand_subject_name_,s4.name_ selection_subject_name_ FROM student_pre_registration spr
         left join subject s1 on s1.id_ = spr.subject_first_
         left join subject s2 on s2.id_ = spr.subject_second_
+        left join subject s3 on s3.id_ = spr.teacher_recommand_subject_id_
+        left join subject s4 on s4.id_ = spr.selection_subject_id_
         left join student_registration sr on spr.music_group_id_ = sr.music_group_id_ and spr.user_id_ = sr.user_id_
         <where>
             <if test="musicGroupId != null">
@@ -213,7 +225,7 @@
     </select>
 
     <select id="queryFirstSubjectNum" resultMap="Mapper">
-        SELECT ifnull(s.name_, '听从老师安排') key_, COUNT(spr.id_) value_
+        SELECT case when spr.subject_first_ = 999 then '听从老师安排' else ifnull(s.name_,'无') end key_, COUNT(spr.id_) value_
         FROM student_pre_registration spr
                  left join subject s on s.id_ = spr.subject_first_
         where spr.music_group_id_ = #{musicGroupId}
@@ -221,13 +233,29 @@
     </select>
 
     <select id="querySecondSubjectNum" resultMap="Mapper">
-        SELECT ifnull(s.name_, '听从老师安排') key_, COUNT(spr.id_) value_
+        SELECT case when spr.subject_second_ = 999 then '听从老师安排' else ifnull(s.name_,'无') end key_, COUNT(spr.id_) value_
         FROM student_pre_registration spr
                  left join subject s on s.id_ = spr.subject_second_
         where spr.music_group_id_ = #{musicGroupId}
         group by spr.subject_second_
     </select>
 
+    <select id="queryTeacherRecommandSubjectNum" resultMap="Mapper">
+        SELECT case when spr.teacher_recommand_subject_id_ = 999 then '听从老师安排' else ifnull(s.name_,'无') end key_, COUNT(spr.id_) value_
+        FROM student_pre_registration spr
+                 left join subject s on s.id_ = spr.teacher_recommand_subject_id_
+        where spr.music_group_id_ = #{musicGroupId}
+        group by spr.teacher_recommand_subject_id_
+    </select>
+
+    <select id="querySelectionSubjectNum" resultMap="Mapper">
+        SELECT case when spr.selection_subject_id_ = 999 then '听从老师安排' else ifnull(s.name_,'无') end key_, COUNT(spr.id_) value_
+        FROM student_pre_registration spr
+                 left join subject s on s.id_ = spr.selection_subject_id_
+        where spr.music_group_id_ = #{musicGroupId}
+        group by spr.selection_subject_id_
+    </select>
+
     <select id="queryByMusicGroupIdAndUserId" resultMap="StudentPreRegistration" parameterType="map">
         SELECT *
         FROM student_pre_registration

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

@@ -175,7 +175,15 @@
     <select id="querySubjectIds" resultMap="com.ym.mec.biz.dal.dao.SubjectDao.Subject">
 		SELECT s.* FROM sys_music_score_accompaniment sesa
 		LEFT JOIN `subject` s ON s.id_ = sesa.subject_id_
+		LEFT JOIN sys_music_score sms ON sms.id_ = sesa.exam_song_id_
+		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = sms.music_score_categories_id_
 		WHERE sesa.del_flag_ = 0 AND sesa.subject_id_ IS NOT NULL
+		<if test="categoriesIdList != null and categoriesIdList.size > 0">
+			AND sesc.id_ IN
+			<foreach collection="categoriesIdList" separator="," item="item" open="(" close=")">
+				#{item}
+			</foreach>
+		</if>
 		GROUP BY sesa.subject_id_
 	</select>
 

mec-common/common-core/src/main/java/com/ym/mec/common/entity/ImNoticeMessage.java

@@ -0,0 +1,38 @@
+package com.ym.mec.common.entity;
+
+import com.alibaba.fastjson.JSONObject;
+
+public class ImNoticeMessage extends ImBaseMessage {
+    private String content = "";
+    private String extra = "";
+    private static final transient String TYPE = "DY:NoticeMsg";
+
+    public ImNoticeMessage(String content, String extra) {
+        this.content = content;
+        this.extra = extra;
+    }
+
+    public String getType() {
+        return TYPE;
+    }
+
+    public String getContent() {
+        return this.content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getExtra() {
+        return this.extra;
+    }
+
+    public void setExtra(String extra) {
+        this.extra = extra;
+    }
+
+    public String toString() {
+        return JSONObject.toJSONString(this);
+    }
+}

mec-im/src/main/java/com/ym/controller/GroupController.java

@@ -1,7 +1,10 @@
 package com.ym.controller;
 
+import com.ym.mec.common.entity.ImBaseMessage;
 import com.ym.mec.common.entity.ImGroupMessage;
+import com.ym.mec.common.entity.ImNoticeMessage;
 import com.ym.mec.common.entity.ImTxtMessage;
+import com.ym.pojo.NoticeMessage;
 import com.ym.service.GroupService;
 import com.ym.service.MessageService;
 import io.rong.messages.TxtMessage;
@@ -12,6 +15,7 @@ import io.rong.models.message.GroupMessage;
 import io.rong.models.message.MentionMessage;
 import io.rong.models.message.PrivateMessage;
 import io.rong.models.message.RecallMessage;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -35,9 +39,15 @@ public class GroupController{
     @RequestMapping(value = "/send", method = RequestMethod.POST)
     public Object send(@RequestBody ImGroupMessage imGroupMessage) throws Exception {
         GroupMessage groupMessage = new GroupMessage();
-        ImTxtMessage content = (ImTxtMessage)imGroupMessage.getContent();
-        TxtMessage txtMessage = new TxtMessage(content.getContent(),content.getExtra());
-        groupMessage.setContent(txtMessage);
+        ImTxtMessage imTxtMessage = (ImTxtMessage) imGroupMessage.getContent();
+        String objectName = imGroupMessage.getObjectName();
+        if("DY:NoticeMsg".equals(objectName)){
+            NoticeMessage noticeMessage = new NoticeMessage(imTxtMessage.getContent(),imTxtMessage.getExtra());
+            groupMessage.setContent(noticeMessage);
+        }else {
+            TxtMessage txtMessage = new TxtMessage(imTxtMessage.getContent(),imTxtMessage.getExtra());
+            groupMessage.setContent(txtMessage);
+        }
         groupMessage.setTargetId(imGroupMessage.getTargetId());
         groupMessage.setSenderId(imGroupMessage.getSenderId());
         groupMessage.setObjectName(imGroupMessage.getObjectName());

mec-im/src/main/java/com/ym/pojo/NoticeMessage.java

@@ -0,0 +1,59 @@
+package com.ym.pojo;
+
+import io.rong.messages.BaseMessage;
+import io.rong.messages.UserInfo;
+import io.rong.util.GsonUtil;
+import lombok.Data;
+
+@Data
+public class NoticeMessage extends BaseMessage {
+    private String content = "";
+    private Object extraContent;
+    private String extra = "";
+    private io.rong.messages.UserInfo user = null;
+    private static final transient String TYPE = "DY:NoticeMsg";
+
+    public NoticeMessage(String content, String extra) {
+        this.content = content;
+        this.extra = extra;
+    }
+
+    public NoticeMessage(String content, String extra, io.rong.messages.UserInfo user) {
+        this.content = content;
+        this.extra = extra;
+        this.user = user;
+    }
+
+    public String getType() {
+        return "DY:NoticeMsg";
+    }
+
+    public String getContent() {
+        return this.content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getExtra() {
+        return this.extra;
+    }
+
+    public void setExtra(String extra) {
+        this.extra = extra;
+    }
+
+    public io.rong.messages.UserInfo getUser() {
+        return this.user;
+    }
+
+    public void setUser(UserInfo user) {
+        this.user = user;
+    }
+
+    public String toString() {
+        return GsonUtil.toJson(this, NoticeMessage.class);
+
+    }
+}

mec-student/src/main/java/com/ym/mec/student/controller/StudentManageController.java

@@ -53,6 +53,7 @@ import com.ym.mec.common.entity.UploadReturnBean;
 import com.ym.mec.common.filters.TenantIdThreadLocal;
 import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.util.date.DateUtil;
+import com.ym.mec.util.http.HttpUtil;
 import com.ym.mec.util.upload.UploadUtil;
 
 @Api(tags = "学生管理")
@@ -331,4 +332,10 @@ public class StudentManageController extends BaseController {
         }
         return succeed(organizationService.getGradeList(sysUser.getOrganId()));
     }
+
+    @ApiOperation(value = "url短链接")
+    @PostMapping("shortURL")
+    public HttpResponseResult<String> shortURL(String orginURL) {
+        return succeed(HttpUtil.getSortUrl(orginURL));
+    }
 }

mec-student/src/main/java/com/ym/mec/student/controller/SysMusicScoreAccompanimentController.java

@@ -41,7 +41,7 @@ public class SysMusicScoreAccompanimentController extends BaseController {
 
     @ApiOperation(value = "获取伴奏声部列表")
     @GetMapping("/querySubjectIds")
-    public Object querySubjectIds() {
-        return succeed(sysMusicScoreAccompanimentService.querySubjectIds());
+    public Object querySubjectIds(Integer categoriesId) {
+        return succeed(sysMusicScoreAccompanimentService.querySubjectIds(categoriesId));
     }
 }

mec-teacher/src/main/java/com/ym/mec/teacher/controller/SysMusicScoreAccompanimentController.java

@@ -40,8 +40,8 @@ public class SysMusicScoreAccompanimentController extends BaseController {
 
     @ApiOperation(value = "获取伴奏声部列表")
     @GetMapping("/querySubjectIds")
-    public Object querySubjectIds() {
-        return succeed(sysMusicScoreAccompanimentService.querySubjectIds());
+    public Object querySubjectIds(Integer categoriesId) {
+        return succeed(sysMusicScoreAccompanimentService.querySubjectIds(categoriesId));
     }
 
     @ApiOperation(value = "分页查询")

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

@@ -123,13 +123,13 @@ public class MusicGroupController extends BaseController {
 				return failed("非法请求");
 			}
 		}
-		if (sysUser.getIsSuperAdmin() == false) {
+		/*if (sysUser.getIsSuperAdmin() == false) {
 			List<Integer> userRole = employeeDao.queryUserRole(sysUser.getId());
 			// 如果当前用户只有教务老师角色，那么只能看到他所管理的课程组的信息
 			if (userRole != null && userRole.size() == 1 && userRole.contains(SysUserRole.EDUCATIONAL_TEACHER)) {
 				queryInfo.setEducationalTeacherId(sysUser.getId());
 			}
-		}
+		}*/
 		return succeed(musicGroupService.queryMusicGroupPage(queryInfo));
 	}
 

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

@@ -298,24 +298,36 @@ public class StudentRegistrationController extends BaseController {
             } else if ("GROUP".equals(row.getCloudTeacherMethod())) {
                 row.setCloudTeacherMethod("团购");
             }
-            if (row.getSubjectFirst().equals(999)) {
+            if(row.getSubjectFirst() == null){
+            	row.setSubjectFirstName("无");
+            } else if (row.getSubjectFirst().equals(999)) {
                 row.setSubjectFirstName("听从老师安排");
             }
-            if (row.getSubjectSecond().equals(999)) {
+            if(row.getSubjectSecond() == null){
+            	row.setSubjectSecondName("无");
+            } else if (row.getSubjectSecond().equals(999)) {
                 row.setSubjectSecondName("听从老师安排");
             }
+            if(row.getTeacherRecommandSubjectId() == null){
+            	row.setTeacherRecommandSubjectName("无");
+            }
+            if(row.getSelectionSubjectId() == null){
+            	row.setSelectionSubjectName("无");
+            }else if(row.getSelectionSubjectId().equals(999)){
+            	row.setSelectionSubjectName("听从老师安排");
+            }
             row.setCurrentGrade(row.getCurrentGrade() + row.getCurrentClass());
         }
         OutputStream outputStream = response.getOutputStream();
         try {
             HSSFWorkbook workbook = null;
             if (musicGroup.getCourseViewType().equals(CourseViewTypeEnum.MEMBER_FEE)) {
-                String[] header = {"学员编号", "学员姓名", "性别", "联系电话", "年级班级", "选报声部1", "选报声部2", "是否服从调剂", "乐器准备方式", "练习系统"};
-                String[] body = {"userId", "userName", "gender ? '男' : '女'", "phone", "currentGrade", "subjectFirstName", "subjectSecondName", "isAllowAdjust ? '是' : '否'", "kitPurchaseMethod", "cloudTeacherMethod"};
+                String[] header = {"学员编号", "学员姓名", "性别", "联系电话", "年级班级", "选报声部1", "选报声部2","老师推荐专业","选报专业", "是否服从调剂", "乐器准备方式", "练习系统"};
+                String[] body = {"userId", "userName", "gender ? '男' : '女'", "phone", "currentGrade", "subjectFirstName", "subjectSecondName","teacherRecommandSubjectName","selectionSubjectName", "isAllowAdjust ? '是' : '否'", "kitPurchaseMethod", "cloudTeacherMethod"};
                 workbook = POIUtil.exportExcel(header, body, studentPreRegistration.getRows());
             } else {
-                String[] header = {"学员编号", "学员姓名", "性别", "联系电话", "年级班级", "选报声部1", "选报声部2", "是否服从调剂", "乐器准备方式", "练习系统"};
-                String[] body = {"userId", "userName", "gender ? '男' : '女'", "phone", "currentGrade", "subjectFirstName", "subjectSecondName", "isAllowAdjust ? '是' : '否'", "kitPurchaseMethod", "cloudTeacherMethod"};
+                String[] header = {"学员编号", "学员姓名", "性别", "联系电话", "年级班级", "选报声部1", "选报声部2","老师推荐专业","选报专业", "是否服从调剂", "乐器准备方式", "练习系统"};
+                String[] body = {"userId", "userName", "gender ? '男' : '女'", "phone", "currentGrade", "subjectFirstName", "subjectSecondName","teacherRecommandSubjectName","selectionSubjectName", "isAllowAdjust ? '是' : '否'", "kitPurchaseMethod", "cloudTeacherMethod"};
                 workbook = POIUtil.exportExcel(header, body, studentPreRegistration.getRows());
             }
 

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

@@ -45,7 +45,7 @@ public class SysMusicScoreAccompanimentController extends BaseController {
 
     @ApiOperation(value = "获取伴奏声部列表")
     @GetMapping("/querySubjectIds")
-    public Object querySubjectIds() {
-        return succeed(sysMusicScoreAccompanimentService.querySubjectIds());
+    public Object querySubjectIds(Integer categoriesId) {
+        return succeed(sysMusicScoreAccompanimentService.querySubjectIds(categoriesId));
     }
 }

mec-web/src/main/java/com/ym/mec/web/controller/education/EduMusicScoreController.java

@@ -52,7 +52,7 @@ public class EduMusicScoreController extends BaseController {
 
     @ApiOperation(value = "获取伴奏声部列表")
     @GetMapping("/querySubjectIds")
-    public Object querySubjectIds() {
-        return succeed(sysMusicScoreAccompanimentService.querySubjectIds());
+    public Object querySubjectIds(Integer categoriesId) {
+        return succeed(sysMusicScoreAccompanimentService.querySubjectIds(categoriesId));
     }
 }

mec-web/src/main/java/com/ym/mec/web/controller/education/ImGroupNoticeController.java

@@ -1,22 +1,19 @@
 package com.ym.mec.web.controller.education;
 
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.entity.ImGroupNotice;
+import com.ym.mec.biz.dal.page.ImGroupNoticeQueryInfo;
+import com.ym.mec.biz.service.ImGroupNoticeService;
+import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
-import java.util.Date;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.entity.ImGroupNotice;
-import com.ym.mec.biz.dal.page.ImGroupNoticeQueryInfo;
-import com.ym.mec.biz.service.ImGroupNoticeService;
-import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.im.ImFeignService;
+import java.util.Date;
 
 /**
  * @Author Joburgess
@@ -31,8 +28,6 @@ public class ImGroupNoticeController extends BaseController {
     private ImGroupNoticeService imGroupNoticeService;
     @Autowired
     private SysUserFeignService sysUserFeignService;
-    @Autowired
-    private ImFeignService imFeignService;
 
     @ApiOperation(value = "新增")
     @RequestMapping("/add")
@@ -42,7 +37,6 @@ public class ImGroupNoticeController extends BaseController {
         if(sysUser == null){
             return failed("获取用户信息失败");
         }
-        imGroupNotice.setOperatorId(sysUser.getId().longValue());
         return succeed(imGroupNoticeService.insert(imGroupNotice));
     }