系统收费

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

@@ -3,6 +3,8 @@ package com.ym.mec.biz.dal.page;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.util.Date;
+
 public class MusicMemberQueryInfo extends QueryInfo {
 
 	@ApiModelProperty(value = "0已过期，1即将过期", required = false)
@@ -10,9 +12,29 @@ public class MusicMemberQueryInfo extends QueryInfo {
 
 	private String memberEndAutoQuitMusic;
 
+	private Date visitStartTime;
+
+	private Date visitEndTime;
+
     @ApiModelProperty(value = "分部", required = false)
     private String organId;
 
+	public Date getVisitStartTime() {
+		return visitStartTime;
+	}
+
+	public void setVisitStartTime(Date visitStartTime) {
+		this.visitStartTime = visitStartTime;
+	}
+
+	public Date getVisitEndTime() {
+		return visitEndTime;
+	}
+
+	public void setVisitEndTime(Date visitEndTime) {
+		this.visitEndTime = visitEndTime;
+	}
+
 	public String getMemberEndAutoQuitMusic() {
 		return memberEndAutoQuitMusic;
 	}

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

@@ -831,7 +831,7 @@
         LEFT JOIN organization o ON o.id_ = mg.organ_id_
         LEFT JOIN student_visit sv ON sv.student_id_ = sr.user_id_ AND sv.purpose_ = '会员续费'
         <include refid="queryMusicMemberListSql"/>
-        GROUP BY cto.student_id_ HAVING (MAX(cto.id_) IS NULL OR MIN(cto.status_) != 1)
+        GROUP BY sr.user_id_ HAVING (MAX(cto.id_) IS NULL OR MIN(cto.status_) != 1)
         <if test="hasMember != null">
             <if test="hasMember == 0">
                 AND (MAX(cto.id_) IS NULL OR DATEDIFF(MAX(cto.end_time_),NOW()) &lt; 0)
@@ -862,7 +862,7 @@
         LEFT JOIN organization o ON o.id_ = mg.organ_id_
         LEFT JOIN student_visit sv ON sv.student_id_ = sr.user_id_ AND sv.purpose_ = '会员续费'
         <include refid="queryMusicMemberListSql"/>
-        GROUP BY cto.student_id_ HAVING (MAX(cto.id_) IS NULL OR MIN(cto.status_) != 1)
+        GROUP BY sr.user_id_ HAVING (MAX(cto.id_) IS NULL OR MIN(cto.status_) != 1)
         <if test="hasMember != null">
             <if test="hasMember == 0">
                 AND (MAX(cto.id_) IS NULL OR DATEDIFF(MAX(cto.end_time_),NOW()) &lt; 0)

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

@@ -1548,7 +1548,7 @@
         <if test="organIds != null and organIds != ''">
             AND FIND_IN_SET(mg.organ_id_,#{organIds})
         </if>
-        GROUP BY cto.student_id_ HAVING (MAX(cto.id_) IS NULL OR MIN(cto.status_) != 1)
+        GROUP BY sr.user_id_ HAVING (MAX(cto.id_) IS NULL OR MIN(cto.status_) != 1)
         <if test="memberEndAutoQuitMusic != null">
             AND DATEDIFF(MAX(cto.end_time_),NOW()) &lt;= #{memberEndAutoQuitMusic} AND DATEDIFF(MAX(cto.end_time_),NOW()) >= 0
         </if>