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

cms/src/main/java/com/ym/mec/cms/controller/NewsController.java

@@ -24,6 +24,10 @@ public class NewsController extends BaseController {
 	@ApiOperation("资讯列表分页查询")
 	@GetMapping(value = "/list")
 	public Object getList(NewsInformationQueryInfo queryInfo) {
+		if(queryInfo.getTenantId() == null){
+			queryInfo.setTenantId(1);
+		}
+		
 		return succeed(sysNewsInformationService.queryPage(queryInfo));
 	}
 

cms/src/main/java/com/ym/mec/cms/service/impl/HelpCenterCatalogServiceImpl.java

@@ -33,12 +33,7 @@ public class HelpCenterCatalogServiceImpl extends BaseServiceImpl<Integer, HelpC
 		List<HelpCenterCatalog> dataList = helpCenterCatalogDao.queryByParentId(parentId, status);
 		if (dataList != null) {
 			for (HelpCenterCatalog sub : dataList) {
-				List<HelpCenterCatalog> subList = helpCenterCatalogDao.queryByParentId(sub.getId(), status);
-				if (subList == null) {
-					continue;
-				}
-				sub.setChildren(subList);
-				queryByParentId(sub.getId(), status);
+				sub.setChildren(queryByParentId(sub.getId(), status));
 			}
 		}
 		return dataList;

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

@@ -492,6 +492,13 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      * @return
      */
     List<CourseSchedule> queryFinishedWithNoUpdateStatus();
+    
+    /**
+     * 查询进行中未更新状态的课程列表
+     *
+     * @return
+     */
+    List<CourseSchedule> queryUnderwayWithNoUpdateStatus();
 
     int batchUpdate(List<CourseSchedule> courseScheduleList);
 

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

@@ -114,6 +114,9 @@ public class CourseReviewDto {
     @ApiModelProperty(value = "乐理Str",required = false)
     private String musicTheoryStr;
 
+    @ApiModelProperty(value = "作业是否回复",required = false)
+    private String homeWorkReplied;
+
     public Integer getOrganId() {
         return organId;
     }
@@ -401,4 +404,12 @@ public class CourseReviewDto {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
+    public String getHomeWorkReplied() {
+        return homeWorkReplied;
+    }
+
+    public void setHomeWorkReplied(String homeWorkReplied) {
+        this.homeWorkReplied = homeWorkReplied;
+    }
 }

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

@@ -46,6 +46,16 @@ public class TeacherHomeworkListDto {
 
     private int isReplied;
 
+    private int isSubmit;
+
+    public int getIsSubmit() {
+        return isSubmit;
+    }
+
+    public void setIsSubmit(int isSubmit) {
+        this.isSubmit = isSubmit;
+    }
+
     public int getIsReplied() {
         return isReplied;
     }

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

@@ -72,6 +72,8 @@ public class CourseScheduleEvaluate {
     @ApiModelProperty(value = "状态 1-已提交 0-未提交")
     private Integer status;
 
+    private Integer subjectId;
+
     public String getStudentIdList() {
         return studentIdList;
     }
@@ -273,4 +275,12 @@ public class CourseScheduleEvaluate {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
+    public Integer getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(Integer subjectId) {
+        this.subjectId = subjectId;
+    }
 }

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

@@ -44,6 +44,9 @@ public class CourseReviewQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "结束时间",required = false)
     private String endTime;
 
+    @ApiModelProperty(value = "是否导出",required = false)
+    private Integer isExport;
+
     public Integer getTeacherId() {
         return teacherId;
     }
@@ -141,4 +144,12 @@ public class CourseReviewQueryInfo extends QueryInfo {
     public void setHasLiaison(Integer hasLiaison) {
         this.hasLiaison = hasLiaison;
     }
+
+    public Integer getIsExport() {
+        return isExport;
+    }
+
+    public void setIsExport(Integer isExport) {
+        this.isExport = isExport;
+    }
 }

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

@@ -82,4 +82,11 @@ public interface CourseReviewService extends BaseService<Integer, CourseSchedule
 	 */
 	List<CourseScheduleReview> batchAdd(Integer teacherId, List<CourseScheduleReview> courseScheduleReviewList);
 
+	/**
+	 * 根据课程id获取老师和学生对应评价
+	 * @param courseId
+	 * @return
+	 */
+	ReviewInfoDto getStuAndTeaReviewInfo(Long courseId,Integer userId);
+
 }

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

@@ -321,6 +321,12 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
 	boolean updateCourseScheduleToOverStatus();
 
 	/**
+	 * 更新课程至进行中状态
+	 * @return
+	 */
+	boolean updateCourseScheduleToUnderway();
+
+	/**
 	 * @describe 获取老师指定班级的排课
 	 * @author Joburgess
 	 * @date 2019/10/18

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

@@ -56,6 +56,7 @@ public class CourseHomeworkServiceImpl extends BaseServiceImpl<Long, CourseHomew
 			List<Long> courseIds = dataList.stream().mapToLong(TeacherHomeworkListDto::getCourseScheduleId).boxed().collect(Collectors.toList());
 			List<StudentCourseHomework> allStudentCourseHomeworks = studentCourseHomeworkDao.findByCourses(courseIds);
 			Map<Long, List<StudentCourseHomework>> homeworkStudentMap = allStudentCourseHomeworks.stream().collect(Collectors.groupingBy(StudentCourseHomework::getCourseScheduleId));
+			Map<YesOrNoEnum, List<StudentCourseHomework>> statusStudentMpa = allStudentCourseHomeworks.stream().collect(Collectors.groupingBy(StudentCourseHomework::getStatus));
 			for (TeacherHomeworkListDto teacherHomeworkListDto : dataList) {
 				List<StudentCourseHomework> studentCourseHomeworks = homeworkStudentMap.get(teacherHomeworkListDto.getCourseScheduleId().longValue());
 				if(CollectionUtils.isEmpty(studentCourseHomeworks)){
@@ -65,6 +66,10 @@ public class CourseHomeworkServiceImpl extends BaseServiceImpl<Long, CourseHomew
 				if(CollectionUtils.isEmpty(replyStudentsMap.get(YesOrNoEnum.NO))){
 					teacherHomeworkListDto.setIsReplied(YesOrNoEnum.YES.getCode());
 				}
+				List<StudentCourseHomework> studentCourseHomeworks1 = statusStudentMpa.get(YesOrNoEnum.YES);
+				if(!CollectionUtils.isEmpty(studentCourseHomeworks1)&&studentCourseHomeworks1.size()>0){
+					teacherHomeworkListDto.setIsSubmit(1);
+				}
 			}
 		}
 		if (count != 0) {

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

@@ -252,14 +252,14 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
             throw new BizException("评价不存在");
         }
         CourseHomework homework = courseHomeworkDao.findByCourseSchedule(courseScheduleReview.getCourseScheduleId().longValue());
-        if(homework != null){
-        	courseScheduleReview.setHomeWork(homework.getContent());
+        if (homework != null) {
+            courseScheduleReview.setHomeWork(homework.getContent());
         }
         TeacherClassHeadInfo teacherClassGroupInfo = getCourseInfoHead(courseScheduleReview.getCourseScheduleId());
         courseScheduleReview.setTeacherName(teacherClassGroupInfo.getBishopTeacher());
 
         CourseSchedule courseSchedule = courseScheduleDao.get(courseScheduleReview.getCourseScheduleId().longValue());
-        if(courseSchedule.getGroupType().equals(GroupType.PRACTICE)){
+        if (courseSchedule.getGroupType().equals(GroupType.PRACTICE)) {
             PracticeCourseDto practiceGroup = practiceGroupDao.findByGroupId(Integer.parseInt(courseSchedule.getMusicGroupId()));
             courseScheduleReview.setEduTeacherName(practiceGroup.getEduTeacherName());
         }
@@ -456,4 +456,41 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
         }
         return courseScheduleReviewList;
     }
+
+    @Override
+    public ReviewInfoDto getStuAndTeaReviewInfo(Long courseId, Integer userId) {
+        //老师评价
+        CourseScheduleReview courseScheduleReview = courseScheduleReviewDao.findByCourseScheduleAndStudent(courseId, userId);
+        //学生评价
+        CourseScheduleComplaintsDto courseScheduleComplaint = courseScheduleComplaintsDao.findByUserIdAndCourseId(userId.longValue(), courseId);
+
+        if (courseScheduleReview == null && courseScheduleComplaint == null) {
+            throw new BizException("评价不存在");
+        }
+
+        TeacherClassHeadInfo teacherClassGroupInfo = getCourseInfoHead(courseId.intValue());
+        ReviewInfoDto reviewInfoDto = new ReviewInfoDto();
+        reviewInfoDto.setTeacherClassHeadInfo(teacherClassGroupInfo);
+
+        if (courseScheduleReview != null) {
+            CourseHomework homework = courseHomeworkDao.findByCourseSchedule(courseId);
+            if (homework != null) {
+                courseScheduleReview.setHomeWork(homework.getContent());
+            }
+            courseScheduleReview.setTeacherName(teacherClassGroupInfo.getBishopTeacher());
+            CourseSchedule courseSchedule = courseScheduleDao.get(courseId);
+            if (courseSchedule.getGroupType().equals(GroupType.PRACTICE)) {
+                PracticeCourseDto practiceGroup = practiceGroupDao.findByGroupId(Integer.parseInt(courseSchedule.getMusicGroupId()));
+                courseScheduleReview.setEduTeacherName(practiceGroup.getEduTeacherName());
+            }
+            reviewInfoDto.setCourseScheduleReview(courseScheduleReview);
+        }
+
+        if (courseScheduleComplaint != null) {
+            List<CourseScheduleComplaintsDto> courseScheduleComplaints = new ArrayList<>();
+            courseScheduleComplaints.add(courseScheduleComplaint);
+            reviewInfoDto.setCourseScheduleComplaints(courseScheduleComplaints);
+        }
+        return reviewInfoDto;
+    }
 }

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

@@ -7,6 +7,7 @@ import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.entity.ClassGroup;
 import com.ym.mec.biz.dal.entity.CourseScheduleEvaluate;
 import com.ym.mec.biz.dal.entity.PracticeGroup;
+import com.ym.mec.biz.dal.entity.Subject;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.service.CourseScheduleEvaluateService;
 import com.ym.mec.biz.service.SysConfigService;
@@ -43,6 +44,8 @@ public class CourseScheduleEvaluateServiceImpl extends BaseServiceImpl<Long, Cou
     private SysMessageService sysMessageService;
     @Autowired
     private SysConfigDao sysConfigDao;
+    @Autowired
+    private SubjectDao subjectDao;
 
     @Override
     public BaseDAO<Long, CourseScheduleEvaluate> getDAO() {
@@ -68,7 +71,7 @@ public class CourseScheduleEvaluateServiceImpl extends BaseServiceImpl<Long, Cou
             Integer classGroupCourseTimes = courseScheduleEvaluateDao.getClassGroupCourseTimes(classGroup.getId());
             Date date = new Date();
             courseScheduleEvaluate.setTimes(classGroupCourseTimes);
-            courseScheduleEvaluate.setTotalMinutes(classGroupCourseTimes*25);
+            courseScheduleEvaluate.setTotalMinutes(classGroupCourseTimes * 25);
             courseScheduleEvaluate.setMusicGroupId(classGroup.getMusicGroupId());
             courseScheduleEvaluate.setCreateTime(date);
             courseScheduleEvaluate.setUpdateTime(date);
@@ -132,10 +135,11 @@ public class CourseScheduleEvaluateServiceImpl extends BaseServiceImpl<Long, Cou
         Date afterDate = DateUtil.addDays(DateUtil.getLastSecondWithDay(nowDate), 5);
         boolean afterDateIsLastDay = DateUtil.isSameDay(DateUtil.getLastDayOfMonth(startDate), afterDate);
 
-        List<CourseScheduleEvaluate> needPostReportPracticeGroups = practiceGroupDao.getNeedPostReportPracticeGroups(startDate, afterDate,afterDateIsLastDay);
+        List<CourseScheduleEvaluate> needPostReportPracticeGroups = practiceGroupDao.getNeedPostReportPracticeGroups(startDate, afterDate, afterDateIsLastDay);
 
         Map<Integer, Integer> courseTimesMap = new HashMap<>();
         Map<Integer, Integer> reportCountMap = new HashMap<>();
+        Map<Integer, String> subjectMap = new HashMap<>();
         if (needPostReportPracticeGroups.size() > 0) {
             Date courseStartDate = DateUtil.addMonths(startDate, -1);
             List<Integer> classGroupIds = needPostReportPracticeGroups.stream().map(CourseScheduleEvaluate::getClassGroupId).collect(Collectors.toList());
@@ -143,15 +147,23 @@ public class CourseScheduleEvaluateServiceImpl extends BaseServiceImpl<Long, Cou
             courseTimesMap = reportCourseTimes.stream().collect(Collectors.toMap(ClassGroup::getId, ClassGroup::getTotalClassTimes));
 
             List<CourseScheduleEvaluate> courseScheduleEvaluates = courseScheduleEvaluateDao.hasReportList(classGroupIds, startDate);
-            if(courseScheduleEvaluates.size() > 0){
-                reportCountMap = courseScheduleEvaluates.stream().collect(Collectors.toMap(CourseScheduleEvaluate::getClassGroupId,CourseScheduleEvaluate::getTimes));
+            if (courseScheduleEvaluates.size() > 0) {
+                reportCountMap = courseScheduleEvaluates.stream().collect(Collectors.toMap(CourseScheduleEvaluate::getClassGroupId, CourseScheduleEvaluate::getTimes));
             }
+            List<Integer> subjectIds = needPostReportPracticeGroups.stream().map(CourseScheduleEvaluate::getSubjectId).collect(Collectors.toList());
+            List<Subject> subjects = subjectDao.findBySubjectIds(subjectIds);
+            subjectMap = subjects.stream().collect(Collectors.toMap(Subject::getId, Subject::getName));
         }
         Iterator<CourseScheduleEvaluate> iterator = needPostReportPracticeGroups.iterator();
-        while (iterator.hasNext()){
+        while (iterator.hasNext()) {
             CourseScheduleEvaluate courseScheduleEvaluate = iterator.next();
-            if(reportCountMap.containsKey(courseScheduleEvaluate.getClassGroupId()) &&
-                    reportCountMap.get(courseScheduleEvaluate.getClassGroupId()) > 0){
+            if (subjectMap.get(courseScheduleEvaluate.getSubjectId()).contains("钢琴")) {
+                iterator.remove();
+                continue;
+            }
+
+            if (reportCountMap.containsKey(courseScheduleEvaluate.getClassGroupId()) &&
+                    reportCountMap.get(courseScheduleEvaluate.getClassGroupId()) > 0) {
                 iterator.remove();
                 continue;
             }

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

@@ -1682,7 +1682,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         StringBuffer errInfo = new StringBuffer("在");
         errInfo.append(DateUtil.dateToString(courseSchedules.get(1).getStartClassTime(), "yyyy-MM-dd HH:mm"));
         errInfo.append("至");
-        errInfo.append(DateUtil.dateToString(courseSchedules.get(0).getEndClassTime().before(courseSchedules.get(1).getEndClassTime())?courseSchedules.get(0).getEndClassTime():courseSchedules.get(1).getEndClassTime(), "yyyy-MM-dd HH:mm"));
+        errInfo.append(DateUtil.dateToString(courseSchedules.get(0).getEndClassTime().before(courseSchedules.get(1).getEndClassTime())?courseSchedules.get(0).getEndClassTime():courseSchedules.get(1).getEndClassTime(), "HH:mm"));
         errInfo.append("的时间段内");
         errInfo.append("安排的课程存在冲突,");
         errInfo.append("冲突课程为：");
@@ -3269,6 +3269,25 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
     }
 
     @Override
+	public boolean updateCourseScheduleToUnderway() {
+    	Date date = new Date();
+    	List<CourseSchedule> list = courseScheduleDao.queryUnderwayWithNoUpdateStatus();
+
+        List<CourseSchedule> updateList = new ArrayList<CourseSchedule>();
+
+        for (CourseSchedule courseSchedule : list) {
+            courseSchedule.setStatus(CourseStatusEnum.OVER);
+            courseSchedule.setUpdateTime(date);
+            updateList.add(courseSchedule);
+        }
+
+        if (updateList.size() > 0) {
+            courseScheduleDao.batchUpdate(updateList);
+        }
+		return true;
+	}
+
+	@Override
     public PageInfo queryTeacherClassCourseSchedule(CourseScheduleQueryInfo queryInfo) {
         SysUser user = sysUserFeignService.queryUserInfo();
         if (null == user) {
@@ -4108,9 +4127,17 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		List<CourseScheduleRateDto> courseScheduleRateDtos = courseScheduleDao.findCourseRate(schedule.getMusicGroupId(),schedule.getGroupType().getCode());
 		//获取最近一次已结束的课程
 		CourseSchedule courseSchedule = courseScheduleDao.getLastEndCourse(schedule.getMusicGroupId(),schedule.getGroupType().getCode());
+		List<Long> courseScheduleIds = courseScheduleRateDtos.stream().map(CourseScheduleRateDto::getCourseScheduleId).collect(Collectors.toList());
+		List<CourseScheduleReview> courseReviews = courseScheduleReviewDao.findByCourseSchedules(courseScheduleIds);
+		Map<Integer, List<CourseScheduleReview>> reviews = courseReviews.stream().collect(Collectors.groupingBy(CourseScheduleReview::getCourseScheduleId));
+
 		//标记当前课程的上一节课
 		if(courseSchedule != null){
 			for (CourseScheduleRateDto e:courseScheduleRateDtos) {
+				if(reviews.containsKey(e.getCourseScheduleId().intValue())){
+					List<CourseScheduleReview> review = reviews.get(e.getCourseScheduleId().intValue());
+					e.setTeachingContent(review.get(0).getTeachingMaterial());
+				}
 				if(e.getCourseScheduleId().equals(courseSchedule.getId())){
 					e.setIsDefault(true);
 					break;

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

@@ -101,7 +101,7 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
         CoursesGroup courseGroup = courseGroupCreateInfo.getCoursesGroup();
         CourseGenerateDto courseCycleInfo = courseGroupCreateInfo.getCourseCycleInfo();
         if(Objects.isNull(courseGroup.getName())|| StringUtils.isBlank(courseGroup.getName())){
-            throw new BizException("请填写课程班名称");
+            throw new BizException("请填写课程名称");
         }
         if(Objects.isNull(courseGroup.getSubjectId())){
             throw new BizException("请选择科目");
@@ -124,7 +124,12 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
         //总课程时长
         Integer totalCourseTime=courseCycleInfo.getCourseCount()*courseCycleInfo.getSingleClassMinutes();
 
-        sysTenantAccountService.update(courseGroup.getTeacherId(), -totalCourseTime, "", SysTenantAccountDetail.TransType.CONSUME, "",BigDecimal.ZERO,"课程组创建");
+        try {
+            sysTenantAccountService.update(courseGroup.getTeacherId(), -totalCourseTime, "", SysTenantAccountDetail.TransType.CONSUME, "",BigDecimal.ZERO,"课程组创建");
+        } catch (Exception e) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return BaseController.failed("余额不足，请充值。");
+        }
 
         Teacher teacher = teacherDao.get(courseGroup.getTeacherId());
 
@@ -148,7 +153,14 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
         } catch (Exception e) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             String errMessage;
-            errMessage="抱歉啦，当前所选时段组合，「" + teacher.getRealName() + "」老师已被预约，请重新选择时段或更换老师后重试。";
+            String courseName=e.getMessage().substring(e.getMessage().indexOf(")-")+2);
+            courseName = courseName.substring(0,courseName.indexOf("("));
+            String courseTime = e.getMessage().substring(e.getMessage().indexOf("在") + 1);
+            courseTime = courseTime.substring(0, courseTime.indexOf("至"));
+            errMessage="现在课程：";
+            errMessage+=courseName;
+            errMessage+="<br/>冲突时间：";
+            errMessage+=courseTime;
             return BaseController.failed(HttpStatus.FOUND, errMessage);
         }
 
@@ -367,18 +379,18 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
             throw new BizException("此课程组不存在");
         }
         if(coursesGroup.getStatus().equals(GroupStatusEnum.CANCEL)){
-            throw new BizException("无法加入，此课程组已关闭");
+            throw new BizException("课程已关闭，请联系老师了解详细情况。");
         }
         List<ClassGroupStudentMapper> groupStudents = classGroupStudentMapperDao.findGroupStudents(courseGroupId.toString(), GroupType.COMM, userId, null);
         if(!CollectionUtils.isEmpty(groupStudents)){
-            throw new BizException("无法重复加入，您已在此课程组");
+            throw new BizException("您完成此课程组报名，无需重复报名。");
         }
 
         Date now=new Date();
 
         ClassGroup classGroup = classGroupDao.findByMusicGroupAndType(courseGroupId.toString(), GroupType.COMM.getCode());
         if(classGroup.getStudentNum()>=classGroup.getExpectStudentNum()){
-            throw new BizException("无法加入，此课程组人数已达上限");
+            throw new BizException("课程人数已满");
         }
 
         BigDecimal amount = coursesGroup.getTotalCoursesPrice();
@@ -589,7 +601,7 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
         List<CourseScheduleStudentPayment> courseScheduleStudentPayments = new ArrayList<>();
         List<CourseSchedule> groupNotStartCourses = courseScheduleDao.findGroupNotStartCourses(order.getMusicGroupId(), GroupType.COMM);
         if(CollectionUtils.isEmpty(groupNotStartCourses)){
-            throw new BizException("无法加入，此课程组已关闭");
+            throw new BizException("课程已关闭，请联系老师了解详细情况。");
         }
         BigDecimal singleCoursePrice = order.getExpectAmount().divide(new BigDecimal(groupNotStartCourses.size()), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN);
         for (CourseSchedule courseSchedule : groupNotStartCourses) {
@@ -613,9 +625,12 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
 
             String courseName=e.getMessage().substring(e.getMessage().indexOf(")-")+2);
             courseName = courseName.substring(0,courseName.indexOf("("));
-            errMessage="抱歉啦，当前所选时段组合，与您现有课程「";
+            String courseTime = e.getMessage().substring(e.getMessage().indexOf("在") + 1);
+            courseTime = courseTime.substring(0, courseTime.indexOf("至"));
+            errMessage="现在课程：";
             errMessage+=courseName;
-            errMessage+="」时段冲突，请选择其他时段重试。";
+            errMessage+="<br/>冲突时间：";
+            errMessage+=courseTime;
 
             return BaseController.failed(HttpStatus.FOUND, errMessage);
         }

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

@@ -72,7 +72,7 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 
 	@Autowired
 	private YqPayFeignService yqPayFeignService;
-
+	
 	@Override
 	public BaseDAO<Long, TenantPaymentOrder> getDAO() {
 		return tenantPaymentOrderDao;
@@ -106,7 +106,6 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 			throw new BizException("活动已结束");
 		}
 
-		int purchaseTimes = 0; // 购买次数
 		// 查询用户订单
 		List<TenantPaymentOrder> orderList = tenantPaymentOrderDao.queryByUserId(userId);
 		if (orderList != null && orderList.size() > 0) {
@@ -114,10 +113,10 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 				// 是否满足条件
 				if (tenantEntryActivities.getSuitableUser() == SuitableUser.NEW) {
 					if (po.getStatus() == DealStatusEnum.ING) {
-						throw new BizException("您存在'处理中' 的订单，请稍后重试（最多需等待30分钟）");
+						throw new BizException("您参加的首充活动正在处理中，预计于{}分钟后处理完毕，请稍后。",30 - DateUtil.minutesBetween(po.getCreateTime(), date));
 					}
 					if (po.getStatus() == DealStatusEnum.SUCCESS) {
-						throw new BizException("您已参与过当前活动，每人只能参与一次");
+						throw new BizException("首充优惠活动每个用户限参与一次。");
 					}
 				}
 			}

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

@@ -12,6 +12,7 @@
         <result column="create_time_" jdbcType="TIMESTAMP" property="createTime"/>
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
         <result column="student_id_" jdbcType="INTEGER" property="studentId"/>
+        <result column="subject_id_" jdbcType="INTEGER" property="subjectId"/>
         <result column="subject_name_" jdbcType="VARCHAR" property="subjectName"/>
         <result column="is_pushed_" jdbcType="INTEGER" property="isPushed"/>
         <result column="month_" jdbcType="VARCHAR" property="month"/>

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

@@ -1144,6 +1144,13 @@
           and status_ != 'OVER'
     </select>
 
+    <select id="queryUnderwayWithNoUpdateStatus" resultMap="CourseSchedule">
+        select *
+        from course_schedule
+        where CONCAT(class_date_, ' ', start_class_time_) &lt;= now()
+          and status_ = 'NOT_START'
+    </select>
+
     <update id="batchUpdate" parameterType="java.util.List">
         <foreach collection="list" item="item" index="index" open="" close="" separator=";">
             UPDATE course_schedule

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

@@ -29,7 +29,8 @@
     </resultMap>
 
     <select id="get" parameterType="java.lang.Integer" resultMap="CourseScheduleReview">
-        select * from course_schedule_review
+        select *
+        from course_schedule_review
         where id_ = #{id,jdbcType=INTEGER}
     </select>
 
@@ -153,11 +154,13 @@
         <result column="update_time_" property="updateTime"/>
         <result column="has_liaison_" property="hasLiaison"/>
         <result column="student_id_" property="studentId"/>
+        <result column="home_work_replied_" property="homeWorkReplied"/>
     </resultMap>
 
     <sql id="practiceGroupReviewsQueryCondition">
         <where>
-            AND pg.id_ > 0 AND cs.group_type_='PRACTICE' AND cs.status_='OVER' AND (cs.del_flag_ = 0 OR cs.del_flag_ IS NULL)
+            AND pg.id_ > 0 AND cs.group_type_='PRACTICE' AND cs.status_='OVER' AND (cs.del_flag_ = 0 OR cs.del_flag_ IS
+            NULL)
             <if test="search!=null and search!=''">
                 AND (cs.name_ LIKE CONCAT('%',#{search},'%') OR cs.id_= #{search})
             </if>
@@ -219,12 +222,18 @@
         edu_teacher_name_,pg.buy_months_,csr.id_ review_id_, csc.score_
         student_review_,csr.hand_homework_,csr.course_review_,pg.student_id_,csr.teaching_material_,csr.pronunciation_,csr.tempo_,
         csr.music_theory_,csr.song_,csr.memo_,csr.create_time_,csr.has_liaison_,csr.create_time_,csr.update_time_
+        <if test='isExport !=null and isExport=="1"'>
+            ,sch.is_replied_ home_work_replied_
+        </if>
         FROM course_schedule cs
         LEFT JOIN practice_group pg ON cs.music_group_id_ = pg.id_
         LEFT JOIN sys_user su ON cs.actual_teacher_id_ = su.id_
         LEFT JOIN sys_user edsu ON pg.educational_teacher_id_ = edsu.id_
         LEFT JOIN course_schedule_review csr on cs.id_ = csr.course_schedule_id_
         LEFT JOIN course_schedule_complaints csc on csc.course_schedule_id_ = cs.id_
+        <if test='isExport !=null and isExport=="1"'>
+            LEFT JOIN student_course_homework sch on cs.id_ = sch.course_schedule_id_
+        </if>
         <include refid="practiceGroupReviewsQueryCondition"/>
         ORDER BY cs.class_date_ DESC
         <include refid="global.limit"/>
@@ -339,7 +348,9 @@
     </select>
 
     <select id="findStudentByClassGroupId" resultMap="com.ym.mec.biz.dal.dao.TeacherDao.SysUser">
-        SELECT su.id_, su.username_,su.avatar_ FROM  class_group_student_mapper cgsm
-        LEFT JOIN sys_user su on cgsm.user_id_ = su.id_ WHERE cgsm.class_group_id_ = #{classGroupId}
+        SELECT su.id_, su.username_, su.avatar_
+        FROM class_group_student_mapper cgsm
+                 LEFT JOIN sys_user su on cgsm.user_id_ = su.id_
+        WHERE cgsm.class_group_id_ = #{classGroupId}
     </select>
 </mapper>

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

@@ -343,7 +343,8 @@
         SELECT pg.id_                   music_group_id_,
                pg.user_id_              teacher_id_,
                cg.id_                   class_group_id_,
-               pg.single_class_minutes_ total_minutes_
+               pg.single_class_minutes_ total_minutes_,
+               pg.subject_id_
         FROM practice_group pg
                  LEFT JOIN class_group cg on pg.id_ = cg.music_group_id_ AND cg.group_type_ = 'PRACTICE'
          WHERE pg.group_status_ = 'NORMAL' AND cg.group_type_ = 'PRACTICE'

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

@@ -12,6 +12,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -38,4 +39,14 @@ public class CourseReviewController extends BaseController {
         return succeed(courseReviewService.getReviewInfo(id));
     }
 
+    @ApiOperation(value = "获取老师评价和学生评价")
+    @GetMapping("getStuAndTeaReviewInfo")
+    public HttpResponseResult getStuAndTeaReviewInfo(Long courseScheduleId) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        return succeed(courseReviewService.getStuAndTeaReviewInfo(courseScheduleId,sysUser.getId()));
+    }
+
 }

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherCourseScheduleController.java

@@ -235,6 +235,11 @@ public class TeacherCourseScheduleController extends BaseController {
 			throw new BizException("调整失败，未开始的课程才能调整");
 		}
 		
+		endDateStr = DateUtil.format(courseSchedule.getClassDate(), "yyyy-MM-dd") + " " + DateUtil.format(courseSchedule.getStartClassTime(), "HH:mm:ss");
+		if (DateUtil.stringToDate(endDateStr, sdf).before(date)) {
+			throw new BizException("调整失败，只能调整到未来的时间");
+		}
+		
         if(Objects.isNull(courseSchedule.getClassGroupId())){
             courseSchedule.setClassGroupId(oldCourseSchedule.getClassGroupId());
         }

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

@@ -85,14 +85,14 @@ public class ExportController extends BaseController {
         List<ExportTeacherSalaryDto> rows = courseScheduleTeacherSalaryService.exportTeacherSalary(queryInfo);
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"课时编号", "老师编号", "老师姓名", "老师分部", "工作类别",
-                    "课程分部","课程组编号", "课程班名称", "乐团模式", "vip活动名称", "阶梯奖励名称","线上课/线下课", "线上课单价", "线下课单价",
+                    "课程分部", "课程组编号", "课程班名称", "乐团模式", "vip活动名称", "阶梯奖励名称", "线上课/线下课", "线上课单价", "线下课单价",
                     "课程类别", "课时时长", "实际上课时长", "上课日期",
                     "上课时间", "教师签到状态", "教师签退状态", "教师签到时间", "教师签退时间",
-                    "主辅", "上课地点", "应到学员", "学员签到时间", "学员签退时间","课时课酬","阶梯奖励"}, new String[]{
+                    "主辅", "上课地点", "应到学员", "学员签到时间", "学员签退时间", "课时课酬", "阶梯奖励"}, new String[]{
                     "courseScheduleId", "teacherId", "teacherName", "teacherOrganName", "jobType",
-                    "courseScheduleOrganName", "groupId", "groupName", "changeType", "vipActiveName","activeName", "teachMode", "onlineClassesUnitPrice", "offlineClassesUnitPrice",
-                    "courseScheduleType","signCourseScheduleTime","currentTime","classDate","courseScheduleStartTime","signInStatus",
-                    "signOutStatus","signInTime","signOutTime","teacherRole","address","studentNum","studentSignInTime","studentSignOutTime","price","rewards"}, rows);
+                    "courseScheduleOrganName", "groupId", "groupName", "changeType", "vipActiveName", "activeName", "teachMode", "onlineClassesUnitPrice", "offlineClassesUnitPrice",
+                    "courseScheduleType", "signCourseScheduleTime", "currentTime", "classDate", "courseScheduleStartTime", "signInStatus",
+                    "signOutStatus", "signInTime", "signOutTime", "teacherRole", "address", "studentNum", "studentSignInTime", "studentSignOutTime", "price", "rewards"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
             response.flushBuffer();
@@ -113,15 +113,15 @@ public class ExportController extends BaseController {
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
-        if(!sysUser.getIsSuperAdmin()){
+        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
-            }else if(StringUtils.isEmpty(employee.getOrganIdList())){
+            } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
                 throw new BizException("用户所在分部异常");
-            }else {
+            } else {
                 List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-                if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+                if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
                     throw new BizException("非法请求");
                 }
             }
@@ -130,11 +130,11 @@ 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",
-                    "subjectName","musicGroupStatus","vipGroupName","vipGroupStatus"}, rows);
+                    "isActive.msg", "hasCourse.msg", "isMake.msg", "hasPracticeCourse.msg", "courseBalance", "musicGroupName",
+                    "subjectName", "musicGroupStatus", "vipGroupName", "vipGroupStatus"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
             response.flushBuffer();
@@ -149,37 +149,37 @@ public class ExportController extends BaseController {
     @ApiOperation(value = "导出陪练课列表")
     @GetMapping("export/practiceGroupList")
     @PreAuthorize("@pcs.hasPermissions('export/practiceGroupList')")
-    public void queryAll(HttpServletResponse response,PracticeGroupQueryInfo queryInfo) {
+    public void queryAll(HttpServletResponse response, PracticeGroupQueryInfo queryInfo) {
         queryInfo.setIsExport(true);
         queryInfo.setRows(999999999);
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
-        if(!sysUser.getIsSuperAdmin()){
+        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
-            }else if(StringUtils.isEmpty(employee.getOrganIdList())){
+            } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
                 throw new BizException("用户所在分部异常");
-            }else {
+            } else {
                 List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-                if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+                if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
                     throw new BizException("非法请求");
                 }
             }
         }
         List<PracticeGroupDto> rows = practiceGroupService.findPracticeGroups(queryInfo).getRows();
-        if(rows != null && rows.size() > 0){
-            rows.forEach(e->{
-                e.setSubClassTimes(e.getTotalClassTimes()==null?0:e.getTotalClassTimes() - (e.getCurrentClassTimes()==null?0:e.getCurrentClassTimes()));
+        if (rows != null && rows.size() > 0) {
+            rows.forEach(e -> {
+                e.setSubClassTimes(e.getTotalClassTimes() == null ? 0 : e.getTotalClassTimes() - (e.getCurrentClassTimes() == null ? 0 : e.getCurrentClassTimes()));
             });
         }
         try {
-            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部","网管课编号", "课程名称", "指导老师", "教务老师", "班级人数", "先上课单价", "线下课单价",
-                    "当前课次", "总课次", "剩余课次","开课时间", "结束时间"}, new String[]{
-                    "organName","id", "name", "teacherName", "educationalTeacherName", "studentNum", "onlineClassesUnitPrice",
-                    "offlineClassesUnitPrice", "currentClassTimes", "totalClassTimes", "subClassTimes","coursesStartDate", "coursesExpireDate"}, rows);
+            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "网管课编号", "课程名称", "指导老师", "教务老师", "班级人数", "先上课单价", "线下课单价",
+                    "当前课次", "总课次", "剩余课次", "开课时间", "结束时间"}, new String[]{
+                    "organName", "id", "name", "teacherName", "educationalTeacherName", "studentNum", "onlineClassesUnitPrice",
+                    "offlineClassesUnitPrice", "currentClassTimes", "totalClassTimes", "subClassTimes", "coursesStartDate", "coursesExpireDate"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
             response.flushBuffer();
@@ -193,30 +193,30 @@ public class ExportController extends BaseController {
     @ApiOperation(value = "导出VIP课管理")
     @GetMapping("export/vipGroupList")
     @PreAuthorize("@pcs.hasPermissions('export/vipGroupList')")
-    public void queryAll(HttpServletResponse response,VipGroupQueryInfo queryInfo) {
+    public void queryAll(HttpServletResponse response, VipGroupQueryInfo queryInfo) {
         queryInfo.setRows(999999999);
         queryInfo.setIsExport(true);
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
-        if(!sysUser.getIsSuperAdmin()){
+        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
-            }else if(StringUtils.isEmpty(employee.getOrganIdList())){
+            } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
                 throw new BizException("用户所在分部异常");
-            }else {
+            } else {
                 List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-                if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+                if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
                     throw new BizException("非法请求");
                 }
             }
         }
         List<VipGroup> rows = vipGroupService.findVipGroups(queryInfo).getRows();
-        if(rows != null && rows.size() > 0){
-            rows.forEach(e->{
-                e.setSubClassTimes(e.getTotalClassTimes()==null?0:e.getTotalClassTimes() - (e.getCurrentClassTimes()==null?0:e.getCurrentClassTimes()));
+        if (rows != null && rows.size() > 0) {
+            rows.forEach(e -> {
+                e.setSubClassTimes(e.getTotalClassTimes() == null ? 0 : e.getTotalClassTimes() - (e.getCurrentClassTimes() == null ? 0 : e.getCurrentClassTimes()));
             });
         }
         try {
@@ -238,22 +238,22 @@ public class ExportController extends BaseController {
     @ApiOperation(value = "终课表列表导出")
     @GetMapping("export/superFindCourseSchedules")
     @PreAuthorize("@pcs.hasPermissions('export/superFindCourseSchedules')")
-    public void superFindCourseSchedules(EndCourseScheduleQueryInfo queryInfo,HttpServletResponse response){
+    public void superFindCourseSchedules(EndCourseScheduleQueryInfo queryInfo, HttpServletResponse response) {
         queryInfo.setRows(999999999);
         queryInfo.setIsExport(true);
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
-        if(!sysUser.getIsSuperAdmin()){
+        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (org.apache.commons.lang3.StringUtils.isEmpty(queryInfo.getOrganIdList())) {
                 queryInfo.setOrganIdList(employee.getOrganIdList());
-            }else if(org.apache.commons.lang3.StringUtils.isEmpty(employee.getOrganIdList())){
+            } else if (org.apache.commons.lang3.StringUtils.isEmpty(employee.getOrganIdList())) {
                 throw new BizException("用户所在分部异常");
-            }else {
+            } else {
                 List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-                if(!list.containsAll(Arrays.asList(queryInfo.getOrganIdList().split(",")))){
+                if (!list.containsAll(Arrays.asList(queryInfo.getOrganIdList().split(",")))) {
                     throw new BizException("非法请求");
                 }
             }
@@ -261,10 +261,10 @@ public class ExportController extends BaseController {
         List<CourseScheduleEndDto> rows = scheduleService.endFindCourseSchedules(queryInfo).getRows();
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部名称", "课程编号", "开始时间", "结束时间", "班级名称", "班级声部", "课程名称", "课程类型", "教学模式",
-                    "教学点", "课程状态", "是否点名", "指导老师", "学员编号", "签到时间", "签退时间","签到备注"}, new String[]{
-                    "organName", "id", "startClassTime", "endClassTime", "classGroupName","subjectName", "name",
+                    "教学点", "课程状态", "是否点名", "指导老师", "学员编号", "签到时间", "签退时间", "签到备注"}, new String[]{
+                    "organName", "id", "startClassTime", "endClassTime", "classGroupName", "subjectName", "name",
                     "groupType.desc", "teachMode.msg", "schoolName", "status.msg", "isCallNames.msg", "teacherName", "studentId", "signInTime",
-                    "signOutTime","remark"}, rows);
+                    "signOutTime", "remark"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
             response.flushBuffer();
@@ -279,30 +279,30 @@ public class ExportController extends BaseController {
     @ApiOperation(value = "导出零星收费列表")
     @GetMapping("export/sporadicChargeInfo")
     @PreAuthorize("@pcs.hasPermissions('export/sporadicChargeInfo')")
-    public void queryPage(SporadicChargeInfoQueryInfo queryInfo,HttpServletResponse response) {
+    public void queryPage(SporadicChargeInfoQueryInfo queryInfo, HttpServletResponse response) {
         queryInfo.setRows(999999999);
         queryInfo.setIsExport(true);
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
-        if(!sysUser.getIsSuperAdmin()){
+        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
-            }else if(StringUtils.isEmpty(employee.getOrganIdList())){
+            } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
                 throw new BizException("用户所在分部异常");
-            }else {
+            } else {
                 List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-                if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+                if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
                     throw new BizException("非法请求");
                 }
             }
         }
         List<SporadicChargeInfo> rows = sporadicChargeInfoService.queryDetailPage(queryInfo).getRows();
         try {
-            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "收费类型", "标题", "金额", "时间", "学生姓名","创建人"}, new String[]{
-                    "organName", "chargeType.msg", "title", "amount", "updateTime", "userName","operatorName"}, rows);
+            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "收费类型", "标题", "金额", "时间", "学生姓名", "创建人"}, new String[]{
+                    "organName", "chargeType.msg", "title", "amount", "updateTime", "userName", "operatorName"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
             response.flushBuffer();
@@ -346,7 +346,7 @@ public class ExportController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('order/musicalListExport')")
     public void musicalListExport(HttpServletResponse response, String musicGroupId) {
         List<Goods> musicalList = studentPaymentOrderDetailService.getMusicalList(musicGroupId);
-        if(musicalList.size() > 50000){
+        if (musicalList.size() > 50000) {
             throw new BizException("数据集太大，不能导出.最大数据集不能超过50000");
         }
         try {
@@ -367,7 +367,7 @@ public class ExportController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('order/musicalListDetailExport')")
     public void musicalListDetailExport(HttpServletResponse response, String musicGroupId) {
         List<musicalListDetailDto> musicalList = studentPaymentOrderDetailService.getMusicalListDetail(musicGroupId);
-        if(musicalList.size() > 50000){
+        if (musicalList.size() > 50000) {
             throw new BizException("数据集太大，不能导出.最大数据集不能超过50000");
         }
         try {
@@ -428,9 +428,9 @@ public class ExportController extends BaseController {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
-            if(StringUtils.isEmpty(queryInfo.getOrganId()) && queryInfo.getOrderType().equals("3")){
+            if (StringUtils.isEmpty(queryInfo.getOrganId()) && queryInfo.getOrderType().equals("3")) {
                 queryInfo.setRoutingOrganId(employee.getOrganIdList());
-            }else if (StringUtils.isEmpty(queryInfo.getOrganId())) {
+            } else if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
             }
         }
@@ -439,7 +439,7 @@ public class ExportController extends BaseController {
         Map<String, Object> params = new HashMap<String, Object>();
         MapUtil.populateMap(params, queryInfo);
         List<StudentPaymentOrderExportDto> studentPaymentOrderExportDtos = studentPaymentOrderService.ExportQueryPage(params);
-        if(studentPaymentOrderExportDtos.size() > 50000){
+        if (studentPaymentOrderExportDtos.size() > 50000) {
             throw new BizException("数据集太大，不能导出.最大数据集不能超过50000");
         }
 
@@ -465,9 +465,9 @@ public class ExportController extends BaseController {
             if (row.getOrderDetailList() != null) {
                 for (StudentPaymentOrderDetail orderDetail : row.getOrderDetailList()) {
                     if (orderDetail.getType().equals(OrderDetailTypeEnum.MUSICAL)) {
-                        if(orderDetail.getKitGroupPurchaseType() != null && orderDetail.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.LEASE)){
+                        if (orderDetail.getKitGroupPurchaseType() != null && orderDetail.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.LEASE)) {
                             leaseFee = orderDetail.getPrice();
-                        }else {
+                        } else {
                             musicalFee = orderDetail.getPrice();
                         }
                     } else if (orderDetail.getType().equals(OrderDetailTypeEnum.COURSE)) {
@@ -477,7 +477,7 @@ public class ExportController extends BaseController {
                     }
                 }
             }
-            if(row.getGoodsList() != null){
+            if (row.getGoodsList() != null) {
                 goodsName = row.getGoodsList().stream().map(Goods::getName).collect(Collectors.joining("|"));
             }
             row.setCourseFee(courseFee);
@@ -514,24 +514,24 @@ public class ExportController extends BaseController {
                         row.setSporadicType("乐器更换");
                     } else if (row.getChargeType().equals(4)) {
                         row.setSporadicType("配件销售");
-                    }else if (row.getChargeType().equals(5)) {
+                    } else if (row.getChargeType().equals(5)) {
                         row.setSporadicType("维修费");
-                    }else if (row.getChargeType().equals(6)) {
+                    } else if (row.getChargeType().equals(6)) {
                         row.setSporadicType("福袋活动");
-                    }else if (row.getChargeType().equals(7)) {
+                    } else if (row.getChargeType().equals(7)) {
                         row.setSporadicType("上门费");
-                    }else if (row.getChargeType().equals(9)) {
+                    } else if (row.getChargeType().equals(9)) {
                         row.setSporadicType("账户充值");
                     }
                 }
                 School userSchool = musicGroupDao.findUserSchool(row.getUserId());
-                if(userSchool!= null){
+                if (userSchool != null) {
                     row.setSchoolName(userSchool.getName());
                 }
-            }else if (row.getGroupType().equals(GroupType.PRACTICE)) {
+            } else if (row.getGroupType().equals(GroupType.PRACTICE)) {
                 row.setCourseFee(row.getActualAmount());
                 School userSchool = musicGroupDao.findUserSchool(row.getUserId());
-                if(userSchool!= null){
+                if (userSchool != null) {
                     row.setSchoolName(userSchool.getName());
                 }
                 PracticeCourseDto practiceGroup = practiceGroupDao.findByGroupId(Integer.parseInt(row.getMusicGroupId()));
@@ -555,9 +555,9 @@ public class ExportController extends BaseController {
 
         try {
             String[] header = {"序号", "学生姓名", "交易流水号", "订单编号", "收款渠道", "收款账户", "支付金额", "到账时间",
-                    "关联乐团ID/VIP课ID", "课程形态", "课程费用","减免费用","押金", "乐器", "教辅费用", "零星收款费用", "零星收款类别", "手续费", "专业", "分部", "单位/学校","合作机构","备注"};
+                    "关联乐团ID/VIP课ID", "课程形态", "课程费用", "减免费用", "押金", "乐器", "教辅费用", "零星收款费用", "零星收款类别", "手续费", "专业", "分部", "单位/学校", "合作机构", "备注"};
             String[] body = {"id", "user.username", "transNo", "orderNo", "paymentChannel", "merNos", "actualAmount", "payTime", "musicGroupId",
-                    "groupType.desc", "courseFee","remitFee", "leaseFee", "musicalFee", "teachingFee", "sporadicAmount", "sporadicType", "transferFee", "subjectName", "organName", "schoolName","cooperationOrganName", "memo"};
+                    "groupType.desc", "courseFee", "remitFee", "leaseFee", "musicalFee", "teachingFee", "sporadicAmount", "sporadicType", "transferFee", "subjectName", "organName", "schoolName", "cooperationOrganName", "memo"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, studentPaymentOrderExportDtos);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
@@ -638,9 +638,10 @@ public class ExportController extends BaseController {
             Employee employee = employeeDao.get(sysUser.getId());
             queryInfo.setOrganId(employee.getOrganIdList());
         }
+        queryInfo.setIsExport(1);
         queryInfo.setRows(99999);
         PageInfo<CourseReviewDto> practiceGroupReviews = courseReviewService.findPracticeGroupReviews(queryInfo);
-        if(practiceGroupReviews.getTotal() <= 0){
+        if (practiceGroupReviews.getTotal() <= 0) {
             response.setStatus(500);
             response.setContentType("Content-Type: application/json;charset=UTF-8");
             response.getOutputStream().write("{\"data\": null, \"code\": 500, \"status\": false, \"msg\": \"没有可导出的记录\"}".getBytes());
@@ -663,20 +664,26 @@ public class ExportController extends BaseController {
                 if (row.getCreateTime() != null) {
                     row.setCreateTimeStr(DateUtil.dateToString(row.getCreateTime(), "yyyy-MM-dd"));
                 }
-                if(row.getPronunciation() != null){
-                    row.setPronunciationStr(row.getPronunciation()+"星");
+                if (row.getPronunciation() != null) {
+                    row.setPronunciationStr(row.getPronunciation() + "星");
                 }
-                if(row.getTempo() != null){
-                    row.setTempoStr(row.getTempo()+"星");
+                if (row.getTempo() != null) {
+                    row.setTempoStr(row.getTempo() + "星");
                 }
-                if(row.getMusicTheory() != null){
-                    row.setMusicTheoryStr(row.getMusicTheory()+"星");
+                if (row.getMusicTheory() != null) {
+                    row.setMusicTheoryStr(row.getMusicTheory() + "星");
+                }
+                if (row.getHomeWorkReplied() != null && row.getHomeWorkReplied().equals("1")) {
+                    row.setHomeWorkReplied("已回复");
+                } else if (row.getHandHomework() != null && row.getHandHomework() > 0) {
+                    row.setHomeWorkReplied("未回复");
+                }else {
+                    row.setHomeWorkReplied(null);
                 }
-
             }
 
-            String[] header = {"分部", "上课日期", "学生编号", "课程班名称", "老师", "教材内容", "发音", "节奏", "乐理", "曲目", "评价备注", "回访日期（布置作业）", "完成app双向沟通", "是否提交作业", "教务老师", "教务评价"};
-            String[] body = {"organName", "classDateStr", "studentId", "courseName", "teacherName", "teachingMaterial", "pronunciationStr", "tempoStr", "musicTheoryStr", "song", "memo", "createTimeStr", "hasLiaison", "handHomeworkStr", "eduTeacherName", "courseReview"};
+            String[] header = {"分部", "上课日期", "学生编号","课程编号", "课程班名称", "老师", "教材内容", "发音", "节奏", "乐理", "曲目", "评价备注", "回访日期（布置作业）", "完成app双向沟通", "是否提交作业","是否回复作业", "教务老师", "教务评价"};
+            String[] body = {"organName", "classDateStr", "studentId","id", "courseName", "teacherName", "teachingMaterial", "pronunciationStr", "tempoStr", "musicTheoryStr", "song", "memo", "createTimeStr", "hasLiaison", "handHomeworkStr","homeWorkReplied", "eduTeacherName", "courseReview"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, practiceGroupReviews.getRows());
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");

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

@@ -90,6 +90,7 @@ public class TaskController extends BaseController {
 	// 更新课程状态至已结束
 	public void updateCourseScheduleToOverStatus() {
 		courseScheduleService.updateCourseScheduleToOverStatus();
+		courseScheduleService.updateCourseScheduleToUnderway();
 	}
 
 	@GetMapping("/updateVipGroupToFinishedStatus")