Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

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

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

@@ -246,6 +246,12 @@
             <if test="educationalTeacherId!=null">
                 AND pg.educational_teacher_id_=#{educationalTeacherId}
             </if>
+            <if test="firstOrRenew != null and firstOrRenew == true">
+                AND pg.be_renew_group_id_ IS NULL
+            </if>
+            <if test="firstOrRenew != null and firstOrRenew == false">
+                AND pg.be_renew_group_id_ IS NOT NULL
+            </if>
         </where>
     </sql>