Merge remote-tracking branch 'origin/master'

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/service/PracticeGroupService.java
#	mec-biz/src/main/java/com/ym/mec/biz/service/impl/PracticeGroupServiceImpl.java

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

@@ -3,9 +3,20 @@ package com.ym.mec.biz.service;
 import com.ym.mec.biz.dal.entity.PracticeGroup;
 import com.ym.mec.common.service.BaseService;
 
+import java.util.Date;
 import java.util.Map;
 
-public interface PracticeGroupService extends BaseService<Long, PracticeGroup>{
+public interface PracticeGroupService extends BaseService<Long, PracticeGroup> {
+
+	/**
+	 * 给学生指派老师
+	 * @param userId 学生编号
+	 * @param subjectId 学生选择的专业
+	 * @param startTime 开课时间
+	 * @param endTime 结束时间
+	 * @return
+	 */
+	Integer searchTeacherId(Integer userId, Integer subjectId, Date startTime, Date endTime);
 
     /**
      * @describe 获取陪练课预约参数
@@ -23,5 +34,5 @@ public interface PracticeGroupService extends BaseService<Long, PracticeGroup>{
      * @return java.util.Map
      */
     Map practiceApply(PracticeGroup practiceGroup);
-	
+
 }

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

@@ -1,24 +1,23 @@
 package com.ym.mec.biz.service.impl;
 
+import com.ym.mec.biz.dal.dao.PracticeGroupDao;
 import com.ym.mec.biz.dal.dao.SubjectDao;
+import com.ym.mec.biz.dal.entity.PracticeGroup;
 import com.ym.mec.biz.dal.entity.Subject;
 import com.ym.mec.biz.dal.entity.SysConfig;
 import com.ym.mec.biz.service.PracticeGroupService;
 import com.ym.mec.biz.service.SysConfigService;
+import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.date.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.ym.mec.biz.dal.dao.PracticeGroupDao;
-import com.ym.mec.biz.dal.entity.PracticeGroup;
-import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.common.service.impl.BaseServiceImpl;
-
 import java.util.*;
 
 @Service
-public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGroup> implements PracticeGroupService {
+public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGroup> implements PracticeGroupService{
 
 	@Autowired
 	private PracticeGroupDao practiceGroupDao;
@@ -26,13 +25,20 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 	private SysConfigService sysConfigService;
 	@Autowired
 	private SubjectDao subjectDao;
-	
+
 	@Override
 	public BaseDAO<Long, PracticeGroup> getDAO() {
 		return practiceGroupDao;
 	}
 
 	@Override
+	public Integer searchTeacherId(Integer userId, Integer subjectId, Date startTime, Date endTime) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+
+	@Override
 	public Map getPracticeApplyParams() {
 		Map result=new HashMap();
 		SysConfig practiceSubjectIdListConfig = sysConfigService.findByParamName(SysConfigService.PRACTICE_SUBJECT_ID_LIST);

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

@@ -1,12 +1,11 @@
 package com.ym.mec.biz.service.impl;
 
-import com.ym.mec.biz.service.PracticeLessonApplyService;
-import com.ym.mec.biz.service.SchoolService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.ym.mec.biz.dal.dao.PracticeLessonApplyDao;
 import com.ym.mec.biz.dal.entity.PracticeLessonApply;
+import com.ym.mec.biz.service.PracticeLessonApplyService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 

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

@@ -5,11 +5,12 @@ import org.springframework.stereotype.Service;
 
 import com.ym.mec.biz.dal.dao.ResourceRespositoryDao;
 import com.ym.mec.biz.dal.entity.ResourceRespository;
+import com.ym.mec.biz.service.ResourceRespositoryService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 
 @Service
-public class ResourceRespositoryServiceImpl extends BaseServiceImpl<Integer, ResourceRespository>{
+public class ResourceRespositoryServiceImpl extends BaseServiceImpl<Integer, ResourceRespository> implements ResourceRespositoryService{
 
 	@Autowired
 	private ResourceRespositoryDao resourceRespositoryDao;