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

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

@@ -1384,6 +1384,15 @@
             <if test="onlyHistory!=null and onlyHistory==1">
                 AND CONCAT( cs.class_date_, ' ', cs.end_class_time_ )&lt;now()
             </if>
+            <if test="status!=null">
+                AND cs.status_ = #{status}
+            </if>
+            <if test="startClassDate!=null">
+                AND cs.class_date_ &gt;= #{startClassDate}
+            </if>
+            <if test="endClassDate!=null">
+                AND cs.class_date_ &lt;= #{endClassDate}
+            </if>
         </where>
     </sql>
 

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

@@ -896,9 +896,9 @@
 		GROUP BY DATE_FORMAT(fe.create_time_,'%Y-%m-%d')
 	</select>
 	<select id="getFinanceBalanceDataWithTimely" resultMap="IndexBaseMonthData">
-		SELECT spo.organ_id_,SUM(spo.balance_payment_amount_) total_num_,
-			   SUM(spo.balance_payment_amount_) activate_num_,
-			   SUM(spo.balance_payment_amount_) percent_,DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') month_
+		SELECT spo.organ_id_,SUM(CASE WHEN spo.balance_payment_amount_ IS NULL THEN 0 ELSE spo.balance_payment_amount_ END) total_num_,
+			   SUM(CASE WHEN spo.balance_payment_amount_ IS NULL THEN 0 ELSE spo.balance_payment_amount_ END) activate_num_,
+			   SUM(CASE WHEN spo.balance_payment_amount_ IS NULL THEN 0 ELSE spo.balance_payment_amount_ END) percent_,DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') month_
 		FROM student_payment_order spo
 		WHERE spo.status_ = 'SUCCESS' AND DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') BETWEEN #{startDate} AND #{endDate}
 		<if test="organIds!=null and organIds.size()>0">