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

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

@@ -27,6 +27,9 @@ public class StudentManageCourseListDto {
 
     @ApiModelProperty(value = "上课日期",required = false)
     private Date courseDate;
+    
+    @ApiModelProperty(value = "下课日期",required = false)
+    private Date courseEndDate;
 
     @ApiModelProperty(value = "课程状态  NOT_START未开始，SIGN_IN已签到，SIGN_OUT已签退",required = false)
     private CourseStatusEnum courseStatus;
@@ -42,6 +45,9 @@ public class StudentManageCourseListDto {
 
     @ApiModelProperty(value = "总课时",required = false)
     private Integer totalClassTimes;
+    
+    @ApiModelProperty(value = "课程编号",required = false)
+    private Long courseScheduleId;
 
     public CourseSchedule.CourseScheduleType getCourseScheduleType() {
         return courseScheduleType;
@@ -122,4 +128,20 @@ public class StudentManageCourseListDto {
     public void setTeacherName(String teacherName) {
         this.teacherName = teacherName;
     }
+
+	public Date getCourseEndDate() {
+		return courseEndDate;
+	}
+
+	public void setCourseEndDate(Date courseEndDate) {
+		this.courseEndDate = courseEndDate;
+	}
+
+	public Long getCourseScheduleId() {
+		return courseScheduleId;
+	}
+
+	public void setCourseScheduleId(Long courseScheduleId) {
+		this.courseScheduleId = courseScheduleId;
+	}
 }

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

@@ -9,6 +9,9 @@ import io.swagger.annotations.ApiModelProperty;
  */
 public class TeacherPersonalAttendanceDto {
 
+    @ApiModelProperty(value = "课程编号",required = false)
+	private Long courseScheduleId;
+	
     /** 上课日期 */
     @ApiModelProperty(value = "上课日期",required = false)
     private String classDate;
@@ -17,6 +20,9 @@ public class TeacherPersonalAttendanceDto {
     @ApiModelProperty(value = "上课时间",required = false)
     private String startClassTime;
 
+    @ApiModelProperty(value = "结束时间",required = false)
+    private String endClassTime;
+
     /** 班级类型(普通班级、合奏班级) */
     @ApiModelProperty(value = "课程类型",required = false)
     private CourseSchedule.CourseScheduleType type;
@@ -92,4 +98,20 @@ public class TeacherPersonalAttendanceDto {
     public void setRemark(String remark) {
         this.remark = remark;
     }
+
+	public Long getCourseScheduleId() {
+		return courseScheduleId;
+	}
+
+	public void setCourseScheduleId(Long courseScheduleId) {
+		this.courseScheduleId = courseScheduleId;
+	}
+
+	public String getEndClassTime() {
+		return endClassTime;
+	}
+
+	public void setEndClassTime(String endClassTime) {
+		this.endClassTime = endClassTime;
+	}
 }

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

@@ -3588,6 +3588,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                     	continue;
 					}
                     Date courseEndTime = DateUtil.addMinutes(courseStartTime, courseGenerateInfo.getSingleClassMinutes());
+                    if(!DateUtil.isSameDay(courseStartTime, courseEndTime)){
+                    	throw new BizException("暂不支持单节课跨天");
+					}
                     CourseSchedule courseSchedule = new CourseSchedule();
                     courseSchedule.setClassDate(courseStartTime);
                     courseSchedule.setStartClassTime(courseStartTime);

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

@@ -137,7 +137,8 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 							YesOrNoEnum.NO.getCode());
 				}
 				if(studentAttendanceInfo.getStatus() == StudentAttendanceStatusEnum.NORMAL){
-					studentAttendanceInfo.setSignInTime(date);
+					studentAttendanceInfo.setSignInTime(courseSchedule.getStartClassTime());
+					studentAttendanceInfo.setSignOutTime(courseSchedule.getEndClassTime());
 				}
 				studentAttendanceDao.insert(studentAttendanceInfo);
 			}else{
@@ -204,9 +205,9 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 			return;
 		}
 
-		teacherAttendance.setSignInTime(date);
+		teacherAttendance.setSignInTime(courseSchedule.getStartClassTime());
 		teacherAttendance.setSignInStatus(YesOrNoEnum.YES);
-		teacherAttendance.setSignOutTime(date);
+		teacherAttendance.setSignOutTime(courseSchedule.getEndClassTime());
 		teacherAttendance.setSignOutStatus(YesOrNoEnum.YES);
 		teacherAttendance.setCurrentClassTimes(classTimes + 1);
 		if(Objects.nonNull(teacherAttendance.getId())){

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

@@ -9,6 +9,8 @@
         <result property="classGroupType" column="class_group_type_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result property="courseScheduleType" column="course_schedule_type_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result property="courseDate" column="course_date_" />
+        <result property="courseEndDate" column="course_end_date_" />
+        <result property="courseScheduleId" column="course_schedule_id_" />
         <result property="courseStatus" column="course_status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result property="teacherName" column="teacher_name_" />
         <result property="currentCLassTimes" column="current_class_times_" />
@@ -282,6 +284,8 @@
             cg.type_ class_group_type_,
             cs.type_ course_schedule_type_,
             CONCAT(cs.class_date_," ",cs.start_class_time_) course_date_,
+            CONCAT(cs.class_date_," ",cs.end_class_time_) course_end_date_,
+            cssp.course_schedule_id_,
             su.real_name_ teacher_name_,
             IF(sa.status_ IS NULL,'TRUANT',sa.status_) status_,
             sa.current_class_times_,

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

@@ -162,6 +162,8 @@
         <result column="sign_in_status_" property="signInStatus"/>
         <result column="sign_out_status_" property="signOutStatus"/>
         <result column="remark_" property="remark"/>
+        <result column="id_" property="courseScheduleId"/>
+        <result column="end_class_time_" property="endClassTime"/>
     </resultMap>
 
     <sql id="queryCondition">
@@ -202,7 +204,7 @@
             cs.class_date_,cs.start_class_time_,cs.name_,cs.type_,
             IF(ta.sign_in_status_ IS NULL,3,ta.sign_in_status_) sign_in_status_,
             IF(ta.sign_out_status_ IS NULL,3,ta.sign_out_status_) sign_out_status_,
-            ta.remark_
+            ta.remark_,cs.id_,cs.end_class_time_
         FROM
             course_schedule cs
             LEFT JOIN teacher_attendance ta  ON ta.course_schedule_id_=cs.id_