Merge branch 'err_data_export'

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.page;
 
 import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.ApiModelProperty;
 
 /**
  * @Author Joburgess
@@ -12,6 +13,9 @@ public class VipGroupActivityQueryInfo extends QueryInfo {
 
     private Boolean enable;
 
+    @ApiModelProperty(value = "适用学生类型:-1：所有；0：老用户；1：新用户")
+    private int  applyToStudentType;
+
     public Boolean getEnable() {
         return enable;
     }
@@ -27,4 +31,12 @@ public class VipGroupActivityQueryInfo extends QueryInfo {
     public void setOrganId(String organId) {
         this.organId = organId;
     }
+
+    public int getApplyToStudentType() {
+        return applyToStudentType;
+    }
+
+    public void setApplyToStudentType(int applyToStudentType) {
+        this.applyToStudentType = applyToStudentType;
+    }
 }

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

@@ -166,6 +166,9 @@
 			<if test="search != null and search != ''">
 				AND (vga.id_=#{search} OR vga.name_ LIKE CONCAT('%', #{search}, '%'))
 			</if>
+			<if test="applyToStudentType!=null">
+				AND apply_to_student_type_=#{applyToStudentType}
+			</if>
 		</where>
 	</sql>