学生乐团增加退团时间

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

@@ -229,7 +229,7 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
      * @param params
      * @return
      */
-    List<musicGroupStudentApplyDto> queryMusicGroupStudentApply(Map<String, Object> params);
+    List<MusicGroupStudentApplyDto> queryMusicGroupStudentApply(Map<String, Object> params);
 
     /**
      * COUNT乐团学员报名列表

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/musicGroupStudentApplyDto.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicGroupStudentApplyDto.java

@@ -3,7 +3,7 @@ package com.ym.mec.biz.dal.dto;
 import java.math.BigDecimal;
 import java.util.Date;
 
-public class musicGroupStudentApplyDto {
+public class MusicGroupStudentApplyDto {
     private Integer userId;
 
     private String userName;

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/practiceGroupStatisDto.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/PracticeGroupStatisDto.java

@@ -3,7 +3,7 @@ package com.ym.mec.biz.dal.dto;
 import java.math.BigDecimal;
 import java.util.List;
 
-public class practiceGroupStatisDto {
+public class PracticeGroupStatisDto {
     private List<PracticeGroupsDto> practiceGroupsDtoList;
     private BigDecimal totalMoney;
     private Integer totalNum = 0;
@@ -17,7 +17,7 @@ public class practiceGroupStatisDto {
     private BigDecimal monthBuyMoney = BigDecimal.ZERO;
     private BigDecimal monthRenewMoney= BigDecimal.ZERO;
 
-    public practiceGroupStatisDto() {
+    public PracticeGroupStatisDto() {
     }
 
     public List<PracticeGroupsDto> getPracticeGroupsDtoList() {

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/practiceStatisDto.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/PracticeStatisDto.java

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.List;
 
-public class practiceStatisDto {
+public class PracticeStatisDto {
     @ApiModelProperty(value = "个分部数据", required = false)
     private List<Practice4OrganDto> practice4OrganDtoList;
     @ApiModelProperty(value = "体验人数", required = false)

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

@@ -139,7 +139,7 @@ public interface TeacherService extends BaseService<Integer, Teacher> {
      * @param queryInfo
      * @return
      */
-    PageInfo<musicGroupStudentApplyDto> queryMusicGroupStudentApply(queryMusicGroupStudentQueryInfo queryInfo);
+    PageInfo<MusicGroupStudentApplyDto> queryMusicGroupStudentApply(queryMusicGroupStudentQueryInfo queryInfo);
 
     /**
      * 获取分部下教师

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

@@ -339,12 +339,12 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 	}
 
 	@Override
-	public PageInfo<musicGroupStudentApplyDto> queryMusicGroupStudentApply(queryMusicGroupStudentQueryInfo queryInfo) {
-		PageInfo<musicGroupStudentApplyDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+	public PageInfo<MusicGroupStudentApplyDto> queryMusicGroupStudentApply(queryMusicGroupStudentQueryInfo queryInfo) {
+		PageInfo<MusicGroupStudentApplyDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 		Map<String, Object> params = new HashMap<>();
 		MapUtil.populateMap(params, queryInfo);
 
-		List<musicGroupStudentApplyDto> dataList = null;
+		List<MusicGroupStudentApplyDto> dataList = null;
 		int count = teacherDao.countMusicGroupStudentApply(params);
 		if (count > 0) {
 			pageInfo.setTotal(count);

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

@@ -639,7 +639,7 @@
     <select id="queryNameById" resultType="java.lang.String">
         select real_name_ FROM sys_user s WHERE id_ = #{userId} LIMIT 1
     </select>
-    <resultMap id="musicGroupStudentApplyDto" type="com.ym.mec.biz.dal.dto.musicGroupStudentApplyDto">
+    <resultMap id="musicGroupStudentApplyDto" type="com.ym.mec.biz.dal.dto.MusicGroupStudentApplyDto">
         <result property="userId" column="user_id_"/>
         <result property="userName" column="username_"/>
         <result property="currentClass" column="current_class_"/>

mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -6,7 +6,6 @@ import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.OrderTypeEnum;
 import com.ym.mec.biz.service.*;
-import com.ym.mec.biz.service.impl.PayServiceImpl;
 import com.ym.mec.thirdparty.adapay.ConfigInit;
 import com.ym.mec.thirdparty.adapay.Payment;
 import com.ym.mec.util.date.DateUtil;
@@ -519,7 +518,7 @@ public class StudentOrderController extends BaseController {
         }
         practiceGroups = practiceGroups.stream().sorted(Comparator.comparingDouble(PracticeGroupsDto::getBuyScale).reversed()).collect(Collectors.toList());
 
-        practiceGroupStatisDto practiceGroupStatisDto = new practiceGroupStatisDto();
+        PracticeGroupStatisDto practiceGroupStatisDto = new PracticeGroupStatisDto();
         practiceGroupStatisDto.setPracticeGroupsDtoList(practiceGroups);
         practiceGroupStatisDto.setTotalMoney(totalMoney);
         practiceGroupStatisDto.setTotalNum(totalNum);