Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseListDto.java

@@ -20,7 +20,7 @@ public class CourseListDto {
     @ApiModelProperty(value = "vip课编号",required = true)
     private String vipId;
 
-    @ApiModelProperty(value = "陪练课编号",required = true)
+    @ApiModelProperty(value = "网管课编号",required = true)
     private String practiceId;
 
     @ApiModelProperty(value = "班级编号",required = true)

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentManageListDto.java

@@ -51,7 +51,7 @@ public class StudentManageListDto {
 
     private YesOrNoEnum hasCourse;
 
-    @ApiModelProperty(value = "是否有陪练课")
+    @ApiModelProperty(value = "是否有网管课")
     private YesOrNoEnum hasPracticeCourse;
 
     private String musicGroupName;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseSchedule.java

@@ -32,7 +32,7 @@ public class CourseSchedule {
 	public enum CourseScheduleType implements BaseEnum<String, CourseScheduleType> {
 
 		SINGLE("SINGLE", "单技课"), MIX("MIX", "合奏课"), HIGH("HIGH", "小班课"), VIP("VIP", "vip课"), DEMO("DEMO", "试听课"), COMPREHENSIVE("COMPREHENSIVE", "综合课"), PRACTICE(
-				"PRACTICE", "陪练课"), ENLIGHTENMENT("ENLIGHTENMENT", "启蒙课"), TRAINING_SINGLE("TRAINING_SINGLE", "集训单技课"), TRAINING_MIX("TRAINING_MIX", "集训合奏课"), CLASSROOM(
+				"PRACTICE", "网管课"), ENLIGHTENMENT("ENLIGHTENMENT", "启蒙课"), TRAINING_SINGLE("TRAINING_SINGLE", "集训单技课"), TRAINING_MIX("TRAINING_MIX", "集训合奏课"), CLASSROOM(
 				"CLASSROOM", "课堂课");
 
 		private String code;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysUserContracts.java

@@ -11,7 +11,7 @@ public class SysUserContracts {
 
 	public enum ContractType implements BaseEnum<String, ContractType> {
 
-		REGISTER("注册"), INSTRUMENT("乐器借用"), COURSES("课程购买"), PRACTICE("陪练课购买");
+		REGISTER("注册"), INSTRUMENT("乐器借用"), COURSES("课程购买"), PRACTICE("网管课购买");
 
 		private String desc;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/Teacher.java

@@ -98,7 +98,7 @@ public class Teacher extends SysUser {
 	@ApiModelProperty(value = "是否支持课程奖励规则活动", required = false)
 	private Boolean isSupportCourseScheduleRewardsRules;
 	
-	@ApiModelProperty(value = "是否支持额外的陪练课", required = false)
+	@ApiModelProperty(value = "是否支持额外的网管课", required = false)
 	private Boolean isSupportExtraPracticeLesson;
 
 	private List<School> teacherSchools;

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/ClassGroupTypeEnum.java

@@ -11,7 +11,7 @@ public enum ClassGroupTypeEnum implements BaseEnum<String, ClassGroupTypeEnum> {
 	HIGH("HIGH", "提高班"),
 	VIP("VIP", "vip课"),
 	DEMO("DEMO", "试听课"),
-	PRACTICE("PRACTICE", "陪练课"),
+	PRACTICE("PRACTICE", "网管课"),
 	SNAP("SNAP", "临时班级");
 
 	private String code;

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/GroupType.java

@@ -3,7 +3,7 @@ package com.ym.mec.biz.dal.enums;
 import com.ym.mec.common.enums.BaseEnum;
 
 public enum GroupType implements BaseEnum<String, GroupType> {
-	MUSIC("乐团课"), VIP("VIP课"), DEMO("试听课"), SPORADIC("零星收费"), PRACTICE("陪练课");
+	MUSIC("乐团课"), VIP("VIP课"), DEMO("试听课"), SPORADIC("零星收费"), PRACTICE("网管课");
 
 	private String desc;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/MessageTypeEnum.java

@@ -38,8 +38,8 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     STUDENT_PUSH_ATTEND_COURSE_MESSAGE("STUDENT_PUSH_ATTEND_COURSE_MESSAGE", "上课提醒"),
     STUDENT_PUSH_ONLINE_COURSE_ACTION("STUDENT_PUSH_ONLINE_COURSE_ACTION", "线上课开始"),
     PUSH_TEACHER_COURSE_COLLIDE("PUSH_TEACHER_COURSE_COLLIDE", "课程冲突"),
-    PAY_PRACTICE_BUY_SUCCESS("PAY_PRACTICE_BUY_SUCCESS", "陪练课购买成功"),
-    PRACTICE_COMPLETED_STUDY_REPORT("PRACTICE_COMPLETED_STUDY_REPORT", "陪练课完成学习报告"),
+    PAY_PRACTICE_BUY_SUCCESS("PAY_PRACTICE_BUY_SUCCESS", "网管课购买成功"),
+    PRACTICE_COMPLETED_STUDY_REPORT("PRACTICE_COMPLETED_STUDY_REPORT", "网管课完成学习报告"),
     STUDENT_PUSH_NAMES_ACHIEVE("STUDENT_PUSH_NAMES_ACHIEVE", "点名完成"),
     SCHEDULE_CHANGE("SCHEDULE_CHANGE", "课表变动"),
     STUDENT_SMS_TEACHING_SCHOOL_CHANGE("STUDENT_SMS_TEACHING_SCHOOL_CHANGE", "教学点变动"),

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/OrderTypeEnum.java

@@ -11,7 +11,7 @@ public enum OrderTypeEnum implements BaseEnum<String, OrderTypeEnum> {
 	SPORADIC("SPORADIC", "零星收费"),
 	OTHER("OTHER", "其他"),
 	SMALL_CLASS_TO_BUY("SMALL_CLASS_TO_BUY", "小课购买"),
-	PRACTICE_GROUP_BUY("PRACTICE_GROUP_BUY", "陪练课购买"),
+	PRACTICE_GROUP_BUY("PRACTICE_GROUP_BUY", "网管课购买"),
 	LUCK("LUCK", "福袋活动");
 
 	private String code;

mec-biz/src/main/java/com/ym/mec/biz/dal/page/ExportTeacherSalaryQueryInfo.java

@@ -3,19 +3,20 @@ package com.ym.mec.biz.dal.page;
 import com.ym.mec.common.page.QueryInfo;
 
 import javax.xml.crypto.Data;
+import java.util.Date;
 
 public class ExportTeacherSalaryQueryInfo extends QueryInfo {
 
     private Boolean isExport = false;
 
-    private Data month;
+    private Date date;
 
-    public Data getMonth() {
-        return month;
+    public Date getDate() {
+        return date;
     }
 
-    public void setMonth(Data month) {
-        this.month = month;
+    public void setDate(Date date) {
+        this.date = date;
     }
 
     public Boolean getIsExport() {

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

@@ -159,6 +159,10 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 	@Override
 	public SysUserTsign register(Integer userId, String realName, String idCardNo, String mobileNo) {
 
+		if (StringUtils.isBlank(realName) || StringUtils.isBlank(idCardNo) || StringUtils.isBlank(mobileNo)) {
+			return null;
+		}
+
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
 		if (sysUserTsign == null) {
 
@@ -221,7 +225,9 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 			throw new BizException("生成pdf协议失败", e);
 		}
 
-		eSealPlugin.userSign(sysUserTsign.getAccountId(), sysUserTsign.getSealData(), srcPdfPath, srcPdfPath);
+		if (sysUserTsign != null) {
+			eSealPlugin.userSign(sysUserTsign.getAccountId(), sysUserTsign.getSealData(), srcPdfPath, srcPdfPath);
+		}
 
 		Date date = new Date();
 		// 上传到oss
@@ -365,7 +371,9 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 		}
 
 		eSealPlugin.organSign(organTsign.getSealData(), srcPdfPath, srcPdfPath);
-		eSealPlugin.userSign(sysUserTsign.getAccountId(), sysUserTsign.getSealData(), srcPdfPath, srcPdfPath);
+		if (sysUserTsign != null) {
+			eSealPlugin.userSign(sysUserTsign.getAccountId(), sysUserTsign.getSealData(), srcPdfPath, srcPdfPath);
+		}
 
 		// 上传到oss
 		String dateStrOss = dateFormatOss.format(date);
@@ -526,7 +534,9 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 
 		eSealPlugin.organSign(organTsign.getSealData(), srcPdfPath, srcPdfPath);
 
-		eSealPlugin.userSign(sysUserTsign.getAccountId(), sysUserTsign.getSealData(), srcPdfPath, srcPdfPath);
+		if (sysUserTsign != null) {
+			eSealPlugin.userSign(sysUserTsign.getAccountId(), sysUserTsign.getSealData(), srcPdfPath, srcPdfPath);
+		}
 
 		// 上传到oss
 		String dateStrOss = dateFormatOss.format(date);
@@ -691,7 +701,9 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 
 		eSealPlugin.organSign(organTsign.getSealData(), srcPdfPath, srcPdfPath);
 
-		eSealPlugin.userSign(sysUserTsign.getAccountId(), sysUserTsign.getSealData(), srcPdfPath, srcPdfPath);
+		if (sysUserTsign != null) {
+			eSealPlugin.userSign(sysUserTsign.getAccountId(), sysUserTsign.getSealData(), srcPdfPath, srcPdfPath);
+		}
 
 		// 上传到oss
 		String dateStrOss = dateFormatOss.format(date);
@@ -815,7 +827,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 		try {
 			result = FileUtils.readFileToString(srcFile);
 		} catch (IOException e) {
-			throw new BizException("读取陪练课购买协议出错", e);
+			throw new BizException("读取网管课购买协议出错", e);
 		} finally {
 			FileUtils.deleteQuietly(srcFile);
 		}
@@ -872,7 +884,9 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 
 		eSealPlugin.organSign(organTsign.getSealData(), srcPdfPath, srcPdfPath);
 
-		eSealPlugin.userSign(sysUserTsign.getAccountId(), sysUserTsign.getSealData(), srcPdfPath, srcPdfPath);
+		if (sysUserTsign != null) {
+			eSealPlugin.userSign(sysUserTsign.getAccountId(), sysUserTsign.getSealData(), srcPdfPath, srcPdfPath);
+		}
 
 		// 上传到oss
 		String dateStrOss = dateFormatOss.format(date);

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

@@ -2967,7 +2967,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             throw new BizException("调整失败: 课程状态异常");
         }
         if(!oldCourseSchedule.getGroupType().equals(GroupType.PRACTICE)){
-            throw new BizException("请选择陪练课");
+            throw new BizException("请选择网管课");
         }
         //已结算的课酬不能调整
         CourseScheduleTeacherSalary teacherSalary = courseScheduleTeacherSalaryDao.queryByCourseScheduleIdAndUserId(oldCourseSchedule.getId(), oldCourseSchedule.getActualTeacherId());
@@ -3043,7 +3043,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             throw new BizException("调整失败: 课程状态异常");
         }
         if(!oldCourseSchedule.getGroupType().equals(GroupType.PRACTICE)){
-            throw new BizException("请选择陪练课");
+            throw new BizException("请选择网管课");
         }
         if(teacherId.equals(oldCourseSchedule.getActualTeacherId())){
             throw new BizException("请选择不同的老师");

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

@@ -693,9 +693,8 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
     public List<ExportTeacherSalaryDto> exportTeacherSalary(ExportTeacherSalaryQueryInfo queryInfo) {
         Map<String, Object> params = new HashMap<>();
         MapUtil.populateMap(params, queryInfo);
-        Date months = DateUtil.addMonths(new Date(), -1);
-        String firstDayOfMonth = DateUtil.format(DateUtil.getFirstDayOfMonth(months),DateUtil.ISO_EXPANDED_DATE_FORMAT);
-        String lastDayOfMonth =  DateUtil.format(DateUtil.getLastDayOfMonth(months),DateUtil.ISO_EXPANDED_DATE_FORMAT);
+        String firstDayOfMonth = DateUtil.format(DateUtil.getFirstDayOfMonth(queryInfo.getDate()),DateUtil.ISO_EXPANDED_DATE_FORMAT);
+        String lastDayOfMonth =  DateUtil.format(DateUtil.getLastDayOfMonth(queryInfo.getDate()),DateUtil.ISO_EXPANDED_DATE_FORMAT);
         params.put("firstDayOfMonth",firstDayOfMonth);
         params.put("lastDayOfMonth",lastDayOfMonth);
         List<ExportTeacherSalaryDto> exportTeacherSalaryDtos = new ArrayList<>();

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

@@ -1628,18 +1628,18 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         if (practiceGroup.getFirstCourseTime().before(activityStartDate)
                 || practiceGroup.getFirstCourseTime().after(activityEndDate)) {
             result.put("status", "APPLY_DATE_OVERFLOW");
-            result.put("info", "预约失败，陪练课的时间超出活动时间范围（2020-3-31之前），请重试。");
+            result.put("info", "预约失败，网管课的时间超出活动时间范围（2020-3-31之前），请重试。");
             return result;
         }
         if (practiceGroup.getSecondCourseTime().before(activityStartDate)
                 || practiceGroup.getSecondCourseTime().after(activityEndDate)) {
             result.put("status", "APPLY_DATE_OVERFLOW");
-            result.put("info", "预约失败，陪练课的时间超出活动时间范围（2020-3-31之前），请重试。");
+            result.put("info", "预约失败，网管课的时间超出活动时间范围（2020-3-31之前），请重试。");
             return result;
         }
         if (DateUtil.isSameDay(practiceGroup.getFirstCourseTime(), practiceGroup.getSecondCourseTime())) {
             result.put("status", "TWO_DATE_ON_ONE_DAY");
-            result.put("info", "预约失败，陪练课选择时间重复，请重试。");
+            result.put("info", "预约失败，网管课选择时间重复，请重试。");
             return result;
         }
 
@@ -1680,13 +1680,13 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         if (allCourseDates.get(2).before(activityStartDate)
                 || allCourseDates.get(2).after(courseExpireDate)) {
             result.put("status", "APPLY_DATE_OVERFLOW");
-            result.put("info", "预约失败，陪练课的时间超出活动时间范围（2020-3-31之前），请重试。");
+            result.put("info", "预约失败，网管课的时间超出活动时间范围（2020-3-31之前），请重试。");
             return result;
         }
         if (allCourseDates.get(3).before(activityStartDate)
                 || allCourseDates.get(3).after(courseExpireDate)) {
             result.put("status", "APPLY_DATE_OVERFLOW");
-            result.put("info", "预约失败，陪练课的时间超出活动时间范围（2020-3-31之前），请重试。");
+            result.put("info", "预约失败，网管课的时间超出活动时间范围（2020-3-31之前），请重试。");
             return result;
         }
         allCourseDates.sort(Comparator.comparing(Date::getTime));
@@ -1698,7 +1698,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 
         if (applyTimes >= 1) {
             result.put("status", "IS_APPLIED");
-            result.put("info", "您已经完成陪练课预约，请勿重复预约。");
+            result.put("info", "您已经完成网管课预约，请勿重复预约。");
             return result;
         }
         applyTimes += 1;
@@ -2094,7 +2094,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
     public Object findPracticeGroupCourseSchedules(PracticeGroupQueryInfo queryInfo) {
         PageInfo pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
         if (Objects.isNull(queryInfo.getPracticeId())) {
-            throw new BizException("请指定陪练课课程");
+            throw new BizException("请指定网管课课程");
         }
 
         Map<String, Object> params = new HashMap<>();
@@ -2102,7 +2102,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 
         PracticeGroup practiceGroup = practiceGroupDao.get(queryInfo.getPracticeId());
         if (Objects.isNull(practiceGroup)) {
-            throw new BizException("指定的陪练课不存在");
+            throw new BizException("指定的网管课不存在");
         }
         List<CourseSchedule> dataList = courseScheduleDao.findGroupCourseSchedules(practiceGroup.getId(), GroupType.PRACTICE.getCode());
         int count = dataList.size();
@@ -2897,7 +2897,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                 studentPaymentOrder.setUpdateTime(now);
                 studentPaymentOrder.setOrganId(practiceGroupBuyParams.getOrganId());
 
-                sysUserCashAccountService.updateBalance(practiceGroupBuyParams.getStudentId(), studentPaymentOrder.getExpectAmount().negate(),PlatformCashAccountDetailTypeEnum.PAY_FEE,"陪练课购买");
+                sysUserCashAccountService.updateBalance(practiceGroupBuyParams.getStudentId(), studentPaymentOrder.getExpectAmount().negate(),PlatformCashAccountDetailTypeEnum.PAY_FEE,"网管课购买");
 
                 this.orderCallback(studentPaymentOrder);
 
@@ -2907,7 +2907,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                 return BaseController.succeed(result);
             }else{
                 if (userCashAccount.getBalance().doubleValue() > 0) {
-                    sysUserCashAccountService.updateBalance(practiceGroupBuyParams.getStudentId(), userCashAccount.getBalance().negate(), PlatformCashAccountDetailTypeEnum.PAY_FEE, "陪练课购买");
+                    sysUserCashAccountService.updateBalance(practiceGroupBuyParams.getStudentId(), userCashAccount.getBalance().negate(), PlatformCashAccountDetailTypeEnum.PAY_FEE, "网管课购买");
                     amount = studentPaymentOrder.getExpectAmount().subtract(userCashAccount.getBalance());
                     studentPaymentOrder.setActualAmount(amount);
                     studentPaymentOrder.setBalancePaymentAmount(userCashAccount.getBalance());
@@ -2929,7 +2929,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                     orderNo,
                     baseApiUrl+"/api-student/studentOrder/notify",
                     baseApiUrl+"/api-student/studentOrder/paymentResult?orderNo=" + orderNo,
-                    "陪练课购买",
+                    "网管课购买",
                     practiceGroupBuyParams.getName(),
                     practiceGroupBuyParams.getStudentId(),
                     classFee,
@@ -3007,7 +3007,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             courseScheduleDao.updateGroupCourseLock(order.getMusicGroupId(),GroupType.PRACTICE,0);
         }else{
             if(Objects.nonNull(order.getBalancePaymentAmount())){
-                sysUserCashAccountService.updateBalance(order.getUserId(), order.getBalancePaymentAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS, "陪练课购买失败");
+                sysUserCashAccountService.updateBalance(order.getUserId(), order.getBalancePaymentAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS, "网管课购买失败");
             }
             studentPaymentOrderDao.update(order);
             PracticeGroup practiceGroup = practiceGroupDao.get(Long.valueOf(order.getMusicGroupId()));
@@ -3222,7 +3222,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                     orderNo,
                     baseApiUrl+"/api-student/studentOrder/notify",
                     baseApiUrl+"/api-student/studentOrder/paymentResult?orderNo=" + orderNo,
-                    "陪练课购买",
+                    "网管课购买",
                     practiceGroup.getName(),
                     practiceGroup.getStudentId(),
                     classFee,

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

@@ -63,7 +63,7 @@ public class PracticeLessonApplyServiceImpl extends BaseServiceImpl<Integer, Pra
 		}
 		PracticeLessonApply lessonApply = practiceLessonApplyDao.findByUserId(sysUser.getId());
 		if(lessonApply != null){
-			throw new BizException("您已申请过陪练课!");
+			throw new BizException("您已申请过网管课!");
 		}
 		PracticeLessonApply practiceLessonApply = new PracticeLessonApply();
 		practiceLessonApply.setCreateTime(new Date());

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

@@ -538,7 +538,7 @@
 		LEFT JOIN music_group mg ON (mg.id_ = ts.music_group_id_ AND ts.group_type_ = 'MUSIC')
 		LEFT JOIN organization mgo ON mgo.id_ = mg.organ_id_
 		LEFT JOIN charge_type ct ON ct.id_ = mg.charge_type_id_
-		WHERE cs.class_date_ BETWEEN #{firstDayOfMonth} AND #{lastDayOfMonth} AND cs.`del_flag_` != 1 AND cs.group_type_ = 'MUSIC'
+		WHERE cs.class_date_ BETWEEN #{firstDayOfMonth} AND #{lastDayOfMonth} AND cs.`del_flag_` != 1 AND cs.group_type_ = 'MUSIC' AND ts.settlement_time_ IS NOT NULL
 		GROUP BY ts.id_,ta.id_
 	</select>
 	<select id="exportVipTeacherSalary" resultMap="ExportTeacherSalaryDtoMap">
@@ -567,7 +567,7 @@
 		LEFT JOIN course_schedule_student_payment sp ON sp.course_schedule_id_ = ts.course_schedule_id_
 		LEFT JOIN vip_group vg ON (vg.id_ = ts.music_group_id_ AND ts.group_type_ = 'VIP')
 		LEFT JOIN organization vgo ON vgo.id_ = vg.organ_id_
-		WHERE cs.class_date_ BETWEEN #{firstDayOfMonth} AND #{lastDayOfMonth} AND cs.`del_flag_` != 1 AND cs.group_type_ = 'VIP'
+		WHERE cs.class_date_ BETWEEN #{firstDayOfMonth} AND #{lastDayOfMonth} AND cs.`del_flag_` != 1 AND cs.group_type_ = 'VIP' AND ts.settlement_time_ IS NOT NULL
 		GROUP BY ts.id_,ta.id_
 	</select>
 	<select id="querySettlementScheduleId" resultType="java.lang.Long">
@@ -579,7 +579,7 @@
 		u.real_name_ teacherName,o.name_ teacherOrganName,
 		CASE WHEN cs.teach_mode_ = 'OFFLINE' THEN '线下' WHEN cs.teach_mode_ = 'ONLINE' THEN '线上' END teach_mode_,
 		CASE WHEN t.job_nature_ = 'PART_TIME' THEN '兼职' WHEN t.job_nature_ = 'FULL_TIME' THEN '全职' ELSE '零时工' END jobType,
-		'陪练课' courseScheduleType,
+		'网管课' courseScheduleType,
 		cs.class_date_ classDate,cs.start_class_time_ courseScheduleStartTime,cs.end_class_time_ courseScheduleEndTime,
 		ROUND((UNIX_TIMESTAMP(cs.end_class_time_)-UNIX_TIMESTAMP(cs.start_class_time_))/60) signCourseScheduleTime,
 		ts.actual_salary_ price,s.name_ address,
@@ -599,7 +599,7 @@
 		LEFT JOIN course_schedule_student_payment sp ON sp.course_schedule_id_ = ts.course_schedule_id_
 		LEFT JOIN practice_group pg ON (pg.id_ = ts.music_group_id_ AND ts.group_type_ = 'PRACTICE')
 		LEFT JOIN organization pgo ON pgo.id_ = pg.organ_id_
-		WHERE cs.class_date_ BETWEEN #{firstDayOfMonth} AND #{lastDayOfMonth} AND cs.`del_flag_` != 1 AND cs.group_type_ = 'PRACTICE'
+		WHERE cs.class_date_ BETWEEN #{firstDayOfMonth} AND #{lastDayOfMonth} AND cs.`del_flag_` != 1 AND cs.group_type_ = 'PRACTICE' AND ts.settlement_time_ IS NOT NULL
 		GROUP BY ts.id_,ta.id_
 	</select>
 </mapper>

mec-client-api/src/main/java/com/ym/mec/task/fallback/TaskRemoteServiceFallback.java

@@ -93,6 +93,6 @@ public class TaskRemoteServiceFallback implements TaskRemoteService {
 
 	@Override
 	public void updateHistoryPracticeGroupStatus() {
-		logger.info("历史陪练课状态更新失败");
+		logger.info("历史网管课状态更新失败");
 	}
 }

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

@@ -125,7 +125,7 @@ public class ExportController extends BaseController {
         List<StudentManageListDto> rows = studentManageService.findStudentsByOrganId(queryInfo).getRows();
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "学员编号", "学员姓名", "性别", "家长姓名",
-                    "家长联系电话", "是否激活", "是否有课", "是否预约陪练课","是否有陪练课", "课程余额(元)",
+                    "家长联系电话", "是否激活", "是否有课", "是否预约网管课","是否有网管课", "课程余额(元)",
                     "所在乐团", "乐团所属声部", "所在乐团状态", "所在vip课", "所在VIP状态"}, new String[]{
                     "organName", "userId", "username", "gender.description", "parentsName", "parentsPhone",
                     "isActive.msg","hasCourse.msg","isMake.msg","hasPracticeCourse.msg","courseBalance","musicGroupName",
@@ -171,7 +171,7 @@ public class ExportController extends BaseController {
             });
         }
         try {
-            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部","陪练课编号", "课程名称", "指导老师", "班级人数", "先上课单价", "线下课单价",
+            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部","网管课编号", "课程名称", "指导老师", "班级人数", "先上课单价", "线下课单价",
                     "当前课次", "总课次", "剩余课次","开课时间", "结束时间"}, new String[]{
                     "organName","id", "name", "teacherName", "studentNum", "onlineClassesUnitPrice",
                     "offlineClassesUnitPrice", "currentClassTimes", "totalClassTimes", "subClassTimes","coursesStartDate", "coursesExpireDate"}, rows);