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

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

@@ -20,16 +20,14 @@ import java.util.Objects;
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class CourseSchedule {
 
-	private SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
-	private SimpleDateFormat simpleDateFormat1=new SimpleDateFormat("yyyy-MM-dd HH:mm");
+	private SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+	private SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 
 	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("TRAINING", "集训课"),CLASSROOM("CLASSROOM", "课堂课");
+		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(
+				"CLASSROOM", "课堂课");
 
 		private String code;
 
@@ -103,7 +101,7 @@ public class CourseSchedule {
 	private TeachModeEnum teachMode;
 
 	private CourseScheduleType type;
-	
+
 	private String name;
 
 	@ApiModelProperty(value = "实际上课人数")
@@ -111,7 +109,7 @@ public class CourseSchedule {
 
 	@ApiModelProperty(value = "请假人数")
 	private Integer leaveStudentNum;
-	
+
 	private Integer schoolId;
 
 	/** 主教是否不需要重新生成课酬 */
@@ -138,10 +136,10 @@ public class CourseSchedule {
 	}
 
 	public void setStartClassTimeStr(String startClassTimeStr) throws ParseException {
-		if(Objects.nonNull(this.classDate)&&!StringUtils.isBlank(startClassTimeStr)){
+		if (Objects.nonNull(this.classDate) && !StringUtils.isBlank(startClassTimeStr)) {
 			String startTime = simpleDateFormat.format(this.classDate);
-			startTime=startTime+" "+startClassTimeStr;
-			this.startClassTime=simpleDateFormat1.parse(startTime);
+			startTime = startTime + " " + startClassTimeStr;
+			this.startClassTime = simpleDateFormat1.parse(startTime);
 		}
 		this.startClassTimeStr = startClassTimeStr;
 	}
@@ -151,10 +149,10 @@ public class CourseSchedule {
 	}
 
 	public void setEndClassTimeStr(String endClassTimeStr) throws ParseException {
-		if(Objects.nonNull(this.classDate)&&!StringUtils.isBlank(endClassTimeStr)){
+		if (Objects.nonNull(this.classDate) && !StringUtils.isBlank(endClassTimeStr)) {
 			String endTime = simpleDateFormat.format(this.classDate);
-			endTime=endTime+" "+endClassTimeStr;
-			this.endClassTime=simpleDateFormat1.parse(endTime);
+			endTime = endTime + " " + endClassTimeStr;
+			this.endClassTime = simpleDateFormat1.parse(endTime);
 		}
 		this.endClassTimeStr = endClassTimeStr;
 	}
@@ -207,23 +205,23 @@ public class CourseSchedule {
 		return this.subsidy;
 	}
 
-	public void setClassDate(java.util.Date classDate){
-		if(StringUtils.isNotEmpty(startClassTimeStr)){
+	public void setClassDate(java.util.Date classDate) {
+		if (StringUtils.isNotEmpty(startClassTimeStr)) {
 			String startTime = simpleDateFormat.format(classDate);
-			startTime=startTime+" "+startClassTimeStr;
+			startTime = startTime + " " + startClassTimeStr;
 			try {
-				this.startClassTime=simpleDateFormat1.parse(startTime);
+				this.startClassTime = simpleDateFormat1.parse(startTime);
 			} catch (ParseException e) {
-				this.startClassTime=null;
+				this.startClassTime = null;
 			}
 		}
-		if(StringUtils.isNotEmpty(endClassTimeStr)){
+		if (StringUtils.isNotEmpty(endClassTimeStr)) {
 			String endTime = simpleDateFormat.format(classDate);
-			endTime=endTime+" "+endClassTimeStr;
+			endTime = endTime + " " + endClassTimeStr;
 			try {
-				this.endClassTime=simpleDateFormat1.parse(endTime);
+				this.endClassTime = simpleDateFormat1.parse(endTime);
 			} catch (ParseException e) {
-				this.endClassTime=null;
+				this.endClassTime = null;
 			}
 		}
 		this.classDate = classDate;