Merge branch 'online1'

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

@@ -18,6 +18,13 @@ public class StudentPreRegistrationQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "用户名或手机号",required = false)
     private String name;
 
+    @ApiModelProperty(value = "乐器提供方式",required = false)
+    private String kitPurchaseMethod;
+
+    @ApiModelProperty(value = "云教练提供方式",required = false)
+    private String cloudTeacherMethod;
+
+
 
     public String getName() {
         return name;
@@ -51,4 +58,19 @@ public class StudentPreRegistrationQueryInfo extends QueryInfo {
         this.isAllowAdjust = isAllowAdjust;
     }
 
+    public String getKitPurchaseMethod() {
+        return kitPurchaseMethod;
+    }
+
+    public void setKitPurchaseMethod(String kitPurchaseMethod) {
+        this.kitPurchaseMethod = kitPurchaseMethod;
+    }
+
+    public String getCloudTeacherMethod() {
+        return cloudTeacherMethod;
+    }
+
+    public void setCloudTeacherMethod(String cloudTeacherMethod) {
+        this.cloudTeacherMethod = cloudTeacherMethod;
+    }
 }

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

@@ -148,6 +148,12 @@
             <if test="isAllowAdjust != null">
                 and spr.is_allow_adjust_ = #{isAllowAdjust}
             </if>
+            <if test="kitPurchaseMethod != null">
+                and spr.kit_purchase_method_ = #{kitPurchaseMethod}
+            </if>
+            <if test="cloudTeacherMethod != null">
+                and spr.cloud_teacher_method_ = #{cloudTeacherMethod}
+            </if>
         </where>
         ORDER BY spr.id_
         <include refid="global.limit"/>
@@ -173,6 +179,12 @@
             <if test="isAllowAdjust != null">
                 and spr.is_allow_adjust_ = #{isAllowAdjust}
             </if>
+            <if test="kitPurchaseMethod != null">
+                and spr.kit_purchase_method_ = #{kitPurchaseMethod}
+            </if>
+            <if test="cloudTeacherMethod != null">
+                and spr.cloud_teacher_method_ = #{cloudTeacherMethod}
+            </if>
         </where>
     </select>
 

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

@@ -278,9 +278,9 @@ public class StudentRegistrationController extends BaseController {
             } else if (row.getKitPurchaseMethod().equals("GROUP")) {
                 row.setKitPurchaseMethod("团购");
             }
-            if (row.getCloudTeacherMethod().equals("OWNED")) {
+            if ("OWNED".equals(row.getCloudTeacherMethod())) {
                 row.setCloudTeacherMethod("自行准备");
-            } else if (row.getCloudTeacherMethod().equals("GROUP")) {
+            } else if ("GROUP".equals(row.getCloudTeacherMethod())) {
                 row.setCloudTeacherMethod("团购");
             }
             if (row.getSubjectFirst().equals(999)) {