Merge remote-tracking branch 'origin/system_fee' into system_fee

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

@@ -1,12 +1,14 @@
 package com.ym.mec.biz.dal.page;
 
-import com.ym.mec.biz.dal.enums.CourseViewTypeEnum;
-import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
-import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.util.Date;
 import java.util.List;
 
+import com.ym.mec.biz.dal.enums.CourseViewTypeEnum;
+import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
+import com.ym.mec.common.page.QueryInfo;
+
 public class MusicGroupQueryInfo extends QueryInfo {
 
     @ApiModelProperty(value = "所属分部编号",required = false)
@@ -36,6 +38,14 @@ public class MusicGroupQueryInfo extends QueryInfo {
     private String searchType;
 
     private CourseViewTypeEnum courseViewType;
+    
+    private Date createStartDate;
+    
+    private Date createEndDate;
+    
+    private Date billStartDate;
+    
+    private Date billEndDate;
 
     public CourseViewTypeEnum getCourseViewType() {
         return courseViewType;
@@ -124,4 +134,36 @@ public class MusicGroupQueryInfo extends QueryInfo {
     public void setMusicGroupStatus(String musicGroupStatus) {
         this.musicGroupStatus = musicGroupStatus;
     }
+
+	public Date getCreateStartDate() {
+		return createStartDate;
+	}
+
+	public void setCreateStartDate(Date createStartDate) {
+		this.createStartDate = createStartDate;
+	}
+
+	public Date getCreateEndDate() {
+		return createEndDate;
+	}
+
+	public void setCreateEndDate(Date createEndDate) {
+		this.createEndDate = createEndDate;
+	}
+
+	public Date getBillStartDate() {
+		return billStartDate;
+	}
+
+	public void setBillStartDate(Date billStartDate) {
+		this.billStartDate = billStartDate;
+	}
+
+	public Date getBillEndDate() {
+		return billEndDate;
+	}
+
+	public void setBillEndDate(Date billEndDate) {
+		this.billEndDate = billEndDate;
+	}
 }

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

@@ -241,6 +241,18 @@
                     #{musicGroupId}
                 </foreach>
             </if>
+            <if test="createStartDate!=null">
+                AND date(transaction_teacher_id_) &gt;= #{createStartDate}
+            </if>
+            <if test="createEndDate!=null">
+                AND date(transaction_teacher_id_) &lt;= #{createEndDate}
+            </if>
+            <if test="billStartDate!=null">
+                AND date(bill_start_date_) &gt;= #{billStartDate}
+            </if>
+            <if test="billEndDate!=null">
+                AND date(bill_start_date_) &lt;= #{billEndDate}
+            </if>
         </where>
     </sql>