班级调整，新增第一志愿和第二志愿搜索

src/main/java/com/xjrsoft/module/banding/dto/BandingTaskClassStudentPageDto.java

@@ -45,4 +45,10 @@ public class BandingTaskClassStudentPageDto extends PageInput {
 
     @ApiModelProperty("年级id")
     private Long gradeId;
+
+    @ApiModelProperty("第二志愿")
+    private Long secondAmbition;
+
+    @ApiModelProperty("第一志愿")
+    private Long firstAmbition;
 }

src/main/resources/mapper/banding/BandingTaskClassMapper.xml

@@ -68,8 +68,8 @@
         LEFT JOIN banding_task_class t3 ON t2.banding_task_class_id = t3.id
         AND t3.delete_mark = 0 AND t3.banding_task_id = #{dto.bandingTaskId}
         LEFT JOIN xjr_dictionary_detail t4 ON t1.gender = t4.code
-        LEFT JOIN base_major_set t5 ON t1.first_ambition_id = t5.id
-        LEFT JOIN base_major_set t6 ON t1.second_ambition_id = t6.id
+        LEFT JOIN base_major_set t5 ON t1.first_ambition = t5.id
+        LEFT JOIN base_major_set t6 ON t1.second_ambition = t6.id
         LEFT JOIN xjr_dictionary_detail t7 ON t1.stduy_status = t7.code
         LEFT JOIN xjr_user t8 ON t3.teacher_id = t8.id
         INNER JOIN enrollment_plan t9 ON t1.enrollment_plan_id = t9.id
@@ -90,6 +90,12 @@
         <if test="dto.stduyStatus != null and dto.stduyStatus != ''">
             AND t1.stduy_status = #{dto.stduyStatus}
         </if>
+        <if test="dto.secondAmbition != null">
+            AND t1.second_ambition = #{dto.secondAmbition}
+        </if>
+        <if test="dto.firstAmbition != null">
+            AND t1.first_ambition = #{dto.firstAmbition}
+        </if>
         <if test="dto.status != null">
             <if test="dto.status == 1">
                 AND t3.name is not null