新增修改教师信息(不包含离职日期等信息)

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

@@ -30,6 +30,12 @@ public interface TeacherService extends BaseService<Integer, Teacher> {
     int add(Teacher teacher) throws Exception;
 
     /**
+     * 修改教师信息(不包含离职日期等信息)
+     * @param teacher
+     */
+    void updateTea1(Teacher teacher);
+
+    /**
      * 修改教师信息
      * @param teacher
      */

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

@@ -136,6 +136,34 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
+	public void updateTea1(Teacher teacher) {
+		Teacher teacher1 = teacherDao.get(teacher.getId());
+		if(null==teacher1){
+			throw new BizException("教师信息不存在");
+		}
+		if(StringUtils.isNotEmpty(teacher.getPhone())){
+			SysUser sysUser = sysUserFeignService.queryUserByMobile(teacher.getPhone());
+			if(sysUser != null && !sysUser.getId().equals(teacher.getId())){
+				throw new BizException("手机号已存在");
+			}
+		}
+		if(Objects.nonNull(teacher.getEntryDate())&&Objects.nonNull(teacher.getFormalStaffDate())){
+			if(teacher.getEntryDate().compareTo(teacher.getFormalStaffDate())>0){
+				throw new BizException("入职日期不可晚于转正日期");
+			}
+		}
+		teacher.setUpdateTime(new Date());
+		teacher.setTeacherOrganId(teacher.getOrganId());
+		teacherDao.update(teacher);
+		teacher.setOrganId(null);
+		teacherDao.updateUser(teacher);
+		imGroupDao.updateNickname(teacher.getId(),teacher.getRealName());
+		imGroupDao.updateUserFriendNickname(teacher.getId(),teacher.getRealName());
+		imFeignService.update(new ImUserModel(teacher.getId().toString(),teacher.getRealName(),teacher.getAvatar()));
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public void updateTea(Teacher teacher) {
 		Teacher teacher1 = teacherDao.get(teacher.getId());
 		if(null==teacher1){

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

@@ -55,7 +55,7 @@ public class TeacherController extends BaseController {
         }
         teacher.setUpdateTime(new Date());
         teacher.setId(sysUser.getId());
-        teacherService.updateTea(teacher);
+        teacherService.updateTea1(teacher);
         return succeed();
     }
 

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

@@ -78,6 +78,15 @@ public class TeacherController extends BaseController {
         return succeed();
     }
 
+    @ApiOperation(value = "修改教师信息(不包含离职日期等信息)")
+    @PostMapping("/update1")
+    @PreAuthorize("@pcs.hasPermissions('teacher/update1')")
+    @AuditLogAnnotation(operateName = "修改教师信息(不包含离职日期等信息)")
+    public Object update1(Teacher teacher) {
+        teacherService.updateTea1(teacher);
+        return succeed();
+    }
+
     @ApiOperation(value = "根据教师编号查询教师基本信息")
     @GetMapping("/get")
     @ApiParam(value = "教师编号", required = true)