|
@@ -14,6 +14,7 @@ import com.qmth.teachcloud.common.bean.dto.excel.DescribeImportDto;
|
|
import com.qmth.teachcloud.common.bean.params.BasicCourseParams;
|
|
import com.qmth.teachcloud.common.bean.params.BasicCourseParams;
|
|
import com.qmth.teachcloud.common.bean.result.BasicCourseResult;
|
|
import com.qmth.teachcloud.common.bean.result.BasicCourseResult;
|
|
import com.qmth.teachcloud.common.bean.result.ClazzDatasourceResult;
|
|
import com.qmth.teachcloud.common.bean.result.ClazzDatasourceResult;
|
|
|
|
+import com.qmth.teachcloud.common.bean.result.SysUserResult;
|
|
import com.qmth.teachcloud.common.bean.result.TeachCourseSelectResult;
|
|
import com.qmth.teachcloud.common.bean.result.TeachCourseSelectResult;
|
|
import com.qmth.teachcloud.common.contant.SystemConstant;
|
|
import com.qmth.teachcloud.common.contant.SystemConstant;
|
|
import com.qmth.teachcloud.common.entity.*;
|
|
import com.qmth.teachcloud.common.entity.*;
|
|
@@ -26,6 +27,7 @@ import com.qmth.teachcloud.common.util.excel.ExcelError;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
+import org.springframework.util.CollectionUtils;
|
|
import org.springframework.util.LinkedMultiValueMap;
|
|
import org.springframework.util.LinkedMultiValueMap;
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
@@ -51,9 +53,6 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
|
|
@Resource
|
|
@Resource
|
|
private BasicCourseMapper basicCourseMapper;
|
|
private BasicCourseMapper basicCourseMapper;
|
|
|
|
|
|
- @Resource
|
|
|
|
- private TeachcloudCommonService teachcloudCommonService;
|
|
|
|
-
|
|
|
|
@Resource
|
|
@Resource
|
|
private SysOrgService sysOrgService;
|
|
private SysOrgService sysOrgService;
|
|
|
|
|
|
@@ -66,8 +65,11 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
|
|
@Resource
|
|
@Resource
|
|
private BasicRoleDataPermissionService basicRoleDataPermissionService;
|
|
private BasicRoleDataPermissionService basicRoleDataPermissionService;
|
|
|
|
|
|
-// @Resource
|
|
|
|
-// private SysUserService sysUserService;
|
|
|
|
|
|
+ @Resource
|
|
|
|
+ BasicTeachCourseService basicTeachCourseService;
|
|
|
|
+
|
|
|
|
+ @Resource
|
|
|
|
+ private SysUserService sysUserService;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public List<BasicCourse> listCoursesByUserId(Long userId) {
|
|
public List<BasicCourse> listCoursesByUserId(Long userId) {
|
|
@@ -147,8 +149,17 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
|
|
clazzDatasourceResultList.add(clazzDatasourceResult);
|
|
clazzDatasourceResultList.add(clazzDatasourceResult);
|
|
}
|
|
}
|
|
basicCourseResult.setClazzList(clazzDatasourceResultList);
|
|
basicCourseResult.setClazzList(clazzDatasourceResultList);
|
|
- } else {
|
|
|
|
- basicCourseResult.setClazzList(new ArrayList<>());
|
|
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ List<BasicTeachCourse> basicTeachCourseList = basicTeachCourseService.list(new QueryWrapper<BasicTeachCourse>().lambda().eq(BasicTeachCourse::getCourseId, courseId));
|
|
|
|
+ if (!CollectionUtils.isEmpty(basicTeachCourseList)) {
|
|
|
|
+ List<SysUserResult> sysUserResultList = new ArrayList<>();
|
|
|
|
+ Set<Long> teachIdSet = basicTeachCourseList.stream().map(s -> s.getUserId()).collect(Collectors.toSet());
|
|
|
|
+ List<SysUser> sysUserList = sysUserService.list(new QueryWrapper<SysUser>().lambda().in(SysUser::getId, teachIdSet));
|
|
|
|
+ for (SysUser sysUser : sysUserList) {
|
|
|
|
+ sysUserResultList.add(new SysUserResult(sysUser));
|
|
|
|
+ }
|
|
|
|
+ basicCourseResult.setTeachList(sysUserResultList);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return iPage;
|
|
return iPage;
|
|
@@ -194,6 +205,10 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
|
|
.in(BasicUserCourse::getCourseId, idList)
|
|
.in(BasicUserCourse::getCourseId, idList)
|
|
.eq(BasicUserCourse::getSchoolId, sysUser.getSchoolId()));
|
|
.eq(BasicUserCourse::getSchoolId, sysUser.getSchoolId()));
|
|
|
|
|
|
|
|
+ // 老师批量删除
|
|
|
|
+ basicTeachCourseService.remove(new QueryWrapper<BasicTeachCourse>().lambda()
|
|
|
|
+ .in(BasicTeachCourse::getCourseId, idList)
|
|
|
|
+ .eq(BasicTeachCourse::getSchoolId, sysUser.getSchoolId()));
|
|
return this.removeByIds(idList);
|
|
return this.removeByIds(idList);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -381,14 +396,20 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
|
|
Set<Long> clazzIdSet = basicUserCourseList.stream().map(BasicUserCourse::getClazzId).collect(Collectors.toSet());
|
|
Set<Long> clazzIdSet = basicUserCourseList.stream().map(BasicUserCourse::getClazzId).collect(Collectors.toSet());
|
|
if (clazzIdSet.size() > 0) {
|
|
if (clazzIdSet.size() > 0) {
|
|
List<BasicClazz> clazzList = basicClazzService.list(new QueryWrapper<BasicClazz>().lambda().in(BasicClazz::getId, clazzIdSet).orderByAsc(BasicClazz::getCreateTime));
|
|
List<BasicClazz> clazzList = basicClazzService.list(new QueryWrapper<BasicClazz>().lambda().in(BasicClazz::getId, clazzIdSet).orderByAsc(BasicClazz::getCreateTime));
|
|
- if (clazzList.isEmpty()) {
|
|
|
|
- basicCourseExportDto.setClazzName("");
|
|
|
|
- } else {
|
|
|
|
|
|
+ if (!clazzList.isEmpty()) {
|
|
List<String> clazzNameList = clazzList.stream().map(BasicClazz::getClazzName).collect(Collectors.toList());
|
|
List<String> clazzNameList = clazzList.stream().map(BasicClazz::getClazzName).collect(Collectors.toList());
|
|
basicCourseExportDto.setClazzName(String.join(",", clazzNameList));
|
|
basicCourseExportDto.setClazzName(String.join(",", clazzNameList));
|
|
}
|
|
}
|
|
- } else {
|
|
|
|
- basicCourseExportDto.setClazzName("");
|
|
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ List<BasicTeachCourse> basicTeachCourseList = basicTeachCourseService.list(new QueryWrapper<BasicTeachCourse>().lambda().eq(BasicTeachCourse::getCourseId, courseId));
|
|
|
|
+ Set<Long> teachIdSet = basicTeachCourseList.stream().map(BasicTeachCourse::getUserId).collect(Collectors.toSet());
|
|
|
|
+ if (!CollectionUtils.isEmpty(teachIdSet)) {
|
|
|
|
+ List<SysUser> sysUserList = sysUserService.list(new QueryWrapper<SysUser>().lambda().in(SysUser::getId, teachIdSet));
|
|
|
|
+ if (!sysUserList.isEmpty()) {
|
|
|
|
+ List<String> teachNameList = sysUserList.stream().map(SysUser::getRealName).collect(Collectors.toList());
|
|
|
|
+ basicCourseExportDto.setTeachName(String.join(",", teachNameList));
|
|
|
|
+ }
|
|
}
|
|
}
|
|
basicCourseExportDto.setEnableName(basicCourseExportDto.getEnable() ? "启用" : "禁用");
|
|
basicCourseExportDto.setEnableName(basicCourseExportDto.getEnable() ? "启用" : "禁用");
|
|
}
|
|
}
|
|
@@ -396,7 +417,7 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public List<TeachCourseSelectResult> listByOrgId(Long orgId,Long schoolId) {
|
|
|
|
|
|
+ public List<TeachCourseSelectResult> listByOrgId(Long orgId, Long schoolId) {
|
|
List<Long> temp = new ArrayList<>();
|
|
List<Long> temp = new ArrayList<>();
|
|
temp.add(orgId);
|
|
temp.add(orgId);
|
|
|
|
|
|
@@ -406,10 +427,10 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
|
|
// 全校学院级机构map
|
|
// 全校学院级机构map
|
|
Map<Long, String> collegeMap = new HashMap<>();
|
|
Map<Long, String> collegeMap = new HashMap<>();
|
|
for (Long teachRoomId : orgIdSet) {
|
|
for (Long teachRoomId : orgIdSet) {
|
|
- if (!collegeMap.containsKey(teachRoomId)){
|
|
|
|
|
|
+ if (!collegeMap.containsKey(teachRoomId)) {
|
|
SysOrg sysOrg = sysOrgService.findCollegeLevelOrgByOrgId(teachRoomId);
|
|
SysOrg sysOrg = sysOrgService.findCollegeLevelOrgByOrgId(teachRoomId);
|
|
- if (Objects.nonNull(sysOrg)){
|
|
|
|
- collegeMap.put(teachRoomId,sysOrg.getName());
|
|
|
|
|
|
+ if (Objects.nonNull(sysOrg)) {
|
|
|
|
+ collegeMap.put(teachRoomId, sysOrg.getName());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -485,10 +506,14 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
|
|
basicCourse.setId(id);
|
|
basicCourse.setId(id);
|
|
basicCourse.setUpdateId(sysUser.getId());
|
|
basicCourse.setUpdateId(sysUser.getId());
|
|
}
|
|
}
|
|
|
|
+ basicCourseParams.setId(basicCourse.getId());
|
|
basicCourse.setOrgId(orgId);
|
|
basicCourse.setOrgId(orgId);
|
|
|
|
|
|
// 根据课程id和授课班级集合更新'basic_user_course'表
|
|
// 根据课程id和授课班级集合更新'basic_user_course'表
|
|
basicUserCourseService.updateByCourseIdAndClazzList(id, clazzIdSet, sysUser, orgId);
|
|
basicUserCourseService.updateByCourseIdAndClazzList(id, clazzIdSet, sysUser, orgId);
|
|
|
|
+ if (!CollectionUtils.isEmpty(basicCourseParams.getTeachIdSet())) {
|
|
|
|
+ basicTeachCourseService.updateByCourseIdAndTeacherList(id, basicCourseParams.getTeachIdSet());
|
|
|
|
+ }
|
|
|
|
|
|
basicCourseList.add(basicCourse);
|
|
basicCourseList.add(basicCourse);
|
|
}
|
|
}
|