bug

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

@@ -18,13 +18,6 @@ import java.util.Map;
 public interface TeacherService extends BaseService<Integer, Teacher> {
 
     /**
-     * 根据证件号查询老师信息
-     * @param certificateNum 证件号
-     * @return Teacher 老师信息
-     */
-    Teacher findByCertificateNum(String certificateNum);
-
-    /**
      * 新增教师
      * @param teacher
      */

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

@@ -79,7 +79,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		return employeeDao;
 	}
 
-	private void checkTenantId(Integer tenantId,Integer targetTenantId){
+	public static void checkTenantId(Integer tenantId,Integer targetTenantId){
 		//如果机构不一致，不允许跨机构注册
 		if(tenantId != null && tenantId != 0 && !tenantId.equals(targetTenantId)){
 			throw new LockedException("用户已注册");

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

@@ -12,7 +12,6 @@ import com.ym.mec.biz.dal.enums.SysUserRoleEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.biz.service.*;
-import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.entity.ImResult;
 import com.ym.mec.common.entity.ImUserModel;
 import com.ym.mec.common.exception.BizException;
@@ -690,26 +689,28 @@ public class StudentManageServiceImpl implements StudentManageService {
             throw new BizException("参数校验失败");
         }
         Date date = new Date();
-        SysUser sysUser = sysUserFeignService.queryUserByMobile(student.getPhone());
+        SysUser sysUser = teacherDao.getUserWithPhone(student.getPhone());
         if (sysUser != null) {
+            EmployeeServiceImpl.checkTenantId(student.getTenantId(),sysUser.getTenantId());
             if (sysUser.getUserType().contains("STUDENT")) {
                 throw new BizException("手机号已被占用");
             } else {
                 student.setId(sysUser.getId());
                 student.setUserType(sysUser.getUserType() + ",STUDENT");
                 student.setUpdateTime(date);
-                sysUserFeignService.updateSysUser(student);
+                teacherDao.updateUser(student);
             }
         } else {
             student.setUpdateTime(date);
             student.setCreateTime(date);
             student.setUserType("STUDENT");
-            HttpResponseResult<Integer> result = sysUserFeignService.addUser(student);
-            student.setId(result.getData());
+            teacherDao.addSysUser(student);
+//            HttpResponseResult<Integer> result = sysUserFeignService.addUser(student);
+//            student.setId(result.getData());
 
             ImResult register = imFeignService.register(new ImUserModel(student.getId().toString(), student.getPhone(), null));
             student.setImToken(register.getToken());
-            sysUserFeignService.updateSysUser(student);
+            teacherDao.updateUser(student);
 
             sysUserCashAccountDao.insert(new SysUserCashAccount(student.getId(), "CNY"));
         }
@@ -726,13 +727,13 @@ public class StudentManageServiceImpl implements StudentManageService {
         if (userId == null || StringUtils.isEmpty(student.getPhone())) {
             throw new BizException("参数校验失败");
         }
-        SysUser sysUser1 = sysUserFeignService.queryUserByMobile(student.getPhone());
+        SysUser sysUser1 = teacherDao.getUserWithPhone(student.getPhone());
         if (sysUser1 != null && !userId.equals(sysUser1.getId())) {
             throw new BizException("手机号已被占用");
         }
         //不更新真实姓名
         student.setRealName(null);
-        sysUserFeignService.updateSysUser(student);
+        teacherDao.updateUser(student);
 
         student.setUserId(student.getId());
         student.setOperatingTag(student.getOperatingTag());
@@ -740,7 +741,7 @@ public class StudentManageServiceImpl implements StudentManageService {
         student.setServiceTag(student.getServiceTag() == 0 ? 2 : 1);
         student.setTeacherId(student.getTeacherId());
         // 同步更新机构手机号 如果它存在
-        SysUser user = sysUserFeignService.queryUserById(student.getId());
+        SysUser user = teacherDao.getUser(student.getId());
         tenantInfoService.updatePhone(student.getPhone(), user.getPhone());
         activityUserMapperDao.updateTeacherId(student.getUserId(),student.getTeacherId());
         if(Objects.nonNull(student.getCarePackage())||Objects.nonNull(student.getComeOnPackage())){
@@ -766,9 +767,6 @@ public class StudentManageServiceImpl implements StudentManageService {
     @Override
     public List<StudentRegisterPerDto> queryStudentPer() {
         String format = DateUtil.format(DateUtil.addDays(new Date(), -1), DateUtil.ISO_EXPANDED_DATE_FORMAT);
-//        Set<Integer> musicUserIds = scheduleStudentPaymentDao.queryMusicStudentPer();
-//        Set<Integer> vipUserIds = scheduleStudentPaymentDao.queryVipStudentPer();
-//        musicUserIds.addAll(vipUserIds);
         return studentRegistrationDao.queryStudentPer1(format);
     }
 
@@ -777,15 +775,6 @@ public class StudentManageServiceImpl implements StudentManageService {
         Map<String, Object> params = new HashMap<>();
         MapUtil.populateMap(params, queryInfo);
         List<StudentManageListDto> studentHasCourseDtos = studentManageDao.queryHasCourseStudent(params);
-        /*Set<Integer> userIds = studentHasCourseDtos.stream().map(e -> e.getUserId()).collect(Collectors.toSet());
-        Map<Integer,Integer> hasPracticeCourseMap = MapUtil.convertIntegerMap(studentManageDao.getHasPracticeCourse(userIds));
-        Map<Integer,Integer> isActiveMap = MapUtil.convertIntegerMap(studentManageDao.getIsActive(userIds));
-        Map<Integer,Integer> isMakeMap = MapUtil.convertIntegerMap(studentManageDao.getIsMake(userIds));
-        studentHasCourseDtos.forEach(e->{
-            e.setHasPracticeCourse(hasPracticeCourseMap.get(e.getUserId()) == null?YesOrNoEnum.NO:YesOrNoEnum.YES);
-            e.setIsActive(isActiveMap.get(e.getUserId()) == null?YesOrNoEnum.YES:YesOrNoEnum.NO);
-            e.setIsMake(isMakeMap.get(e.getUserId()) == null?YesOrNoEnum.NO:YesOrNoEnum.YES);
-        });*/
         return studentHasCourseDtos;
     }
 
@@ -1011,10 +1000,7 @@ public class StudentManageServiceImpl implements StudentManageService {
                     activityCourseDetailDto.setMusic_theory_price(detailDto.getMusic_theory_price());
                 }
             }else {
-                SysUser sysUser = sysUserFeignService.queryUserById(student.getUserId());
-                if(sysUser == null){
-                    throw new BizException("请登录");
-                }
+                SysUser sysUser = teacherDao.getUser(student.getUserId());
                 OrganizationDegreeCourseFee degreeCourseFee = organizationDegreeCourseFeeDao.getByOrganId(sysUser.getOrganId());
                 if(degreeCourseFee == null){
                     throw new BizException("学员所在分部未配置考级价格");

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

@@ -86,8 +86,6 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 	@Autowired
 	private StudentPaymentOrderDao studentPaymentOrderDao;
 	@Autowired
-	private SysUserFeignService sysUserFeignService;
-	@Autowired
 	private ImFeignService imFeignService;
 	@Autowired
 	private ImGroupDao imGroupDao ;
@@ -110,15 +108,11 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 	}
 
 	@Override
-	public Teacher findByCertificateNum(String certificateNum){
-		return teacherDao.findByCertificateNum(certificateNum);
-	}
-
-	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int add(Teacher teacher) throws Exception {
-		SysUser user = sysUserFeignService.queryUserByMobile(teacher.getPhone());
+		SysUser user = teacherDao.getUserWithPhone(teacher.getPhone());
 		if(user != null && user.getId() != null){
+			EmployeeServiceImpl.checkTenantId(teacher.getTenantId(),user.getTenantId());
 			if(user.getUserType().contains("TEACHER")){
 				throw new BizException("此手机号已被占用");
 			}
@@ -166,14 +160,14 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 		}
 
 		if(StringUtils.isNotEmpty(teacher.getPhone())){
-			SysUser sysUser = sysUserFeignService.queryUserByMobile(teacher.getPhone());
+			SysUser sysUser = teacherDao.getUserWithPhone(teacher.getPhone());
 			if(sysUser != null && !sysUser.getId().equals(teacher.getId())){
 				throw new BizException("手机号已存在");
 			}
 		}
 
 		// 同步更新机构手机号 如果它存在
-		SysUser user = sysUserFeignService.queryUserById(teacher.getId()); // 138 -> 159
+		SysUser user = teacherDao.getUser(teacher.getId()); // 138 -> 159
 		if (!Objects.equals(user.getPhone(), teacher1.getPhone())) {
 			tenantInfoService.updatePhone(teacher1.getPhone(), user.getPhone());
 		}
@@ -201,13 +195,13 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 			throw new BizException("教师信息不存在");
 		}
 		if(StringUtils.isNotEmpty(teacher.getPhone())){
-			SysUser sysUser = sysUserFeignService.queryUserByMobile(teacher.getPhone());
+			SysUser sysUser = teacherDao.getUserWithPhone(teacher.getPhone());
 			if(sysUser != null && !sysUser.getId().equals(teacher.getId())){
 				throw new BizException("手机号已存在");
 			}
 		}
 		// 同步更新机构手机号 如果它存在
-		SysUser user = sysUserFeignService.queryUserById(teacher.getId());
+		SysUser user = teacherDao.getUser(teacher.getId());
 		if (!Objects.equals(user.getPhone(), teacher1.getPhone())) {
 			tenantInfoService.updatePhone(teacher1.getPhone(), user.getPhone());
 		}
@@ -309,12 +303,6 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 		}
 		studentIds.removeAll(userDtos.stream().map(e->e.getUserId()).collect(Collectors.toSet()));
 		studentIds.remove(teacherId);
-		//获取课程关联的学生列表
-//		teachers.addAll(teacherDao.findCloseCourseStudentIds(teacherId, search));
-		//获取相关vip陪练教务的学员编号
-//		teachers.addAll(teacherDao.findVipEducationalStudentId(teacherId,search));
-//		teachers.addAll(teacherDao.findCommEducationalStudentId(teacherId,search));
-//		teachers.addAll(teacherDao.findPracticeEducationalStudentId(teacherId,search));
 		if(studentIds.size() > 0){
 			teachers.addAll(teacherDao.queryTeacherBaseInfo(studentIds,search));
 		}
@@ -479,23 +467,11 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 			pageInfo.setTotal(count);
 			params.put("offset", pageInfo.getOffset());
 			dataList = teacherDao.queryMusicGroupTeachers(params);
-			//获取合奏班id列表
-//			Set<Integer> classGroupIds = dataList.stream().map(e -> e.getClassGroupId()).collect(Collectors.toSet());
-//			String classGroupIdStr = StringUtils.join(classGroupIds,",");
 			//获取教师id列表
 			Set<Integer> teacherIds = dataList.stream().map(e -> e.getTeacherId()).collect(Collectors.toSet());
-//			String teacherIdStr = StringUtils.join(teacherIds,",");
-
 			//根据教师编号和班级编号，获取老师签到次数
 			Map<Integer,Integer> signNumMap =  JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(teacherDao.findSignNum(StringUtils.join(teacherIds,","),queryInfo.getMusicGroupId()))),HashMap.class);
-//			Map<Integer,Integer> signNumMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(signNum)),HashMap.class);
-
-			//根据合奏班编号，获取子班级名称列表
-//			List<Map<Integer,String>> classNames =  classGroupDao.queryNamesByClassId(classGroupIdStr);
-//			Map<Integer,String> classNameMap = MapUtil.convertMybatisMap(classNames);
-
 			dataList.forEach(e->{
-//				e.setCourseScheduleName(classNameMap.get(e.getClassGroupId()));
 				e.setNum(signNumMap.get(e.getTeacherId()));
 			});
 		}
@@ -591,11 +567,6 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 
 	@Override
 	public List<BasicUserDto> queryEducationIpa(Integer userId, String search) {
-//		List<BasicUserDto> basicUserDtos = queryGroupStudents(userId, search);
-		//获取当前管理人员所在分部，所有老师，以及没有乐团的学生
-//		List<BasicUserDto> userDtos = teacherDao.queryEducationIpa(userId, search);
-//		userDtos.addAll(basicUserDtos);
-//		return userDtos.stream().distinct().collect(Collectors.toList());
 		return queryGroupStudents(userId, search);
 	}
 
@@ -703,7 +674,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 	@Transactional(rollbackFor = Exception.class)
 	public boolean realNameAuthentication(Integer userId, String realName, String idcardNo, String idcardFrontImg, String idcardBackImg, String idcardHandImg) {
 
-		SysUser user = sysUserFeignService.queryUserById(userId);
+		SysUser user = teacherDao.getUser(userId);
 		if (user == null) {
 			throw new BizException("用户不存在");
 		}
@@ -725,11 +696,6 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 
 		Date date = new Date();
 
-//		user.setRealName(realName);
-//		user.setIdCardNo(idcardNo);
-//		user.setUpdateTime(date);
-//		sysUserFeignService.updateSysUser(user);
-
 		teacher.setIdcardBackImg(idcardBackImg);
 		teacher.setIdcardFrontImg(idcardFrontImg);
 		teacher.setIdcardHandImg(idcardHandImg);