update

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

@@ -1,12 +1,10 @@
 package com.ym.mec.biz.dal.dto;
 
+import com.ym.mec.biz.dal.enums.CourseStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
 
-import com.ym.mec.biz.dal.enums.CourseStatusEnum;
-import com.ym.mec.biz.dal.enums.ParamEnum;
-
 /**
  * @Author Joburgess
  * @Date 2019/9/10
@@ -57,14 +55,25 @@ public class TeacherAttendanceDto {
     private Date currentTime;
 
     @ApiModelProperty(value = "教师正常签到提前时间(分钟)",required = false)
-    private ParamEnum teacherAttendanceTimeGap;
+    private Integer advanceSignInMinutes;
+
+    @ApiModelProperty(value = "老师可打卡范围,单位米")
+    private Integer attendanceRange;
+
+    public Integer getAttendanceRange() {
+        return attendanceRange;
+    }
+
+    public void setAttendanceRange(Integer attendanceRange) {
+        this.attendanceRange = attendanceRange;
+    }
 
-    public ParamEnum getTeacherAttendanceTimeGap() {
-        return teacherAttendanceTimeGap;
+    public Integer getAdvanceSignInMinutes() {
+        return advanceSignInMinutes;
     }
 
-    public void setTeacherAttendanceTimeGap(ParamEnum teacherAttendanceTimeGap) {
-        this.teacherAttendanceTimeGap = teacherAttendanceTimeGap;
+    public void setAdvanceSignInMinutes(Integer advanceSignInMinutes) {
+        this.advanceSignInMinutes = advanceSignInMinutes;
     }
 
     public Date getCurrentTime() {

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

@@ -39,11 +39,33 @@ public class CourseHomeworkTemplate {
 	/** 班级类型(普通班级、合奏班级) */
 	@ApiModelProperty(value = "班级类型(普通班级、合奏班级、提高课班级、VIP班级)",required = true)
 	private ClassGroupTypeEnum classGroupType;
+
+	@ApiModelProperty(value = "班级类型")
+	private String classGroupTypeName;
 	
 	/**  */
 	@ApiModelProperty(value = "声部ID",required = true)
 	private Integer subjectId;
-	
+
+	@ApiModelProperty(value = "科目名称")
+	private String subjectName;
+
+	public String getClassGroupTypeName() {
+		return classGroupTypeName;
+	}
+
+	public void setClassGroupTypeName(String classGroupTypeName) {
+		this.classGroupTypeName = classGroupTypeName;
+	}
+
+	public String getSubjectName() {
+		return subjectName;
+	}
+
+	public void setSubjectName(String subjectName) {
+		this.subjectName = subjectName;
+	}
+
 	public void setId(Integer id){
 		this.id = id;
 	}
@@ -98,6 +120,7 @@ public class CourseHomeworkTemplate {
 
 	public void setClassGroupType(ClassGroupTypeEnum classGroupType) {
 		this.classGroupType = classGroupType;
+		this.classGroupTypeName=classGroupType.getMsg();
 	}
 
 	public void setSubjectId(Integer subjectId){

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/SignStatusEnum.java

@@ -4,9 +4,8 @@ import com.ym.mec.common.enums.BaseEnum;
 
 //状态(1正常签到，0异常签到，2正常签退)
 public enum SignStatusEnum implements BaseEnum<Integer, SignStatusEnum> {
-    SIGN(1,"1正常签到"),
-    EXCEPTION(0,"异常签到"),
-    YES_QUIT(2,"正常签退");
+    SIGN_IN(0,"签到"),
+    SIGN_OUT(1,"签退");
 
     private Integer code;
     private String msg;

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

@@ -7,6 +7,7 @@ import com.ym.mec.biz.service.CourseHomeworkTemplateService;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
 
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -28,7 +29,10 @@ public class CourseHomeworkTemplateServiceImpl extends BaseServiceImpl<Integer,
 	public PageInfo<CourseHomeworkTemplate> queryPage(QueryInfo queryInfo) {
 		CourseHomeWorkTemplateQueryInfo templateQueryInfo= (CourseHomeWorkTemplateQueryInfo) queryInfo;
 		if(null!=templateQueryInfo.getCourseScheduleID()){
-			templateQueryInfo.setSubjectIDs(courseHomeworkTemplateDao.getSubjectIDs(templateQueryInfo.getCourseScheduleID()).split(","));
+			String subjectIDs = courseHomeworkTemplateDao.getSubjectIDs(templateQueryInfo.getCourseScheduleID());
+			if(!StringUtils.isEmpty(subjectIDs)) {
+				templateQueryInfo.setSubjectIDs(subjectIDs.split(","));
+			}
 		}
 		return super.queryPage(templateQueryInfo);
 	}

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

@@ -59,7 +59,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		}
 		TeacherAttendanceDto currentCourseDetail = courseScheduleDao.getCurrentCourseDetail(courseID);
 		currentCourseDetail.setCurrentTime(new Date());
-		currentCourseDetail.setTeacherAttendanceTimeGap(ParamEnum.TEACHER_ATTENDANCE_TIME_GAP);
+		SysConfig advance_sign_in_minutes = sysConfigDao.findByParamName("advance_sign_in_minutes");
+		currentCourseDetail.setAdvanceSignInMinutes(Integer.parseInt(advance_sign_in_minutes.getParanValue()));
+		SysConfig attendance_range = sysConfigDao.findByParamName("attendance_range");
+		currentCourseDetail.setAttendanceRange(Integer.parseInt(attendance_range.getParanValue()));
 		return currentCourseDetail;
 	}
 
@@ -352,7 +355,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 	@Override
 	public void courseSwapWithDay(Date day1, Date day2) {
-		
+
 	}
 
 	@Override

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

@@ -65,7 +65,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 		TeacherAttendance teacherAttendance=teacherAttendanceDao.findByTeacherAttendanceInfo(user.getId().longValue(),teacherSignOutDto.getTeacherAttendanceInfo().getCourseScheduleId());
 
 		if(Objects.isNull(teacherAttendance)){
-			if(teacherSignOutDto.getTeacherAttendanceInfo().getStatus()==SignStatusEnum.YES_QUIT){
+			if(teacherSignOutDto.getTeacherAttendanceInfo().getStatus()==SignStatusEnum.SIGN_OUT){
 				throw new BizException("该课程还未签到，不能进行签退操作!");
 			}
 			teacherAttendance=teacherSignOutDto.getTeacherAttendanceInfo();
@@ -79,7 +79,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 		teacherAttendance.setMusicGroupId(currentCourseDetail.getMusicGroupId());
 		teacherAttendance.setClassGroupId(currentCourseDetail.getClassId());
 		Date date = new Date();
-		if(teacherAttendance.getStatus()!= SignStatusEnum.YES_QUIT){
+		if(teacherAttendance.getStatus()!= SignStatusEnum.SIGN_OUT){
 			Long timeGap=(date.getTime()-currentCourseDetail.getStartClassTime().getTime())/1000/60;
 			if(timeGap<= ParamEnum.TEACHER_ATTENDANCE_TIME_GAP.getCode()){
 				teacherAttendance.setSignInStatus(YesOrNoEnum.YES);
@@ -100,7 +100,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			teacherAttendanceDao.update(teacherAttendance);
 		}
 		courseScheduleDao.update(courseSchedule);
-		if(teacherAttendance.getStatus()==SignStatusEnum.YES_QUIT){
+		if(teacherAttendance.getStatus()==SignStatusEnum.SIGN_OUT){
 			//更新课次
 			ClassGroup classGroup=new ClassGroup();
 			classGroup.setId(currentCourseDetail.getClassId().intValue());

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

@@ -16,6 +16,7 @@
         <result column="class_group_type_" property="classGroupType"
                 typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="subject_id_" property="subjectId"/>
+        <result column="subject_name_" property="subjectName"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -85,7 +86,12 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="CourseHomeworkTemplate" parameterType="map">
-        SELECT * FROM course_homework_template
+        SELECT
+        cht.*,
+        s.name_ subject_name_
+        FROM
+        course_homework_template cht
+        LEFT JOIN `subject` s ON cht.subject_id_=s.id_
         <include refid="queryCondition"/>
         ORDER BY id_
         <include refid="global.limit"/>

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

@@ -237,7 +237,7 @@
             CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
             cs.status_,
 	        su.username_ teacher_name_,
-	        ta.status_ attendance_status_
+	        ta.sign_in_status_ attendance_status_
         FROM
             music_group mg
             LEFT JOIN class_group cg ON mg.id_ = cg.music_group_id_
@@ -247,7 +247,7 @@
         WHERE
             mg.organ_id_ = #{organId}
             AND cs.id_ IS NOT NULL
-            AND cs.class_date_ = DATE_FORMAT(#{classDate},'%Y%m%d')
+            AND cs.class_date_ = DATE_FORMAT(#{date},'%Y-%m-%d')
         <include refid="global.limit"/>
     </select>
 
@@ -261,7 +261,7 @@
         WHERE
         mg.organ_id_ = #{organId}
         AND cs.id_ IS NOT NULL
-        AND cs.class_date_ = DATE_FORMAT(#{classDate},'%Y%m%d')
+        AND cs.class_date_ = DATE_FORMAT(#{date},'%Y-%m-%d')
     </select>
 
     <select id="getStudentCourseSchedulesWithDate" resultMap="courseScheduleDto">
@@ -455,7 +455,7 @@
             LEFT JOIN class_group cg ON mg.id_ = cg.music_group_id_
             LEFT JOIN course_schedule cs ON cg.id_ = cs.class_group_id_
         WHERE
-            mg.organ_id_ = 1 AND cs.id_ IS NOT NULL
+            mg.organ_id_ = #{organId} AND cs.id_ IS NOT NULL
             <if test="month==null">
                 AND DATE_FORMAT( NOW(), '%Y%m' ) = DATE_FORMAT( cs.class_date_, '%Y%m' )
             </if>

mec-education/src/main/java/com/ym/mec/education/controller/CourseHomeworkTemplateController.java

@@ -0,0 +1,32 @@
+package com.ym.mec.education.controller;
+
+import com.ym.mec.biz.dal.page.CourseHomeWorkTemplateQueryInfo;
+import com.ym.mec.biz.service.CourseHomeworkTemplateService;
+import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author Joburgess
+ * @Date 2019/9/18
+ */
+@RequestMapping("courseHomeworkTemplate")
+@Api(tags = "作业模板")
+@RestController
+public class CourseHomeworkTemplateController extends BaseController {
+
+    @Autowired
+    private CourseHomeworkTemplateService courseHomeworkTemplateService;
+
+    @ApiOperation(value = "分页查询作业模板列表")
+    @PostMapping("/queryPage")
+    public Object queryPage(@RequestBody CourseHomeWorkTemplateQueryInfo queryInfo){
+        return succeed(courseHomeworkTemplateService.queryPage(queryInfo));
+    }
+
+}

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

@@ -53,7 +53,7 @@ public class TeacherCourseScheduleController extends BaseController {
         return succeed(result);
     }
 
-    @ApiOperation(value = "根据课程ID查询正在或即将开始的课程")
+    @ApiOperation(value = "根据课程ID查询打卡界面课程详情")
     @GetMapping("/getCurrentCourseDetail")
     public Object getCurrentCourseDetail(Long courseID){
         if(Objects.isNull(courseID)){