1、课外训练

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

@@ -26,16 +26,16 @@ public class PracticeGroupQueryInfo extends QueryInfo {
 
     private Boolean hasEducationalTeacherId;
 
-    private Boolean firstOrRenew;
+    private Integer type;
 
     private boolean isExport = false;
 
-    public Boolean getFirstOrRenew() {
-        return firstOrRenew;
+    public Integer getType() {
+        return type;
     }
 
-    public void setFirstOrRenew(Boolean firstOrRenew) {
-        this.firstOrRenew = firstOrRenew;
+    public void setType(Integer type) {
+        this.type = type;
     }
 
     public Boolean getHasEducationalTeacherId() {

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

@@ -247,12 +247,15 @@
             <if test="educationalTeacherId!=null">
                 AND pg.educational_teacher_id_=#{educationalTeacherId}
             </if>
-            <if test="firstOrRenew != null and firstOrRenew == true">
+            <if test="type != null and firstOrRenew == 1">
                 AND pg.be_renew_group_id_ IS NULL
             </if>
-            <if test="firstOrRenew != null and firstOrRenew == false">
+            <if test="type != null and firstOrRenew == 0">
                 AND pg.be_renew_group_id_ IS NOT NULL
             </if>
+            <if test="type != null and firstOrRenew == 2">
+                AND pg.buy_months_ IS NULL
+            </if>
         </where>
     </sql>