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

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

@@ -24,7 +24,11 @@ public class StudentPreRegistrationQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "云教练提供方式",required = false)
     private String cloudTeacherMethod;
 
-
+    /** 老师推荐声部 */
+	private Integer teacherRecommandSubjectId;
+	
+	/** 选报声部 */
+	private Integer selectionSubjectId;
 
     public String getName() {
         return name;
@@ -73,4 +77,20 @@ public class StudentPreRegistrationQueryInfo extends QueryInfo {
     public void setCloudTeacherMethod(String cloudTeacherMethod) {
         this.cloudTeacherMethod = cloudTeacherMethod;
     }
+
+	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;
+	}
 }

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

@@ -177,6 +177,12 @@
             <if test="subjectId != null">
                 and (spr.subject_first_ = #{subjectId} or spr.subject_second_ = #{subjectId})
             </if>
+            <if test="teacherRecommandSubjectId != null">
+                and (spr.teacher_recommand_subject_id_ = #{teacherRecommandSubjectId})
+            </if>
+            <if test="selectionSubjectId != null">
+                and (spr.selection_subject_id_ = #{selectionSubjectId})
+            </if>
             <if test="name != null">
                 and (spr.phone_ like concat('%',#{name},'%') or spr.user_name_ like concat('%',#{name},'%') or
                 spr.user_id_ like concat('%',#{name},'%'))
@@ -208,6 +214,12 @@
             <if test="subjectId != null">
                 and (spr.subject_first_ = #{subjectId} or spr.subject_second_ = #{subjectId})
             </if>
+            <if test="teacherRecommandSubjectId != null">
+                and (spr.teacher_recommand_subject_id_ = #{teacherRecommandSubjectId})
+            </if>
+            <if test="selectionSubjectId != null">
+                and (spr.selection_subject_id_ = #{selectionSubjectId})
+            </if>
             <if test="name != null">
                 and (spr.phone_ like concat('%',#{name},'%') or spr.user_name_ like concat('%',#{name},'%') or
                 spr.user_id_ like concat('%',#{name},'%'))