|
@@ -29,10 +29,7 @@ import com.xjrsoft.common.sms.SmsCtcc;
|
|
import com.xjrsoft.common.utils.RedisUtil;
|
|
import com.xjrsoft.common.utils.RedisUtil;
|
|
import com.xjrsoft.common.utils.TreeUtil;
|
|
import com.xjrsoft.common.utils.TreeUtil;
|
|
import com.xjrsoft.common.utils.VoToColumnUtil;
|
|
import com.xjrsoft.common.utils.VoToColumnUtil;
|
|
-import com.xjrsoft.config.CommonPropertiesConfig;
|
|
|
|
-import com.xjrsoft.module.base.dto.BaseClassroomChangeStatusDto;
|
|
|
|
import com.xjrsoft.module.base.entity.BaseClass;
|
|
import com.xjrsoft.module.base.entity.BaseClass;
|
|
-import com.xjrsoft.module.base.entity.BaseClassroom;
|
|
|
|
import com.xjrsoft.module.base.entity.BaseGrade;
|
|
import com.xjrsoft.module.base.entity.BaseGrade;
|
|
import com.xjrsoft.module.base.service.IBaseClassService;
|
|
import com.xjrsoft.module.base.service.IBaseClassService;
|
|
import com.xjrsoft.module.base.service.IBaseGradeService;
|
|
import com.xjrsoft.module.base.service.IBaseGradeService;
|
|
@@ -90,7 +87,6 @@ import com.xjrsoft.module.system.entity.File;
|
|
import com.xjrsoft.module.system.service.IFileService;
|
|
import com.xjrsoft.module.system.service.IFileService;
|
|
import com.xjrsoft.module.teacher.entity.BaseTeacher;
|
|
import com.xjrsoft.module.teacher.entity.BaseTeacher;
|
|
import com.xjrsoft.module.workflow.constant.WorkflowConstant;
|
|
import com.xjrsoft.module.workflow.constant.WorkflowConstant;
|
|
-import com.xjrsoft.module.workflow.mapper.WorkflowExtraMapper;
|
|
|
|
import com.xjrsoft.module.workflow.service.IWorkflowExecuteService;
|
|
import com.xjrsoft.module.workflow.service.IWorkflowExecuteService;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
@@ -390,6 +386,9 @@ public class UserController {
|
|
if (userStudentVo != null) {
|
|
if (userStudentVo != null) {
|
|
vo.setClassId(userStudentVo.getClassId());
|
|
vo.setClassId(userStudentVo.getClassId());
|
|
vo.setClassName(userStudentVo.getClassName());
|
|
vo.setClassName(userStudentVo.getClassName());
|
|
|
|
+ vo.setTeacherId(userStudentVo.getTeacherId());
|
|
|
|
+ vo.setTeacherName(userStudentVo.getTeacherName());
|
|
|
|
+ vo.setTeacherMobile(userStudentVo.getTeacherMobile());
|
|
}
|
|
}
|
|
|
|
|
|
List<File> fileList = fileService.list(Wrappers.lambdaQuery(File.class).eq(File::getFolderId, user.getSignFolderId()));
|
|
List<File> fileList = fileService.list(Wrappers.lambdaQuery(File.class).eq(File::getFolderId, user.getSignFolderId()));
|