|
@@ -20,6 +20,7 @@ import com.ym.mec.biz.dal.dao.*;
|
|
import com.ym.mec.biz.dal.dto.*;
|
|
import com.ym.mec.biz.dal.dto.*;
|
|
import com.ym.mec.biz.dal.page.*;
|
|
import com.ym.mec.biz.dal.page.*;
|
|
|
|
|
|
|
|
+import com.ym.mec.biz.service.TenantInfoService;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.poi.ss.formula.functions.T;
|
|
import org.apache.poi.ss.formula.functions.T;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -100,7 +101,8 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> imple
|
|
private RedisTemplate<String,String> redisTemplate;
|
|
private RedisTemplate<String,String> redisTemplate;
|
|
@Autowired
|
|
@Autowired
|
|
private CloudTeacherDao cloudTeacherDao;
|
|
private CloudTeacherDao cloudTeacherDao;
|
|
-
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private TenantInfoService tenantInfoService;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public BaseDAO<Integer, Teacher> getDAO() {
|
|
public BaseDAO<Integer, Teacher> getDAO() {
|
|
@@ -162,12 +164,20 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> imple
|
|
if(null==teacher1){
|
|
if(null==teacher1){
|
|
throw new BizException("教师信息不存在");
|
|
throw new BizException("教师信息不存在");
|
|
}
|
|
}
|
|
|
|
+
|
|
if(StringUtils.isNotEmpty(teacher.getPhone())){
|
|
if(StringUtils.isNotEmpty(teacher.getPhone())){
|
|
SysUser sysUser = sysUserFeignService.queryUserByMobile(teacher.getPhone());
|
|
SysUser sysUser = sysUserFeignService.queryUserByMobile(teacher.getPhone());
|
|
if(sysUser != null && !sysUser.getId().equals(teacher.getId())){
|
|
if(sysUser != null && !sysUser.getId().equals(teacher.getId())){
|
|
throw new BizException("手机号已存在");
|
|
throw new BizException("手机号已存在");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ // 同步更新机构手机号 如果它存在
|
|
|
|
+ SysUser user = sysUserFeignService.queryUserById(teacher.getId()); // 138 -> 159
|
|
|
|
+ if (!Objects.equals(user.getPhone(), teacher1.getPhone())) {
|
|
|
|
+ tenantInfoService.updatePhone(teacher1.getPhone(), user.getPhone());
|
|
|
|
+ }
|
|
|
|
+
|
|
if(Objects.nonNull(teacher.getEntryDate())&&Objects.nonNull(teacher.getFormalStaffDate())){
|
|
if(Objects.nonNull(teacher.getEntryDate())&&Objects.nonNull(teacher.getFormalStaffDate())){
|
|
if(teacher.getEntryDate().compareTo(teacher.getFormalStaffDate())>0){
|
|
if(teacher.getEntryDate().compareTo(teacher.getFormalStaffDate())>0){
|
|
throw new BizException("入职日期不可晚于转正日期");
|
|
throw new BizException("入职日期不可晚于转正日期");
|
|
@@ -196,6 +206,12 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> imple
|
|
throw new BizException("手机号已存在");
|
|
throw new BizException("手机号已存在");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ // 同步更新机构手机号 如果它存在
|
|
|
|
+ SysUser user = sysUserFeignService.queryUserById(teacher.getId());
|
|
|
|
+ if (!Objects.equals(user.getPhone(), teacher1.getPhone())) {
|
|
|
|
+ tenantInfoService.updatePhone(teacher1.getPhone(), user.getPhone());
|
|
|
|
+ }
|
|
|
|
+
|
|
if(Objects.nonNull(teacher.getEntryDate())&&Objects.nonNull(teacher.getFormalStaffDate())){
|
|
if(Objects.nonNull(teacher.getEntryDate())&&Objects.nonNull(teacher.getFormalStaffDate())){
|
|
if(teacher.getEntryDate().compareTo(teacher.getFormalStaffDate())>0){
|
|
if(teacher.getEntryDate().compareTo(teacher.getFormalStaffDate())>0){
|
|
throw new BizException("入职日期不可晚于转正日期");
|
|
throw new BizException("入职日期不可晚于转正日期");
|