Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentPaymentOrderDao.java

@@ -210,5 +210,5 @@ public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrde
      * @param organId
      * @return
      */
-    Map<String, Object> queryIncomeStatistics(@Param("organId") String organId);
+    Map<String, Object> queryIncomeStatisticsWithCurrentMonth(@Param("organId") String organId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SysUserCashAccountDetailDao.java

@@ -21,7 +21,7 @@ public interface SysUserCashAccountDetailDao extends BaseDAO<Long, SysUserCashAc
      */
     int batchInsert(@Param("sysUserCashAccountDetails") List<SysUserCashAccountDetail> sysUserCashAccountDetails);
 
-    Map<String, Object> queryStatistics(@Param("organId") String organId);
+    Map<String, Object> queryStatisticsWithCurrentMonth(@Param("organId") String organId);
 
     /**
      * 查看当前月当前老师是否执行过教师奖励

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

@@ -499,9 +499,9 @@
         WHERE spo.type_='LUCK' AND spo.status_='SUCCESS' GROUP BY spo.organ_id_ ORDER BY nums DESC;
     </select>
     
-    <select id="queryIncomeStatistics" resultType="map">
+    <select id="queryIncomeStatisticsWithCurrentMonth" resultType="map">
     	select count(*) total,sum(actual_amount_) total_num_ from student_payment_order
-    	where actual_amount_ &gt; 0
+    	where actual_amount_ &gt; 0 and DATE_FORMAT(create_time_, '%Y%m' ) = DATE_FORMAT( CURDATE() , '%Y%m' )
    		<if test="organId != null">
    			and FIND_IN_SET(organ_id_,#{organId})
    		</if>

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

@@ -187,14 +187,14 @@
         SELECT * FROM sys_user_cash_account_detail WHERE trans_no_ = #{transNo}
     </select>
 
-    <select id="queryStatistics" resultType="map">
+    <select id="queryStatisticsWithCurrentMonth" resultType="map">
         select sum(case when sucad.type_ = 'RECHARGE' then 1 else 0 end) income_num_,sum(case when sucad.type_ =
         'RECHARGE' then sucad.amount_ else 0 end) income_total_,sum(case when (sucad.type_ = 'WITHDRAW' or sucad.type_ =
         'REWARDS' or sucad.type_ = 'WAGE') then 1 else 0 end) expend_num_,sum(case when (sucad.type_ = 'WITHDRAW' or
         sucad.type_ = 'REWARDS' or sucad.type_ = 'WAGE') then sucad.amount_ else 0 end) expend_total_ from
         sys_user_cash_account_detail sucad
         left join sys_user u on sucad.user_id_ = u.id_
-        where sucad.status_ = 'SUCCESS'
+        where sucad.status_ = 'SUCCESS' and DATE_FORMAT(sucad.create_time_, '%Y%m' ) = DATE_FORMAT( CURDATE() , '%Y%m' )
         <if test="organId != null">
             AND FIND_IN_SET(u.organ_id_,#{organId})
         </if>

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

@@ -741,7 +741,7 @@
     </select>
     
     <select id="queryVipGroupNum" resultType="map">
-    	select count(*) total,sum(case when status_ = 1 then 1 else 0 end) applying_num_,sum(case when status_ = 2 then 1 else 0 end) finished_num_ from vip_group 
+    	select count(*) total,sum(case when status_ = 2 then 1 else 0 end) applying_num_,sum(case when status_ = 4 then 1 else 0 end) finished_num_ from vip_group 
     	<where>
     		<if test="organId != null">
                 FIND_IN_SET(organ_id_,#{organId})

mec-web/src/main/java/com/ym/mec/web/controller/IndexController.java

@@ -84,9 +84,9 @@ public class IndexController extends BaseController {
 		
 		Integer demoGroupNum = demoGroupDao.queryCurrentMonthCoursesNum(organId);
 		
-		Map<String, Object> incomeExpendMap = sysUserCashAccountDetailDao.queryStatistics(organId);
+		Map<String, Object> incomeExpendMap = sysUserCashAccountDetailDao.queryStatisticsWithCurrentMonth(organId);
 		
-		Map<String, Object> incomeMap = studentPaymentOrderDao.queryIncomeStatistics(organId);
+		Map<String, Object> incomeMap = studentPaymentOrderDao.queryIncomeStatisticsWithCurrentMonth(organId);
 		
 		ModelMap model = new ModelMap();
 		model.put("musicDatas", musicDatas);