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

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TeacherDao.java

@@ -166,12 +166,10 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
      * @describe 根据声部获取部门下的老师
      * @author Joburgess
      * @date 2019/11/4
-     * @param organId: 部门编号
      * @param subjectId: 声部编号
      * @return java.util.List<com.ym.mec.biz.dal.entity.Teacher>
      */
-    List<Teacher> findOrganTeacherBySubject(@Param("organId") String organId,
-                                            @Param("subjectId") Integer subjectId);
+    List<Teacher> findOrganTeacherBySubject(@Param("subjectId") Integer subjectId);
 
     /**
      * 根据分部查询老师数
@@ -181,4 +179,4 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
     Map<String,Integer> queryOrganTeacherNum(@Param("organId") String organId);
 
     List<Teacher> findByFlowOrganRange(Map<String, Object> params);
-}
+}

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

@@ -5,7 +5,6 @@ import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.page.PageInfo;
-import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
 import org.apache.ibatis.annotations.Param;
 
@@ -81,12 +80,10 @@ public interface TeacherService extends BaseService<Integer, Teacher> {
      * @describe 根据科目获取部门下的教师
      * @author Joburgess
      * @date 2019/11/4
-     * @param organId: 部门编号
      * @param subjectId: 科目编号
      * @return java.util.List<com.ym.mec.biz.dal.entity.Teacher>
      */
-    List<Teacher> findOrganTeacherBySubject(@Param("organId") String organId,
-                                            @Param("subjectId") Integer subjectId);
+    List<Teacher> findOrganTeacherBySubject(@Param("subjectId") Integer subjectId);
 
     /**
      * 获取教师上课结算列表

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

@@ -27,7 +27,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 @Service
 public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  implements TeacherService {
@@ -209,8 +208,8 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
     }
 
 	@Override
-	public List<Teacher> findOrganTeacherBySubject(String organId, Integer subjectId) {
-		return teacherDao.findOrganTeacherBySubject(organId,subjectId);
+	public List<Teacher> findOrganTeacherBySubject(Integer subjectId) {
+		return teacherDao.findOrganTeacherBySubject(subjectId);
 	}
 
 	@Override

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

@@ -106,6 +106,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 	private StudentPaymentOrderService studentPaymentOrderService;
 	@Autowired
 	private ContractService contractService;
+	@Autowired
+    private TeacherService teacherService;
 
 	@Override
 	public BaseDAO<Long, VipGroup> getDAO() {
@@ -240,7 +242,11 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		}else{
 			vipGroupApplyBaseInfoDto.setStatus(VipGroupStatusEnum.APPLYING);
 		}
-		vipGroupApplyBaseInfoDto.setOrganId(Integer.parseInt(sysUser.getOrganId()));
+        Teacher teacher = teacherService.get(sysUser.getId());
+		if(teacher.getOrganId().indexOf(",")!=-1){
+		    throw new BizException("教师部门异常");
+        }
+        vipGroupApplyBaseInfoDto.setOrganId(Integer.parseInt(teacher.getOrganId()));
 		//开课时间为排课的第一节课的开始时间
 		vipGroupApplyBaseInfoDto.setCourseStartDate(firstCourseSchedule.getStartClassTime());
 		//课程结束时间为排课的最后一节课的结束时间

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

@@ -292,7 +292,9 @@
         <![CDATA[ AND create_time_ <= ]]> #{beforeTime}
     </select>
     <select id="countStudentPaymentNum" resultType="int">
-        select count(1) from student_payment_order where  music_group_id_=#{musicGroupId} AND status_ = 'SUCCESS' AND type_='SMALL_CLASS_TO_BUY'
+        select count(1) from student_payment_order
+        where  music_group_id_=#{musicGroupId}
+        AND status_ = 'SUCCESS' AND type_='SMALL_CLASS_TO_BUY'
     </select>
 
     <select id="countSurplusCourseByMusicGroupAndUser" resultType="int">

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

@@ -480,9 +480,6 @@
     <select id="findOrganTeacherBySubject" resultMap="Teacher">
         SELECT su.* FROM teacher t
         LEFT JOIN sys_user su on t.id_ = su.id_ WHERE 1=1
-        <if test="organId != null">
-            AND FIND_IN_SET(t.organ_id_,#{organId})
-        </if>
         <if test="subjectId != null">
             AND FIND_IN_SET(#{subjectId},t.subject_id_)
         </if>

mec-web/src/main/java/com/ym/mec/web/controller/TeacherController.java

@@ -113,8 +113,7 @@ public class TeacherController extends BaseController {
     @GetMapping("/findOrganTeacherBySubject")
     @PreAuthorize("@pcs.hasPermissions('teacher/findOrganTeacherBySubject')")
     public HttpResponseResult findOrganTeacherBySubject(Integer subjecId) {
-        String organId = sysUserFeignService.queryUserInfo().getOrganId();
-        return succeed(teacherService.findOrganTeacherBySubject(organId,subjecId));
+        return succeed(teacherService.findOrganTeacherBySubject(subjecId));
     }
 
     @ApiOperation(value = "获取乐团所有老师")