Merge remote-tracking branch 'origin/master'

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

@@ -138,6 +138,15 @@ public interface SubjectDao extends BaseDAO<Integer, Subject> {
     List<Map<Integer, String>> findStudentSubjectNameMaps(@Param("studentInfos") List<StudentAttendanceViewDto> studentInfos);
 
     /**
+     * @describe
+     * @author Joburgess
+     * @date 2019/12/19
+     * @param studentInfos:
+     * @return java.util.List<java.util.Map<java.lang.Integer,java.lang.String>>
+     */
+    List<Map<Integer, Integer>> findStudentSubjectIdMaps(@Param("studentInfos") List<StudentAttendanceViewDto> studentInfos);
+
+    /**
      * 获取声部名称
      * @param subjectIdList
      * @return

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

@@ -1223,7 +1223,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 					if (totalOrignPriceMap.containsKey(courseType)) {
 						totalOrignPriceMap.put(courseType, totalOrignPriceMap.get(courseType).add(courseScheduleStudentPayment.getOriginalPrice()));
 					} else {
-						totalOrignPriceMap.put(courseType, courseScheduleStudentPayment.getExpectPrice());
+						totalOrignPriceMap.put(courseType, courseScheduleStudentPayment.getOriginalPrice());
 					}
 				}
 				courseScheduleStudentPayment.setClassGroupId(classGroup.getId());
@@ -1627,8 +1627,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             if (!CollectionUtils.isEmpty(tempIds)) {
                 List<Map<Integer, String>> studentSubjectNameMaps = subjectDao.findStudentSubjectNameMaps(tempIds);
                 Map<Integer, String> studentSubjectNameMap = MapUtil.convertIntegerMap(studentSubjectNameMaps);
+                List<Map<Integer, Integer>> studentSubjectIdMaps = subjectDao.findStudentSubjectIdMaps(tempIds);
+                Map<Integer, Integer> studentSubjectIdMap = MapUtil.convertIntegerMap(studentSubjectIdMaps);
                 truantStudent.forEach(studentAttendanceViewDto -> {
                     studentAttendanceViewDto.setSubjectName(studentSubjectNameMap.get(studentAttendanceViewDto.getStudentId().intValue()));
+                    studentAttendanceViewDto.setSubjectId(studentSubjectIdMap.get(studentAttendanceViewDto.getStudentId().intValue()).longValue());
+
                 });
             }
         }

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

@@ -201,11 +201,9 @@
             course_schedule_student_payment cssp
             LEFT JOIN sys_user su ON cssp.user_id_ = su.id_
             LEFT JOIN student_attendance sa ON cssp.course_schedule_id_ = sa.course_schedule_id_ AND cssp.user_id_ = sa.user_id_
-            LEFT JOIN class_group_student_mapper cgsm ON cssp.user_id_=cgsm.user_id_ AND cssp.class_group_id_=cgsm.class_group_id_
         WHERE
             cssp.course_schedule_id_ =#{courseScheduleId}
             AND su.id_ IS NOT NULL
-            AND cgsm.status_!='QUIT'
     </select>
 
     <select id="findStudentByCourseWithPage" resultMap="com.ym.mec.biz.dal.dao.StudentAttendanceDao.studentAttendanceViewUtilEntity">

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

@@ -1,7 +1,7 @@
 <?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.StudentCompetitionDao">
-	
+
 	<resultMap type="com.ym.mec.biz.dal.entity.StudentCompetition" id="StudentCompetition">
 		<result column="id_" property="id" />
 		<result column="user_id_" property="userId" />
@@ -21,28 +21,28 @@
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 	</resultMap>
-	
+
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="StudentCompetition" >
 		SELECT * FROM student_competition WHERE id_ = #{id}
 	</select>
-	
+
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="StudentCompetition">
 		SELECT * FROM student_competition ORDER BY id_
 	</select>
-	
+
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.StudentCompetition" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
+		<selectKey resultClass="int" keyProperty="id" >
+		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
 		</selectKey>
 		-->
 		INSERT INTO student_competition (id_,user_id_,username_,id_card_no_,age_,gender_,grade_,subject_,chapter_,picture_url_,video_url_,score_,prize_level_,is_show_,comment_,create_time_,update_time_)
 		VALUES(#{id},#{userId},#{username},#{idCardNo},#{age},#{gender},#{grade},#{subject},#{chapter},#{pictureUrl},#{videoUrl},#{score},#{prizeLevel},#{isShow},#{comment},NOW(),NOW())
 	</insert>
-	
+
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.StudentCompetition">
 		UPDATE student_competition <set>
@@ -91,20 +91,20 @@
 		<if test="grade != null">
 			grade_ = #{grade},
 		</if>
-			update_time_ = NOW()
+		update_time_ = NOW()
 	</set> WHERE id_ = #{id}
 	</update>
-	
+
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete" >
-		DELETE FROM student_competition WHERE id_ = #{id} 
+		DELETE FROM student_competition WHERE id_ = #{id}
 	</delete>
-	
+
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="StudentCompetition" parameterType="map">
 		SELECT * FROM student_competition ORDER BY id_ <include refid="global.limit"/>
 	</select>
-	
+
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM student_competition
@@ -141,23 +141,23 @@
 
 	<select id="queryStudentCompetitions" resultMap="StudentCompetition">
 		SELECT
-			id_,
-			user_id_,
-			username_,
-			id_card_no_,
-			age_,
-			gender_,
-			grade_,
-			subject_,
-			chapter_,
-			picture_url_,
-			video_url_,
-			CASE WHEN score_ IS NULL THEN -1 ELSE score_ END score_,
-			CASE WHEN prize_level_ IS NULL THEN -1 ELSE prize_level_ END prize_level_,
-			is_show_,
-			comment_,
-			create_time_,
-			update_time_
+		id_,
+		user_id_,
+		username_,
+		id_card_no_,
+		age_,
+		gender_,
+		grade_,
+		subject_,
+		chapter_,
+		picture_url_,
+		video_url_,
+		CASE WHEN score_ IS NULL THEN -1 ELSE score_ END score_,
+		CASE WHEN prize_level_ IS NULL THEN -1 ELSE prize_level_ END prize_level_,
+		is_show_,
+		comment_,
+		create_time_,
+		update_time_
 		FROM student_competition
 		<include refid="queryStudentCondition"/>
 		ORDER BY id_ DESC

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

@@ -223,6 +223,18 @@
             sr.user_id_=#{student.studentId} AND sr.music_group_id_=#{student.musicGroupId}
         </foreach>
     </select>
+    <select id="findStudentSubjectIdMaps" resultType="java.util.Map">
+        SELECT
+            sr.user_id_ as 'key',
+            sr.subject_id_ as 'value'
+        FROM
+            student_registration sr
+        WHERE 1=1
+        AND
+        <foreach collection="studentInfos" item="student" open="(" close=")" separator=" OR ">
+            sr.user_id_=#{student.studentId} AND sr.music_group_id_=#{student.musicGroupId}
+        </foreach>
+    </select>
     <select id="findBySubjectIds" resultMap="Subject">
       SELECT * FROM subject WHERE id_ IN
       <foreach collection="subjectIds" item="subjectId" separator="," open="(" close=")">