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

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

@@ -55,7 +55,7 @@ public interface StudentPaymentOrderDetailDao extends BaseDAO<Long, StudentPayme
      * @param musicGroupId
      * @return
      */
-    List<MusicalListDetailDto> getMusicalListDetail(String musicGroupId);
+    List<MusicalListDetailDto> getMusicalListDetail(@Param("musicGroupId") String musicGroupId, @Param("userId") Integer userId);
 
     /**
      * 获取商品名称列表
@@ -139,6 +139,7 @@ public interface StudentPaymentOrderDetailDao extends BaseDAO<Long, StudentPayme
 
     /**
      * 根据订单号获取订单详情
+     *
      * @param orderId
      * @return
      */

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.dao;
 
 
+import com.ym.mec.biz.dal.entity.Subject;
 import com.ym.mec.biz.dal.entity.SysMusicScoreAccompaniment;
 import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
@@ -25,4 +26,10 @@ public interface SysMusicScoreAccompanimentDao extends BaseDAO<Integer, SysMusic
     List<SysMusicScoreAccompaniment> queryAccPage(Map<String, Object> params);
 
     int findAccCount(Map<String, Object> params);
+
+    /**
+     * 获取伴奏声部列表
+     * @return
+     */
+    List<Subject> querySubjectIds();
 }

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

@@ -43,6 +43,8 @@ public class SysMusicScore {
 	
 	/** 是否删除1是0否 */
 	private Integer delFlag;
+
+	private Integer order;
 	
 	/**  */
 	private java.util.Date updateTime;
@@ -50,6 +52,14 @@ public class SysMusicScore {
 	/**  */
 	private java.util.Date createTime;
 
+	public Integer getOrder() {
+		return order;
+	}
+
+	public void setOrder(Integer order) {
+		this.order = order;
+	}
+
 	public Integer getCategoriesId() {
 		return categoriesId;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/IndexErrorType.java

@@ -12,8 +12,8 @@ public enum IndexErrorType implements BaseEnum<String, IndexErrorType> {
     MUSIC_PATROL_ITEM("MUSIC_PATROL_ITEM", "乐团巡查事项异常"),
 
     STUDENT_INFO("STUDENT_INFO", "学员处理"),
-    STUDENT_NOT_PAYMENT("STUDENT_NOT_PAYMENT", "学员未缴费"),
-    STUDENT_APPLY_FOR_QUIT_MUSIC_GROUP("STUDENT_APPLY_FOR_QUIT_MUSIC_GROUP", "学员退团申请"),
+    STUDENT_NOT_PAYMENT("STUDENT_NOT_PAYMENT", "未缴费学员数"),
+    STUDENT_APPLY_FOR_QUIT_MUSIC_GROUP("STUDENT_APPLY_FOR_QUIT_MUSIC_GROUP", "申请退团学员数"),
     WAIT_CREATE_PAYMENT_CALENDER("WAIT_CREATE_PAYMENT_CALENDER", "待创建缴费项目"),
     ATTENDANCE_ERR_STUDENT_NUM("COURSE_TRUANT_STUDENT_NUM", "学员考勤异常"),
     COURSE_TRUANT_STUDENT_NUM("COURSE_TRUANT_STUDENT_NUM", "学员旷课"),

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

@@ -62,7 +62,7 @@ public interface StudentPaymentOrderDetailService extends BaseService<Long, Stud
      * @param musicGroupId
      * @return
      */
-    List<MusicalListDetailDto> getMusicalListDetail(String musicGroupId);
+    List<MusicalListDetailDto> getMusicalListDetail(String musicGroupId,Integer studentId);
 
     /**
      * 获取订单的乐器信息

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.service;
 
 
+import com.ym.mec.biz.dal.entity.Subject;
 import com.ym.mec.biz.dal.entity.SysMusicScoreAccompaniment;
 import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
 import com.ym.mec.common.service.BaseService;
@@ -14,4 +15,6 @@ public interface SysMusicScoreAccompanimentService extends BaseService<Integer,
     List<SysMusicScoreAccompaniment> queryAll(SysExamSongQueryInfo queryInfo);
 
     List<SysMusicScoreAccompaniment> queryAccPage(SysExamSongQueryInfo queryInfo);
+
+    List<Subject> querySubjectIds();
 }

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

@@ -7,9 +7,9 @@ import com.ym.mec.common.service.BaseService;
 
 public interface SysMusicScoreService extends BaseService<Integer, SysMusicScore> {
 
-    void updateMusicScore(MusicScoreDto examSongDto);
+    void updateMusicScore(MusicScoreDto musicScoreDto);
 
-    void add(MusicScoreDto examSongDto);
+    void add(MusicScoreDto musicScoreDto);
 
     void del(Integer id);
 }

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

@@ -552,14 +552,15 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
         CourseHomework courseHomework = new CourseHomework();
         List<CourseScheduleStudentPayment> courseScheduleStudentPayments = courseScheduleStudentPaymentDao.findByCourseSchedule(courseSchedule.getId());
 
-        Set<Integer> serveStudentIds = studentServeService.getStudentWithCourse(courseSchedule.getId());
-        Iterator<CourseScheduleStudentPayment> iterator = courseScheduleStudentPayments.iterator();
-        while (iterator.hasNext()){
-            CourseScheduleStudentPayment courseScheduleStudentPayment = iterator.next();
-            if(!serveStudentIds.contains(courseScheduleStudentPayment.getUserId())){
-                iterator.remove();
-            }
-        }
+        //排除不被服务学员
+//        Set<Integer> serveStudentIds = studentServeService.getStudentWithCourse(courseSchedule.getId());
+//        Iterator<CourseScheduleStudentPayment> iterator = courseScheduleStudentPayments.iterator();
+//        while (iterator.hasNext()){
+//            CourseScheduleStudentPayment courseScheduleStudentPayment = iterator.next();
+//            if(!serveStudentIds.contains(courseScheduleStudentPayment.getUserId())){
+//                iterator.remove();
+//            }
+//        }
 
         if (Objects.nonNull(existHomework)) {
             courseHomework.setId(existHomework.getId());

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

@@ -243,8 +243,8 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
     }
 
     @Override
-    public List<MusicalListDetailDto> getMusicalListDetail(String musicGroupId) {
-        List<MusicalListDetailDto> musicalListDetailDtos = studentPaymentOrderDetailDao.getMusicalListDetail(musicGroupId);
+    public List<MusicalListDetailDto> getMusicalListDetail(String musicGroupId,Integer studentId) {
+        List<MusicalListDetailDto> musicalListDetailDtos = studentPaymentOrderDetailDao.getMusicalListDetail(musicGroupId,studentId);
         if (musicalListDetailDtos.size() <= 0) {
             return musicalListDetailDtos;
         }

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

@@ -20,6 +20,7 @@ import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
+import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.event.source.GroupEventSource;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -55,13 +56,6 @@ import com.ym.mec.biz.dal.dao.SubjectDao;
 import com.ym.mec.biz.dal.dao.SysConfigDao;
 import com.ym.mec.biz.dal.dao.SysUserCashAccountDao;
 import com.ym.mec.biz.dal.dao.TeacherDao;
-import com.ym.mec.biz.dal.dto.CourseFormDto;
-import com.ym.mec.biz.dal.dto.StudentAddDto;
-import com.ym.mec.biz.dal.dto.StudentApplyDetailDto;
-import com.ym.mec.biz.dal.dto.StudentFeeDetailDto;
-import com.ym.mec.biz.dal.dto.StudentInfo;
-import com.ym.mec.biz.dal.dto.StudentMusicDetailDto;
-import com.ym.mec.biz.dal.dto.StudentMusicGroupDto;
 import com.ym.mec.biz.dal.entity.ClassGroup;
 import com.ym.mec.biz.dal.entity.ClassGroupStudentMapper;
 import com.ym.mec.biz.dal.entity.CooperationOrgan;
@@ -279,7 +273,40 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 
     @Override
     public StudentFeeDetailDto queryFeeDetail(Integer studentId, String musicGroupId) {
-        return studentRegistrationDao.queryFeeDetail(studentId, musicGroupId);
+        StudentFeeDetailDto studentFeeDetailDto = new StudentFeeDetailDto();
+        List<MusicalListDetailDto> musicalList = studentPaymentOrderDetailService.getMusicalListDetail(musicGroupId, studentId);
+        if(musicalList.size() <=0){
+            return studentFeeDetailDto;
+        }
+        MusicalListDetailDto detailDto = musicalList.get(0);
+        studentFeeDetailDto.setTotalAmount(detailDto.getOrderAmount());
+        studentFeeDetailDto.setCourseFee(detailDto.getCourseAmount());
+        if (KitGroupPurchaseTypeEnum.LEASE.equals(detailDto.getKitGroupPurchaseTypeEnum())) {
+            studentFeeDetailDto.setDepositFee(detailDto.getMusicalAmount());
+        }
+        List<StudentFeeDto> studentFeeDtos = new ArrayList<>();
+        if (detailDto.getMusicalName() != null) {
+            StudentFeeDto studentFeeDto = new StudentFeeDto();
+            studentFeeDto.setGoodsName(detailDto.getMusicalName());
+            studentFeeDto.setGoodsType("INSTRUMENT");
+            studentFeeDto.setMusicalFee(detailDto.getMusicalAmount());
+            studentFeeDtos.add(studentFeeDto);
+        }
+        if (detailDto.getAccessoriesName() != null) {
+            StudentFeeDto studentFeeDto = new StudentFeeDto();
+            studentFeeDto.setGoodsName(detailDto.getAccessoriesName());
+            studentFeeDto.setGoodsType("ACCESSORIES");
+            studentFeeDto.setMusicalFee(detailDto.getAccessoriesAmount());
+            studentFeeDtos.add(studentFeeDto);
+        }
+        StudentFeeDto studentFeeDto = new StudentFeeDto();
+        studentFeeDto.setGoodsType("COURSE");
+        studentFeeDto.setMusicalFee(detailDto.getCourseAmount());
+        studentFeeDtos.add(studentFeeDto);
+        studentFeeDetailDto.setGoods(studentFeeDtos);
+
+        return studentFeeDetailDto;
+        //return studentRegistrationDao.queryFeeDetail(studentId, musicGroupId);
     }
 
     @Override

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.service.impl;
 
 
 import com.ym.mec.biz.dal.dao.SysMusicScoreAccompanimentDao;
+import com.ym.mec.biz.dal.entity.Subject;
 import com.ym.mec.biz.dal.entity.SysMusicScoreAccompaniment;
 import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
 import com.ym.mec.biz.service.SysMusicScoreAccompanimentService;
@@ -56,4 +57,9 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Integ
 		MapUtil.populateMap(params, queryInfo);
 		return sysMusicScoreAccompanimentDao.queryAccPage(params);
 	}
+
+	@Override
+	public List<Subject> querySubjectIds() {
+		return sysMusicScoreAccompanimentDao.querySubjectIds();
+	}
 }

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

@@ -38,14 +38,14 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void updateMusicScore(MusicScoreDto examSongDto) {
-		SysMusicScore sysMusicScore = examSongDto.getSysMusicScore();
+	public void updateMusicScore(MusicScoreDto musicScoreDto) {
+		SysMusicScore sysMusicScore = musicScoreDto.getSysMusicScore();
 		sysMusicScoreDao.update(sysMusicScore);
-		List<Integer> delExamSongAccompanimentIds = examSongDto.getDelExamSongAccompanimentIds();
+		List<Integer> delExamSongAccompanimentIds = musicScoreDto.getDelExamSongAccompanimentIds();
 		if(delExamSongAccompanimentIds != null && delExamSongAccompanimentIds.size() > 0){
 			sysMusicScoreAccompanimentDao.batchDel(delExamSongAccompanimentIds);
 		}
-		List<SysMusicScoreAccompaniment> sysMusicScoreAccompaniments = examSongDto.getSysMusicScoreAccompaniments();
+		List<SysMusicScoreAccompaniment> sysMusicScoreAccompaniments = musicScoreDto.getSysMusicScoreAccompaniments();
 		if(sysMusicScoreAccompaniments != null && sysMusicScoreAccompaniments.size() > 0){
 			List<Integer> subjectIdList = sysMusicScoreAccompaniments.stream().map(e -> e.getSubjectId()).collect(Collectors.toList());
 			subjectIdList.removeAll(Collections.singleton(null));
@@ -74,15 +74,15 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void add(MusicScoreDto examSongDto) {
+	public void add(MusicScoreDto musicScoreDto) {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if(sysUser == null){
 			throw new BizException("请登录");
 		}
-		SysMusicScore sysMusicScore = examSongDto.getSysMusicScore();
+		SysMusicScore sysMusicScore = musicScoreDto.getSysMusicScore();
 		sysMusicScore.setCreateUserId(sysUser.getId());
 		sysMusicScoreDao.insert(sysMusicScore);
-		List<SysMusicScoreAccompaniment> sysMusicScoreAccompaniments = examSongDto.getSysMusicScoreAccompaniments();
+		List<SysMusicScoreAccompaniment> sysMusicScoreAccompaniments = musicScoreDto.getSysMusicScoreAccompaniments();
 		if(sysMusicScoreAccompaniments != null && sysMusicScoreAccompaniments.size() > 0){
 			sysMusicScoreAccompanimentDao.batchInsert(sysMusicScoreAccompaniments,sysMusicScore.getId());
 		}

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

@@ -287,14 +287,16 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 					if(CollectionUtils.isEmpty(studentCourseHomeworks)){
 						throw new BizException("此课程没有学生");
 					}
-					Set<Integer> serveStudentIds = studentServeService.getStudentWithCourse(teacherAttendance.getCourseScheduleId());
-					Iterator<StudentCourseHomework> iterator = studentCourseHomeworks.iterator();
-					while (iterator.hasNext()){
-						StudentCourseHomework next = iterator.next();
-						if(!serveStudentIds.contains(next.getUserId())){
-							iterator.remove();
-						}
-					}
+
+					//排除不被服务学员
+//					Set<Integer> serveStudentIds = studentServeService.getStudentWithCourse(teacherAttendance.getCourseScheduleId());
+//					Iterator<StudentCourseHomework> iterator = studentCourseHomeworks.iterator();
+//					while (iterator.hasNext()){
+//						StudentCourseHomework next = iterator.next();
+//						if(!serveStudentIds.contains(next.getUserId())){
+//							iterator.remove();
+//						}
+//					}
 					courseHomework.setExpectNum(studentCourseHomeworks.size());
 					if(!CollectionUtils.isEmpty(studentCourseHomeworks)){
 						courseHomeworkService.update(courseHomework);

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

@@ -63,7 +63,7 @@
         <if test="operatingTag != null">
             operating_tag_,
         </if>
-        teacher_id_,care_package_,come_on_package_,create_time_,update_time_,service_tag_update_time_)
+        teacher_id_,create_time_,update_time_,service_tag_update_time_)
         VALUES
         (#{userId},#{subjectIdList},
         <if test="serviceTag != null">
@@ -72,7 +72,7 @@
         <if test="operatingTag != null">
             #{operatingTag},
         </if>
-        #{teacherId},#{carePackage},#{comeOnPackage},NOW(),NOW(),NOW())
+        #{teacherId},NOW(),NOW(),NOW())
     </insert>
 
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.Student">

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

@@ -160,6 +160,9 @@
         FROM student_payment_order spo
                  LEFT JOIN student_registration sr ON spo.user_id_ = sr.user_id_
         WHERE spo.music_group_id_ = #{musicGroupId}
+        <if test="userId != null">
+            AND spo.user_id_ = #{userId}
+        </if>
           AND spo.status_ = 'SUCCESS'
           AND sr.music_group_id_ = #{musicGroupId}
           AND sr.music_group_status_ != 'QUIT'

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

@@ -120,7 +120,7 @@
 		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
 		LEFT JOIN `subject` s ON s.id_ = sesa.subject_id_
 		<include refid="queryPageSql"/>
-		ORDER BY sesa.id_ DESC
+		ORDER BY ses.order_,ses.name_
 		<include refid="global.limit"/>
 	</select>
 	
@@ -154,6 +154,7 @@
 		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
 		LEFT JOIN subject s ON s.id_ = sesa.subject_id_
 		<include refid="queryPageSql"/>
+		ORDER BY ses.order_,ses.name_
 	</select>
 
 	<select id="findAccCount" resultType="java.lang.Integer">
@@ -162,8 +163,14 @@
 		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
 		<include refid="queryPageSql"/>
 	</select>
+    <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_
+		WHERE sesa.del_flag_ = 0
+		GROUP BY sesa.subject_id_
+	</select>
 
-	<sql id="queryPageSql">
+    <sql id="queryPageSql">
 		<where>
 			sesa.del_flag_ = 0
 			<if test="search != null and search != ''">

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

@@ -18,6 +18,7 @@
 		<result column="create_user_id_" property="createUserId" />
 		<result column="create_user_name_" property="createUserName" />
 		<result column="del_flag_" property="delFlag" />
+		<result column="order_" property="order" />
 		<result column="update_time_" property="updateTime" />
 		<result column="create_time_" property="createTime" />
 	</resultMap>
@@ -34,13 +35,16 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysMusicScore" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO sys_music_score (music_score_categories_id_,name_,type_,speed_,url_,create_user_id_,update_time_,create_time_)
-		VALUES(#{musicScoreCategoriesId},#{name},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{speed},#{url},#{createUserId},NOW(),NOW())
+		INSERT INTO sys_music_score (music_score_categories_id_,name_,type_,speed_,url_,create_user_id_,order_,update_time_,create_time_)
+		VALUES(#{musicScoreCategoriesId},#{name},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{speed},#{url},#{createUserId},#{order},NOW(),NOW())
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.SysMusicScore">
 		UPDATE sys_music_score <set>
+		<if test="order != null">
+			order_ = #{order},
+		</if>
 		<if test="delFlag != null">
 			del_flag_ = #{delFlag},
 		</if>
@@ -85,7 +89,7 @@
 		LEFT JOIN sys_music_score_categories smsc ON smsc.id_ = ses.music_score_categories_id_
 		<include refid="queryPageSql"/>
 		GROUP BY ses.id_
-		ORDER BY ses.id_ DESC
+		ORDER BY ses.order_,ses.name_
 		<include refid="global.limit"/>
 	</select>
 	

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

@@ -138,8 +138,8 @@
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.Teacher" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
         INSERT INTO teacher
-        (id_,organ_id_,job_type_,job_nature_,is_probation_period_,education_background_,graduate_school_,technical_titles_,work_unit_,subject_id_,entry_date_,demission_date_,formal_staff_date_,certificate_type_,certificate_num_,flow_organ_range_,introduction_,update_time_,create_time_,is_support_extra_practice_lesson_,is_support_course_schedule_rewards_rules_,idcard_front_img_,idcard_back_img_,idcard_hand_img_,memo_)
-        VALUES(#{id},#{organId},#{jobType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{jobNature},#{isProbationPeriod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{educationBackground},#{graduateSchool},#{technicalTitles},#{workUnit},#{subjectId},#{entryDate},#{demissionDate},#{formalStaffDate},#{certificateType},#{certificateNum},#{flowOrganRange},#{introduction},now(),now(),#{isSupportExtraPracticeLesson},#{isSupportCourseScheduleRewardsRules},#{idcardFrontImg},#{idcardBackImg},#{idcardHandImg},#{memo})
+        (id_,organ_id_,job_type_,job_nature_,is_probation_period_,education_background_,graduate_school_,technical_titles_,work_unit_,subject_id_,entry_date_,demission_date_,formal_staff_date_,certificate_type_,certificate_num_,flow_organ_range_,introduction_,update_time_,create_time_,is_support_course_schedule_rewards_rules_,idcard_front_img_,idcard_back_img_,idcard_hand_img_,memo_)
+        VALUES(#{id},#{organId},#{jobType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{jobNature},#{isProbationPeriod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{educationBackground},#{graduateSchool},#{technicalTitles},#{workUnit},#{subjectId},#{entryDate},#{demissionDate},#{formalStaffDate},#{certificateType},#{certificateNum},#{flowOrganRange},#{introduction},now(),now(),#{isSupportCourseScheduleRewardsRules},#{idcardFrontImg},#{idcardBackImg},#{idcardHandImg},#{memo})
     </insert>
 
     <insert id="addSysUser" parameterType="com.ym.mec.auth.api.entity.SysUser" useGeneratedKeys="true" keyColumn="id"
@@ -313,7 +313,7 @@
         <where>
             su.del_flag_ = 0
             <if test="organId != null and organId != ''">
-               AND (CONCAT(',',t.organ_id_,',',t.flow_organ_range_,',') REGEXP CONCAT(',(',replace(#{organId},',','|'),'),'))
+               AND (CONCAT(',',t.organ_id_,',',IFNULL(t.flow_organ_range_,''),',') REGEXP CONCAT(',(',replace(#{organId},',','|'),'),'))
             </if>
             <if test="subjectId != null">
                 AND FIND_IN_SET(#{subjectId},t.subject_id_)

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

@@ -29,4 +29,10 @@ public class SysMusicScoreAccompanimentController extends BaseController {
         queryInfo.setType("COMMON");
         return succeed(sysMusicScoreAccompanimentService.queryPage(queryInfo));
     }
+
+    @ApiOperation(value = "获取伴奏声部列表")
+    @GetMapping("/querySubjectIds")
+    public Object querySubjectIds() {
+        return succeed(sysMusicScoreAccompanimentService.querySubjectIds());
+    }
 }

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

@@ -37,6 +37,12 @@ public class SysMusicScoreAccompanimentController extends BaseController {
         return succeed();
     }
 
+    @ApiOperation(value = "获取伴奏声部列表")
+    @GetMapping("/querySubjectIds")
+    public Object querySubjectIds() {
+        return succeed(sysMusicScoreAccompanimentService.querySubjectIds());
+    }
+
     @ApiOperation(value = "分页查询")
     @GetMapping("/queryPage")
     public Object queryPage(SysExamSongQueryInfo queryInfo) {

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

@@ -3,6 +3,7 @@ package com.ym.mec.teacher.controller;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.MusicScoreDto;
+import com.ym.mec.biz.dal.enums.ExamSongTypeEnum;
 import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
 import com.ym.mec.biz.service.SysMusicScoreService;
 import com.ym.mec.common.controller.BaseController;
@@ -11,7 +12,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 @RequestMapping("sysMusicScore")
@@ -26,8 +26,9 @@ public class SysMusicScoreController extends BaseController {
 
     @ApiOperation(value = "新增")
     @PostMapping("/add")
-    public Object add(@RequestBody MusicScoreDto examSongDto) {
-        sysMusicScoreService.add(examSongDto);
+    public Object add(@RequestBody MusicScoreDto musicScoreDto) {
+        musicScoreDto.getSysMusicScore().setType(ExamSongTypeEnum.PERSON);
+        sysMusicScoreService.add(musicScoreDto);
         return succeed();
     }
 

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

@@ -971,7 +971,7 @@ public class ExportController extends BaseController {
     @PostMapping("order/musicalListDetailExport")
     @PreAuthorize("@pcs.hasPermissions('order/musicalListDetailExport')")
     public void musicalListDetailExport(HttpServletResponse response, String musicGroupId) throws IOException {
-        List<MusicalListDetailDto> musicalList = studentPaymentOrderDetailService.getMusicalListDetail(musicGroupId);
+        List<MusicalListDetailDto> musicalList = studentPaymentOrderDetailService.getMusicalListDetail(musicGroupId,null);
         if (musicalList.size() > 50000) {
             throw new BizException("数据集太大，不能导出.最大数据集不能超过50000");
         }
@@ -1006,6 +1006,19 @@ public class ExportController extends BaseController {
         queryInfo.setRows(49999);
         queryInfo.setIsExport(true);
         List<StudentApplyDetailDto> studentApplyDetail = studentRegistrationService.queryStudentDetailPage(queryInfo).getRows();
+        if (studentApplyDetail.size() <= 0) {
+            throw new BizException("没有可导出的记录");
+        }
+        List<MusicalListDetailDto> musicalListDetails = studentPaymentOrderDetailService.getMusicalListDetail(queryInfo.getMusicGroupId(),null);
+        for (StudentApplyDetailDto studentApplyDetailDto : studentApplyDetail) {
+            for (MusicalListDetailDto musicalListDetail : musicalListDetails) {
+                if (!musicalListDetail.getUserId().equals(studentApplyDetailDto.getStudentId())) continue;
+                studentApplyDetailDto.setKitGroupPurchaseTypeEnum(musicalListDetail.getKitGroupPurchaseTypeEnum());
+            }
+            if (PaymentStatusEnum.YES.equals(studentApplyDetailDto.getPaymentStatus()) && studentApplyDetailDto.getKitGroupPurchaseTypeEnum() == null) {
+                studentApplyDetailDto.setKitGroupPurchaseTypeEnum(KitGroupPurchaseTypeEnum.OWNED);
+            }
+        }
         OutputStream outputStream = response.getOutputStream();
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"学生姓名", "家长姓名", "年级", "班级", "性别", "服从调剂", "报名专业", "实际专业", "联系电话", "学员缴费状态", "乐器购买方式"}, new String[]{

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

@@ -41,4 +41,10 @@ public class SysMusicScoreAccompanimentController extends BaseController {
     public Object queryPage(SysExamSongQueryInfo queryInfo) {
         return succeed(sysMusicScoreAccompanimentService.queryAll(queryInfo));
     }
+
+    @ApiOperation(value = "获取伴奏声部列表")
+    @GetMapping("/querySubjectIds")
+    public Object querySubjectIds() {
+        return succeed(sysMusicScoreAccompanimentService.querySubjectIds());
+    }
 }

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

@@ -21,16 +21,16 @@ public class SysMusicScoreController extends BaseController {
     @ApiOperation(value = "修改")
     @PostMapping("/update")
     @PreAuthorize("@pcs.hasPermissions('sysMusicScore/update')")
-    public Object update(@RequestBody MusicScoreDto examSongDto) {
-        sysMusicScoreService.updateMusicScore(examSongDto);
+    public Object update(@RequestBody MusicScoreDto musicScoreDto) {
+        sysMusicScoreService.updateMusicScore(musicScoreDto);
         return succeed();
     }
 
     @ApiOperation(value = "新增")
     @PostMapping("/add")
     @PreAuthorize("@pcs.hasPermissions('sysMusicScore/add')")
-    public Object add(@RequestBody MusicScoreDto examSongDto) {
-        sysMusicScoreService.add(examSongDto);
+    public Object add(@RequestBody MusicScoreDto musicScoreDto) {
+        sysMusicScoreService.add(musicScoreDto);
         return succeed();
     }