Merge remote-tracking branch 'origin/master'

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

@@ -2,6 +2,8 @@ package com.ym.mec.biz.dal.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 
+import java.util.Date;
+
 /**
  * @Author Joburgess
  * @Date 2019/12/23
@@ -16,6 +18,17 @@ public class StudentRecoverDto extends CourseGenerateDto{
     @ApiModelProperty(value = "教师编号")
     private Integer teacherId;
 
+    @ApiModelProperty(value = "课程截至时间")
+    private Date expireDate;
+
+    public Date getExpireDate() {
+        return expireDate;
+    }
+
+    public void setExpireDate(Date expireDate) {
+        this.expireDate = expireDate;
+    }
+
     public Integer getTeacherId() {
         return teacherId;
     }

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

@@ -18,7 +18,7 @@ public interface DegreeRegistrationService extends BaseService<Integer, DegreeRe
 
     Set<String> FREE_PRICE_LEVEL = new HashSet<>(Arrays.asList(new String[]{"一级", "二级", "三级"}));
 
-    Date ACTIVITY_END_TIME = DateUtil.stringToDate("2020-12-31 23:59:59", "yyyy-MM-dd HH:mm:ss");
+    Date ACTIVITY_END_TIME = DateUtil.stringToDate("2021-01-31 23:59:59", "yyyy-MM-dd HH:mm:ss");
 
     HttpResponseResult pay(DegreeRegistrationActivityDto degreeRegistration) throws Exception;
 

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

@@ -295,11 +295,13 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 						}
 					}
 					courseHomework.setExpectNum(studentCourseHomeworks.size());
-					courseHomeworkService.update(courseHomework);
+					if(!CollectionUtils.isEmpty(studentCourseHomeworks)){
+						courseHomeworkService.update(courseHomework);
 
-					studentCourseHomeworkDao.batchInsertStudentCourseHomeworkRecord(studentCourseHomeworks);
-					List<Integer> studentIds = studentCourseHomeworks.stream().map(StudentCourseHomework::getUserId).collect(Collectors.toList());
-					studentServeService.updateExercisesSituation(courseSchedule.getClassDate(), studentIds, teacherAttendance.getTeacherId());
+						studentCourseHomeworkDao.batchInsertStudentCourseHomeworkRecord(studentCourseHomeworks);
+						List<Integer> studentIds = studentCourseHomeworks.stream().map(StudentCourseHomework::getUserId).collect(Collectors.toList());
+						studentServeService.updateExercisesSituation(courseSchedule.getClassDate(), studentIds, teacherAttendance.getTeacherId());
+					}
 				}else{
 					courseHomework.setContent(teacherSignOutDto.getCourseHomeworkInfo().getContent());
 					courseHomework.setAttachments(teacherSignOutDto.getCourseHomeworkInfo().getAttachments());

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

@@ -1936,7 +1936,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         }
         pauseInfos.put("teaChModeSequence", teachModeSequence);
         pauseInfos.put("coursePriceInfo",coursePrices);
-//        pauseInfos.put("days", days);
+        pauseInfos.put("days", days);
 
         StudentPauseInfo  studentPauseInfo=new StudentPauseInfo();
 		studentPauseInfo.setUserId(studentId);
@@ -2074,12 +2074,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			}
 
 			if(courseInfo1.containsKey("days")){
-				int surplusDays = Integer.valueOf(courseInfo1.get("days").toString());
-				LocalDate nowDate = LocalDate.now();
 				CourseSchedule courseSchedule = newCourseSchedules.stream().max(Comparator.comparing(CourseSchedule::getClassDate)).get();
-				int days = (int) nowDate.until(LocalDateTime.ofInstant(courseSchedule.getClassDate().toInstant(), DateUtil.zoneId), ChronoUnit.DAYS);
-				if(days>surplusDays){
-					throw new BizException("您必须在{}天内完成剩余课程", surplusDays);
+				if(courseSchedule.getEndClassTime().compareTo(studentRecoverInfo.getExpireDate())>0&&!DateUtil.isSameDay(courseSchedule.getEndClassTime(), studentRecoverInfo.getExpireDate())){
+					throw new BizException("排课时间不可超过{}", DateUtil.dateToString(studentRecoverInfo.getExpireDate(), "yyyy年MM月dd日"));
 				}
 			}
 

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

@@ -86,7 +86,7 @@ public class DegreeController extends BaseController {
             degreeRegistration.setOrganId(user.getOrganId());
         }
 
-        if(Objects.isNull(degreeRegistration.getOrganId())){
+        if(Objects.isNull(degreeRegistration.getOrganId()) || degreeRegistration.getOrganId() != 40){
             return failed("该分部暂未参与此活动");
         }
 
@@ -111,7 +111,7 @@ public class DegreeController extends BaseController {
             degreeRegistration.setOrganId(user.getOrganId());
         }
 
-        if(Objects.isNull(degreeRegistration.getOrganId())){
+        if(Objects.isNull(degreeRegistration.getOrganId()) || degreeRegistration.getOrganId() != 40){
             return failed("该分部暂未参与此活动");
         }