Merge remote-tracking branch 'origin/master'

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

@@ -178,7 +178,8 @@ public interface ClassGroupStudentMapperDao extends BaseDAO<Long, ClassGroupStud
      * @author Joburgess
      * @date 2019/11/21
      */
-    List<Map<Integer, Integer>> countClassGroupsStudentNum(@Param("classGroupIds") List<Integer> classGroupIds);
+    List<Map<Integer, Integer>> countClassGroupsStudentNum(@Param("classGroupIds") List<Integer> classGroupIds,
+                                                           @Param("status")ClassGroupStudentStatusEnum status);
 
     /**
      * @param classGroupId: 班级编号

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

@@ -150,12 +150,6 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      */
     List<CourseScheduleTeacherSalary> findTeachingTeachers(@Param("courseScheduleIds") List<Long> courseScheduleIds);
 
-    /**
-     * @Author: Joburgess
-     * @Date: 2019/9/17
-     * 根据日期获取当日排课信息
-     */
-    List<CourseScheduleDto> getCourseSchedulesWithDate(@Param("classDate") Date classDate);
 
     /**
      * @return java.util.List<com.ym.mec.biz.dal.entity.CourseSchedule>

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/java/com/ym/mec/biz/dal/page/MusicGroupStudentQueryInfo.java

@@ -14,6 +14,9 @@ public class MusicGroupStudentQueryInfo extends QueryInfo {
   @ApiModelProperty(value = "乐团编号")
   private String musicGroupId;
 
+  @ApiModelProperty(value = "班级编号")
+  private Integer classGroupId;
+
   @ApiModelProperty(value = "是否激活")
   private Boolean isActive;
 
@@ -26,6 +29,14 @@ public class MusicGroupStudentQueryInfo extends QueryInfo {
   @ApiModelProperty(value = "缴费状态  PAID_COMPLETED(完成缴费), NON_PAYMENT(未缴费), PROCESSING(缴费中)",required = false)
   private String paymentStatus;
 
+  public Integer getClassGroupId() {
+    return classGroupId;
+  }
+
+  public void setClassGroupId(Integer classGroupId) {
+    this.classGroupId = classGroupId;
+  }
+
   public Integer getIsLock() {
     return isLock;
   }

mec-biz/src/main/java/com/ym/mec/biz/service/CourseScheduleService.java

@@ -92,12 +92,6 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
 	 */
 	void batchUpdateCourseSchedule(List<CourseSchedule> courseSchedules, String musicGroupID);
 
-	/**
-	 * @Author: Joburgess
-	 * @Date: 2019/9/17
-	 * 根据日期获取当日排课信息
-	 */
-	List<CourseScheduleDto> getCourseSchedulesWithDate(Date classDate);
 
 	/**
 	 * @Author: Joburgess

mec-biz/src/main/java/com/ym/mec/biz/service/SysConfigService.java

@@ -32,6 +32,8 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
      */
     public static final String ADVANCE_LEAVE_HOURS = "advance_leave_hours";
 
+   String ENABLE_TEACHER_COURSE_ADJUST_DEFAULT_HOURS = "enable_teacher_course_adjust_default_hours";
+
     /**
      * 单技课梯度结算规则设置
      */

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -885,7 +885,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 //        Map<Integer, ClassGroup> classGorupIdMap = byClassGroupIds.stream().collect(Collectors.toMap(ClassGroup::getId, classGroup -> classGroup));
 
         //统计班级人数
-        List<Map<Integer, Integer>> classGroupStudentNumMaps = classGroupStudentMapperDao.countClassGroupsStudentNum(classGroupIds);
+        List<Map<Integer, Integer>> classGroupStudentNumMaps = classGroupStudentMapperDao.countClassGroupsStudentNum(classGroupIds,null);
         Map<Integer, Long> classGroupStudentNumMap = MapUtil.convertIntegerMap(classGroupStudentNumMaps);
         Map<Integer, Long> currentClassTimes = MapUtil.convertIntegerMap(courseScheduleDao.countCurrentNumByClassGroupId(classGroupIds,user.getId()));
         teacherMusicClassGroup.forEach(teacherClassGroupDto -> {

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -264,14 +264,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
     }
 
     @Override
-    public List<CourseScheduleDto> getCourseSchedulesWithDate(Date classDate) {
-        if (Objects.isNull(classDate)) {
-            throw new BizException("请选择日期!");
-        }
-        return courseScheduleDao.getCourseSchedulesWithDate(classDate);
-    }
-
-    @Override
     public List<Date> getCourseScheduleDateByMonth(Long musicGroupID, Date month) {
         if (Objects.isNull(month) || Objects.isNull(musicGroupID)) {
             throw new BizException("请选择日期并指定乐团!");
@@ -365,6 +357,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         List<Group> groups = groupDao.searchGroups(params);
         if(!CollectionUtils.isEmpty(groups)){
             params.put("groups", groups);
+        }else{
+            return pageInfo;
         }
 
         List<CourseScheduleDto> dataList = null;
@@ -419,6 +413,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             return teacherCourseSchedulesWithDate;
         }
 
+        List<Integer> classGroupIds = teacherCourseSchedulesWithDate.stream().map(CourseScheduleDto::getClassGroupId).collect(Collectors.toList());
+        List<Map<Integer, Integer>> classGroupStudentNumMaps = classGroupStudentMapperDao.countClassGroupsStudentNum(classGroupIds, ClassGroupStudentStatusEnum.NORMAL);
+        Map<Integer, Long> classGroupStudentNumMap = MapUtil.convertIntegerMap(classGroupStudentNumMaps);
+
         SysConfig advanceLeaveHoursConfig = sysConfigService.findByParamName(SysConfigService.ADVANCE_LEAVE_HOURS);
         Integer advanceLeaveHours=advanceLeaveHoursConfig.getParanValue(Integer.class);
         List<Map<Long, Integer>> courseLeaveStudentNumMaps = studentAttendanceDao.countCourseLeaveStudentNumWithFourHoursAgo(allCourseScheduleIds, advanceLeaveHours);
@@ -444,8 +442,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                 courseScheduleDto.setStudentNames(org.apache.commons.lang3.StringUtils.join(studentNames, ","));
             }
             courseScheduleDto.setSubjectName(subjectNameCourseMap.get(courseScheduleDto.getId()));
-            Long leaveStudentNum = courseLeaveStudentNumMap.get(courseScheduleDto.getId());
-            if(Objects.nonNull(leaveStudentNum)&&leaveStudentNum.intValue()==courseScheduleDto.getExpectStudentNum()){
+            Long leaveStudentNum = courseLeaveStudentNumMap.get(courseScheduleDto.getClassGroupId());
+            Long normalStudentNum = classGroupStudentNumMap.get(courseScheduleDto.getClassGroupId());
+            if(Objects.nonNull(leaveStudentNum)&&Objects.nonNull(normalStudentNum)&&leaveStudentNum.intValue()==normalStudentNum.intValue()){
                 courseScheduleDto.setEnableAdjustInToday(1);
             }
         }
@@ -1419,7 +1418,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         List<ClassGroup> classGroups = classGroupDao.findByClassGroupIds(classGroupIds);
         Map<Integer, ClassGroup> idClassGroupMap = classGroups.stream().collect(Collectors.toMap(ClassGroup::getId, classGroup -> classGroup));
 
-        SysConfig advanceLeaveHoursConfig = sysConfigService.findByParamName(SysConfigService.ADVANCE_LEAVE_HOURS);
+        SysConfig advanceLeaveHoursConfig = sysConfigService.findByParamName(SysConfigService.ENABLE_TEACHER_COURSE_ADJUST_DEFAULT_HOURS);
         Integer advanceLeaveHours=advanceLeaveHoursConfig.getParanValue(Integer.class);
         List<Map<Long, Integer>> courseLeaveStudentNumMaps = studentAttendanceDao.countCourseLeaveStudentNumWithFourHoursAgo(newCourseScheduleIds, advanceLeaveHours);
         Map<Long,Long> courseLeaveStudentNumMap = MapUtil.convertIntegerMap((courseLeaveStudentNumMaps));
@@ -2189,6 +2188,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         MapUtil.populateMap(params, queryInfo);
 
         if(StringUtils.isNotBlank(queryInfo.getSearch())||StringUtils.isNotBlank(queryInfo.getOrganIdList())){
+            params.put("musicGroupStatus", MusicGroupStatusEnum.PROGRESS);
+            params.put("vipGroupStatus", VipGroupStatusEnum.PROGRESS);
             List<Group> groups = groupDao.searchGroups(params);
             if(!CollectionUtils.isEmpty(groups)){
                 params.put("groups", groups);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleStudentPaymentServiceImpl.java

@@ -224,48 +224,43 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 	@Transactional(rollbackFor = Exception.class)
 	public void updateVipGiveCourse(Long vipGroupId) {
 		List<VipGroupGiveCourseSortDto> vipGroupSortCourseByGroup = courseScheduleStudentPaymentDao.findVipGroupSortCourseByGroup(vipGroupId.toString());
-		Map<BigDecimal, Long> expectPriceCountMap = vipGroupSortCourseByGroup.stream()
-				.collect(Collectors.groupingBy(VipGroupGiveCourseSortDto::getExpectPrice, Collectors.counting()));
-		BigDecimal zero = new BigDecimal("0.00");
-		Long zeroPriceNum = expectPriceCountMap.get(zero);
-		if(Objects.isNull(zeroPriceNum)||zeroPriceNum<=0){
-			return;
-		}
+		Map<Integer, List<VipGroupGiveCourseSortDto>> userCourseMap = vipGroupSortCourseByGroup.stream().collect(Collectors.groupingBy(VipGroupGiveCourseSortDto::getUserId));
 
 		List<CourseScheduleStudentPayment> needUpdatePayments=new ArrayList<>();
-
-		List<VipGroupGiveCourseSortDto> zeroExpectPricePayments = vipGroupSortCourseByGroup.stream()
-				.filter(vipGroupGiveCourseSortDto -> vipGroupGiveCourseSortDto.getExpectPrice().compareTo(zero)==0)
-				.collect(Collectors.toList());
-		Map<Long, List<VipGroupGiveCourseSortDto>> courseIdPaymentMap = zeroExpectPricePayments.stream()
-				.collect(Collectors.groupingBy(VipGroupGiveCourseSortDto::getId));
-		vipGroupSortCourseByGroup.sort(Comparator.comparing(VipGroupGiveCourseSortDto::getCourseStartTime).reversed());
-		for (int i=0;i<vipGroupSortCourseByGroup.size();i++) {
-			if(i>zeroExpectPricePayments.size()-1){
+		for (Map.Entry<Integer, List<VipGroupGiveCourseSortDto>> integerListEntry : userCourseMap.entrySet()) {
+			List<VipGroupGiveCourseSortDto> courses = integerListEntry.getValue();
+			Map<BigDecimal, Long> expectPriceCountMap = courses.stream()
+					.collect(Collectors.groupingBy(VipGroupGiveCourseSortDto::getExpectPrice, Collectors.counting()));
+			BigDecimal zero = new BigDecimal("0.00");
+			Long zeroPriceNum = expectPriceCountMap.get(zero);
+			if(Objects.isNull(zeroPriceNum)||zeroPriceNum<=0){
 				return;
 			}
 
-			VipGroupGiveCourseSortDto vipGroupGiveCourseSortDto=vipGroupSortCourseByGroup.get(i);
+			List<VipGroupGiveCourseSortDto> zeroExpectPricePayments = courses.stream()
+					.filter(vipGroupGiveCourseSortDto -> vipGroupGiveCourseSortDto.getExpectPrice().compareTo(zero)==0)
+					.collect(Collectors.toList());
 
-			int j=0;
-			for (Map.Entry<Long, List<VipGroupGiveCourseSortDto>> longListEntry : courseIdPaymentMap.entrySet()) {
-				if(j>i){
+			courses.sort(Comparator.comparing(VipGroupGiveCourseSortDto::getCourseStartTime).reversed());
+			for (int i=0;i<courses.size();i++) {
+				if(i>zeroExpectPricePayments.size()-1){
 					break;
 				}
-				j++;
 
-				for (VipGroupGiveCourseSortDto groupGiveCourseSortDto : longListEntry.getValue()) {
-					if(!vipGroupGiveCourseSortDto.getId().equals(groupGiveCourseSortDto.getId())
-							&&!vipGroupGiveCourseSortDto.getTeachMode().equals(groupGiveCourseSortDto.getTeachMode())){
-						throw new BizException("不支持将不同教学形式的课程调整的赠送课时后");
-					}
-					if(!vipGroupGiveCourseSortDto.getId().equals(groupGiveCourseSortDto.getId())){
-						needUpdatePayments.add(new CourseScheduleStudentPayment(vipGroupGiveCourseSortDto.getId(),groupGiveCourseSortDto.getCourseScheduleId()));
-						needUpdatePayments.add(new CourseScheduleStudentPayment(groupGiveCourseSortDto.getId(),vipGroupGiveCourseSortDto.getCourseScheduleId()));
-					}
+				VipGroupGiveCourseSortDto vipGroupGiveCourseSortDto=courses.get(i);
+
+				if(!vipGroupGiveCourseSortDto.getId().equals(zeroExpectPricePayments.get(i).getId())
+						&&!vipGroupGiveCourseSortDto.getTeachMode().equals(zeroExpectPricePayments.get(i).getTeachMode())){
+					throw new BizException("不支持将不同教学形式的课程调整的赠送课时后");
+				}
+
+				if(!vipGroupGiveCourseSortDto.getId().equals(zeroExpectPricePayments.get(i).getId())){
+					needUpdatePayments.add(new CourseScheduleStudentPayment(vipGroupGiveCourseSortDto.getId(),zeroExpectPricePayments.get(i).getCourseScheduleId()));
+					needUpdatePayments.add(new CourseScheduleStudentPayment(zeroExpectPricePayments.get(i).getId(),vipGroupGiveCourseSortDto.getCourseScheduleId()));
 				}
 			}
 		}
+
 		if(!CollectionUtils.isEmpty(needUpdatePayments)){
 			courseScheduleStudentPaymentDao.batchUpdate(needUpdatePayments);
 		}

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

@@ -241,6 +241,9 @@
                 #{classGroupId}
             </foreach>
             AND status_!='QUIT'
+            <if test="status!=null">
+                AND status_=#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+            </if>
         GROUP BY
             class_group_id_
     </select>

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

@@ -104,6 +104,6 @@
 		<foreach collection="ids" item="id" open="(" close=")" separator=",">
 			#{id}
 		</foreach>
-		AND status_!='REJECT'
+		AND status_!='REJECT' AND score_ &lt;= 2
 	</select>
 </mapper>

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

@@ -475,23 +475,23 @@
 
     <select id="countCourseSchedulesWithDate" resultType="int">
         SELECT
-          count(*)
+            count(*)
         FROM
-        course_schedule cs
-        LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
+            course_schedule cs
+            LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
         WHERE
-        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
-        AND cs.id_ IS NOT NULL
-        <if test="type!=null">
-            AND cg.group_type_ = #{type}
-        </if>
-        <if test="groups != null and organIdList!=null">
-            AND cs.music_group_id_ IN
-            <foreach collection="groups" item="group" open="(" close=")" separator=",">
-                #{group.id}
-            </foreach>
-        </if>
-        AND cs.class_date_ = DATE_FORMAT(#{date},'%Y-%m-%d')
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+            AND cs.id_ IS NOT NULL
+            <if test="type!=null">
+                AND cg.group_type_ = #{type}
+            </if>
+            <if test="groups != null and organIdList!=null">
+                AND cs.music_group_id_ IN
+                <foreach collection="groups" item="group" open="(" close=")" separator=",">
+                    #{group.id}
+                </foreach>
+            </if>
+            AND cs.class_date_ = DATE_FORMAT(#{date},'%Y-%m-%d')
     </select>
 
     <select id="getStudentCourseSchedulesWithDate" resultMap="courseScheduleDto">

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

@@ -374,6 +374,9 @@
             <if test="subjectId != null">
                 AND sr.actual_subject_id_ = #{subjectId}
             </if>
+            <if test="classGroupId != null">
+                AND cgsm.class_group_id_ = #{classGroupId} AND sr.user_id_ = cgsm.user_id_ AND cgsm.status_ != 'QUIT'
+            </if>
             <if test="studentStatus != null and studentStatus != ''">
                 AND sr.music_group_status_ = #{studentStatus}
             </if>
@@ -421,6 +424,9 @@
         LEFT JOIN sys_user su ON sr.user_id_ = su.id_
         LEFT JOIN `subject` s ON s.id_ = sr.actual_subject_id_
         LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
+        <if test="classGroupId != null">
+            LEFT JOIN class_group_student_mapper cgsm ON cgsm.music_group_id_ = sr.music_group_id_
+        </if>
         LEFT JOIN music_group_student_fee_ mgsf ON mgsf.music_group_id_ = mg.id_ AND mgsf.user_id_ = su.id_
         <include refid="queryMusicGroupStudentSql"/>
         ORDER BY sr.id_ DESC
@@ -433,6 +439,9 @@
         LEFT JOIN sys_user su ON sr.user_id_ = su.id_
         LEFT JOIN `subject` s ON s.id_ = sr.actual_subject_id_
         LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
+        <if test="classGroupId != null">
+            LEFT JOIN class_group_student_mapper cgsm ON cgsm.music_group_id_ = sr.music_group_id_
+        </if>
         LEFT JOIN music_group_student_fee_ mgsf ON mgsf.music_group_id_ = mg.id_ AND mgsf.user_id_ = su.id_
         <include refid="queryMusicGroupStudentSql"/>
     </select>

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/CourseScheduleController.java

@@ -130,13 +130,6 @@ public class CourseScheduleController extends BaseController {
         return succeed(scheduleService.getCourseScheduleDateByMonth(musicGroupID,month));
     }
 
-    @ApiOperation(value = "根据日期获取当日排课")
-    @GetMapping("/getCourseSchedulesWithDate")
-    @PreAuthorize("@pcs.hasPermissions('courseSchedule/getCourseSchedulesWithDate')")
-    public Object getCourseSchedulesWithDate(@ApiParam(value = "日期", required = true) Date date){
-        return succeed(scheduleService.getCourseSchedulesWithDate(date));
-    }
-
     @ApiOperation(value = "根据课程ID查询正在或即将开始的课程")
     @GetMapping("/getCurrentCourseDetail/{courseID}")
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/getCurrentCourseDetail')")

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);