add 考级报名链接修改

mec-biz/src/main/java/com/ym/mec/biz/dal/page/RegistrationOrPreQueryInfo.java

@@ -10,6 +10,8 @@ public class RegistrationOrPreQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "乐团编号",required = false)
     private String musicGroupId;
 
+    private Integer subjectId;
+
     private List<Integer> userIds;
 
     private String orderByPerRegister;
@@ -57,4 +59,12 @@ public class RegistrationOrPreQueryInfo extends QueryInfo {
     public void setOrderByPerRegister(String orderByPerRegister) {
         this.orderByPerRegister = orderByPerRegister;
     }
+
+    public Integer getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(Integer subjectId) {
+        this.subjectId = subjectId;
+    }
 }

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

@@ -1333,7 +1333,7 @@
     <select id="getRegisterOrPreList" resultType="com.ym.mec.biz.dal.dto.RegisterDto">
         SELECT u.user_id_ userId,
         su.username_ studentName,
-        IFNULL(sr.actual_subject_id_, spr.subject_first_) actualSubjectName,
+        IFNULL(s2.name_, s1.name_) actualSubjectName,
         spr.create_time_ perRegisterTime,
         o.payTime
         FROM (SELECT user_id_
@@ -1349,6 +1349,8 @@
         ON spr.user_id_ = u.user_id_ AND spr.music_group_id_ = #{musicGroupId}
         LEFT JOIN student_registration sr
         ON sr.user_id_ = u.user_id_ AND sr.music_group_id_ = #{musicGroupId}
+        LEFT JOIN subject s1 ON spr.subject_first_ = s1.id_
+        LEFT JOIN subject s2 ON sr.actual_subject_id_ = s2.id_
         LEFT JOIN (
         SELECT spo.user_id_, MAX(spo.pay_time_) payTime
         FROM student_payment_order spo
@@ -1356,12 +1358,17 @@
         AND type_ = 'APPLY'
         GROUP BY spo.user_id_
         ) o ON o.user_id_ = u.user_id_
+        <where>
         <if test="userIds != null">
             AND u.user_id_ IN
             <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
                 #{userId}
             </foreach>
         </if>
+        <if test="subjectId">
+            AND (sr.actual_subject_id_ = #{subjectId} OR spr.subject_first_ = #{subjectId})
+        </if>
+        </where>
         <if test="orderByPerRegister != null and orderByPayTime == null">
             ORDER BY spr.create_time_ #{orderByPerRegister},u.user_id_ ASC
         </if>
@@ -1385,11 +1392,22 @@
         where music_group_id_ = #{musicGroupId}
         ) u
         LEFT JOIN sys_user su ON su.id_ = u.user_id_
-        <if test="userIds != null">
-            AND u.user_id_ IN
-            <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
-                #{userId}
-            </foreach>
-        </if>
+        LEFT JOIN student_pre_registration spr
+        ON spr.user_id_ = u.user_id_ AND spr.music_group_id_ = #{musicGroupId}
+        LEFT JOIN student_registration sr
+        ON sr.user_id_ = u.user_id_ AND sr.music_group_id_ = #{musicGroupId}
+        LEFT JOIN subject s1 ON spr.subject_first_ = s1.id_
+        LEFT JOIN subject s2 ON sr.actual_subject_id_ = s2.id_
+        <where>
+            <if test="userIds != null">
+                AND u.user_id_ IN
+                <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
+                    #{userId}
+                </foreach>
+            </if>
+            <if test="subjectId">
+                AND (sr.actual_subject_id_ = #{subjectId} OR spr.subject_first_ = #{subjectId})
+            </if>
+        </where>
     </select>
 </mapper>