Sfoglia il codice sorgente

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

zouxuan 4 anni fa
parent
commit
c2cc23bd37

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

@@ -861,7 +861,7 @@
                 AND DATEDIFF(MAX(cto.end_time_),NOW()) < 0
             </if>
             <if test="hasMember == 1">
-                AND DATEDIFF(MAX(cto.end_time_),NOW()) &lt;= #{memberEndAutoQuitMusic} AND DATEDIFF(NOW(),MAX(cto.end_time_)) >= 0
+                AND DATEDIFF(MAX(cto.end_time_),NOW()) &lt;= #{memberEndAutoQuitMusic} AND DATEDIFF(MAX(cto.end_time_),NOW()) >= 0
             </if>
         </if>
         <include refid="global.limit"/>

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

@@ -1547,7 +1547,7 @@
         </if>
         GROUP BY cto.student_id_ HAVING MIN(cto.status_) != 1
         <if test="memberEndAutoQuitMusic != null">
-            AND DATEDIFF(MAX(cto.end_time_),NOW()) &lt;= #{memberEndAutoQuitMusic} AND DATEDIFF(NOW(),MAX(cto.end_time_)) >= 0
+            AND DATEDIFF(MAX(cto.end_time_),NOW()) &lt;= #{memberEndAutoQuitMusic} AND DATEDIFF(MAX(cto.end_time_),NOW()) >= 0
         </if>
         <if test="memberEndAutoQuitMusic == null">
             AND DATEDIFF(MAX(cto.end_time_),NOW()) &lt; 0