|
@@ -6,10 +6,7 @@ import com.ym.mec.auth.api.enums.SysUserType;
|
|
|
import com.ym.mec.auth.api.enums.YesOrNoEnum;
|
|
|
import com.ym.mec.biz.dal.dao.*;
|
|
|
import com.ym.mec.biz.dal.dto.*;
|
|
|
-import com.ym.mec.biz.dal.entity.MusicGroup;
|
|
|
-import com.ym.mec.biz.dal.entity.School;
|
|
|
-import com.ym.mec.biz.dal.entity.SysUserCashAccount;
|
|
|
-import com.ym.mec.biz.dal.entity.Teacher;
|
|
|
+import com.ym.mec.biz.dal.entity.*;
|
|
|
import com.ym.mec.biz.dal.page.MusicGroupTeacherAttendanceQueryInfo;
|
|
|
import com.ym.mec.biz.dal.page.TeacherCloseQueryInfo;
|
|
|
import com.ym.mec.biz.dal.page.TeacherQueryInfo;
|
|
@@ -59,7 +56,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> imple
|
|
|
@Autowired
|
|
|
private ImFeignService imFeignService;
|
|
|
@Autowired
|
|
|
- private ContractService contractService;
|
|
|
+ private SysConfigDao configDao;
|
|
|
|
|
|
|
|
|
@Override
|
|
@@ -94,8 +91,12 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> imple
|
|
|
//添加用户现金账户
|
|
|
sysUserCashAccountDao.insert(new SysUserCashAccount(teacher.getId(),"CNY"));
|
|
|
//添加用户电子签章账户
|
|
|
- contractService.register(teacher.getId(), user.getRealName(), user.getIdCardNo(), user.getPhone());
|
|
|
+// contractService.register(teacher.getId(), user.getRealName(), user.getIdCardNo(), user.getPhone());
|
|
|
teacherDao.insert(teacher);
|
|
|
+ if(StringUtils.isEmpty(teacher.getAvatar())){
|
|
|
+ SysConfig head_url = configDao.findByParamName("user_default_head_url");
|
|
|
+ teacher.setAvatar(head_url.getParanValue());
|
|
|
+ }
|
|
|
ImResult imResult = imFeignService.register(new ImUserModel(teacher.getId().toString(), teacher.getUsername(), teacher.getAvatar()));
|
|
|
if(imResult != null){
|
|
|
teacher.setImToken(imResult.getToken());
|
|
@@ -163,11 +164,8 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> imple
|
|
|
//获取当前班级老师总数
|
|
|
Integer num = numsMap.get(e.getId());
|
|
|
e.setCount(num == null?0:num + e.getCount());
|
|
|
-// e.setId("cg" + e.getId());
|
|
|
});
|
|
|
-// imGroupModels.addAll(imGroupModels1);
|
|
|
}
|
|
|
-
|
|
|
return imGroupModels;
|
|
|
}
|
|
|
|