Merge remote-tracking branch 'origin/master'

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

@@ -1,15 +1,16 @@
 package com.ym.mec.biz.dal.entity;
 
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
 import com.ym.mec.biz.dal.entity.CooperationOrgan.OwnershipType;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.FeeType;
 import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
 import com.ym.mec.biz.dal.enums.SalarySettlementTypeEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-import java.util.Date;
 
 /**
  * 对应数据库表(music_group):
@@ -89,10 +90,10 @@ public class MusicGroup {
 	private java.util.Date paymentExpireDate;
 
 	@ApiModelProperty(value = "缴费有效期开始时间", required = false)
-	private String paymentValidStartDate;
+	private Date paymentValidStartDate;
 
 	@ApiModelProperty(value = "缴费有效期结束时间", required = false)
-	private String paymentValidEndDate;
+	private Date paymentValidEndDate;
 
 	@ApiModelProperty(value = "缴费方式0按月,1按季，2一次性", required = false)
 	private Integer paymentPattern;
@@ -174,24 +175,20 @@ public class MusicGroup {
 		this.paymentPattern = paymentPattern;
 	}
 
-	public String getPaymentValidStartDate() {
+	public Date getPaymentValidStartDate() {
 		return paymentValidStartDate;
 	}
 
-	public void setPaymentValidStartDate(String paymentValidStartDate) {
+	public void setPaymentValidStartDate(Date paymentValidStartDate) {
 		this.paymentValidStartDate = paymentValidStartDate;
 	}
 
-	public String getPaymentValidEndDate() {
+	public Date getPaymentValidEndDate() {
 		return paymentValidEndDate;
 	}
 
-	public void setPaymentValidEndDate(String paymentValidEndDate) {
-		if(StringUtils.isEmpty(paymentValidEndDate)){
-			this.paymentValidEndDate = null;
-		}else {
-			this.paymentValidEndDate = paymentValidEndDate;
-		}
+	public void setPaymentValidEndDate(Date paymentValidEndDate) {
+		this.paymentValidEndDate = paymentValidEndDate;
 	}
 
 	public String getSubjectName() {

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

@@ -144,11 +144,12 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
             List<Integer> stuEducation = studentRepairDao.countStuEducation(studentId);
             if (stuEducation != null && stuEducation.size() == 1) {
                 //获取学员乐团关联的教务
-                MusicGroup musicGroup = musicGroupDao.getStuMusic(studentId);
                 studentGoodsSell.setTeacherId(stuEducation.get(0));
-                if (musicGroup != null) {
-                    studentGoodsSell.setCooperationOrganId(musicGroup.getCooperationOrganId());
-                }
+            }
+            //获取学员乐团关联的教务
+            MusicGroup musicGroup = musicGroupDao.getStuMusic(studentId);
+            if (musicGroup != null) {
+                studentGoodsSell.setCooperationOrganId(musicGroup.getCooperationOrganId());
             }
         } else if (studentGoodsSell.getCooperationOrganId() == null) {
             //获取教务老师，学员关联的乐团

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

@@ -218,22 +218,25 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			}else{
 				teacherAttendanceDao.insert(teacherAttendance);
 			}
+
 			//新增课堂作业
 			CourseHomework courseHomework=teacherSignOutDto.getCourseHomeworkInfo();
-			courseHomework.setCourseScheduleId(teacherAttendance.getCourseScheduleId());
-			courseHomework.setMusicGroupId(currentCourseDetail.getMusicGroupId());
-			courseHomework.setGroupType(teacherAttendance.getGroupType());
-			courseHomework.setClassGroupId(currentCourseDetail.getClassId().intValue());
-			courseHomework.setExpiryDate(DateUtil.addDays(date,7));
-			courseHomework.setExpectNum(courseScheduleDao.countCourseStudentNum(teacherAttendance.getCourseScheduleId()));
-			courseHomeworkService.insert(courseHomework);
-			List<StudentCourseHomework> studentCourseHomeworks = studentCourseHomeworkDao
-					.constructInitialStudentHomeworkRecordsWithPayment(teacherAttendance.getCourseScheduleId(),
-							courseHomework.getId());
-			if(CollectionUtils.isEmpty(studentCourseHomeworks)){
-				throw new BizException("此课程没有学生");
+			if(Objects.nonNull(courseHomework)&&StringUtils.isNotBlank(courseHomework.getContent())){
+				courseHomework.setCourseScheduleId(teacherAttendance.getCourseScheduleId());
+				courseHomework.setMusicGroupId(currentCourseDetail.getMusicGroupId());
+				courseHomework.setGroupType(teacherAttendance.getGroupType());
+				courseHomework.setClassGroupId(currentCourseDetail.getClassId().intValue());
+				courseHomework.setExpiryDate(DateUtil.addDays(date,7));
+				courseHomework.setExpectNum(courseScheduleDao.countCourseStudentNum(teacherAttendance.getCourseScheduleId()));
+				courseHomeworkService.insert(courseHomework);
+				List<StudentCourseHomework> studentCourseHomeworks = studentCourseHomeworkDao
+						.constructInitialStudentHomeworkRecordsWithPayment(teacherAttendance.getCourseScheduleId(),
+								courseHomework.getId());
+				if(CollectionUtils.isEmpty(studentCourseHomeworks)){
+					throw new BizException("此课程没有学生");
+				}
+				studentCourseHomeworkDao.batchInsertStudentCourseHomeworkRecord(studentCourseHomeworks);
 			}
-			studentCourseHomeworkDao.batchInsertStudentCourseHomeworkRecord(studentCourseHomeworks);
 			return result;
 		}