|
@@ -72,48 +72,48 @@ public class BasicClazzServiceImpl extends ServiceImpl<BasicClazzMapper, BasicCl
|
|
}
|
|
}
|
|
SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
|
|
SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
|
|
// 业务处理 - 判断'exam_task_print'表中是否已经选中该班级
|
|
// 业务处理 - 判断'exam_task_print'表中是否已经选中该班级
|
|
- List<Map<Object,Object>> mapList = basicClazzMapper.findExamTaskPrintByClazzIdSet(schoolId,idList);
|
|
|
|
- if (mapList.size() > 0){
|
|
|
|
|
|
+ List<Map<Object, Object>> mapList = basicClazzMapper.findExamTaskPrintByClazzIdSet(schoolId, idList);
|
|
|
|
+ if (mapList.size() > 0) {
|
|
StringBuilder clazzNames = new StringBuilder();
|
|
StringBuilder clazzNames = new StringBuilder();
|
|
for (Map<Object, Object> map : mapList) {
|
|
for (Map<Object, Object> map : mapList) {
|
|
clazzNames.append(map.get("clazzName")).append(",");
|
|
clazzNames.append(map.get("clazzName")).append(",");
|
|
}
|
|
}
|
|
- throw ExceptionResultEnum.ERROR.exception("【班级】 : " + clazzNames.substring(0,clazzNames.length() - 1) + "生成了未结束的印刷任务,无法删除");
|
|
|
|
|
|
+ throw ExceptionResultEnum.ERROR.exception("【班级】 : " + clazzNames.substring(0, clazzNames.length() - 1) + "生成了未结束的印刷任务,无法删除");
|
|
}
|
|
}
|
|
|
|
|
|
// 异常处理
|
|
// 异常处理
|
|
String errorStudent = "";
|
|
String errorStudent = "";
|
|
String errorCourse = "";
|
|
String errorCourse = "";
|
|
- List<BasicStudent> basicStudentCheck = basicStudentService.list(new QueryWrapper<BasicStudent>().lambda().eq(BasicStudent::getEnable,true).in(BasicStudent::getClazzId,idList));
|
|
|
|
- if (basicStudentCheck.size() > 0){
|
|
|
|
|
|
+ List<BasicStudent> basicStudentCheck = basicStudentService.list(new QueryWrapper<BasicStudent>().lambda().eq(BasicStudent::getEnable, true).in(BasicStudent::getClazzId, idList));
|
|
|
|
+ if (basicStudentCheck.size() > 0) {
|
|
Set<Long> ids = basicStudentCheck.stream().map(BasicStudent::getClazzId).collect(Collectors.toSet());
|
|
Set<Long> ids = basicStudentCheck.stream().map(BasicStudent::getClazzId).collect(Collectors.toSet());
|
|
List<String> exStudentClazz = this.list(new QueryWrapper<BasicClazz>().lambda()
|
|
List<String> exStudentClazz = this.list(new QueryWrapper<BasicClazz>().lambda()
|
|
- .in(BasicClazz::getId,ids)).stream().map(BasicClazz::getClazzName).collect(Collectors.toList());
|
|
|
|
- errorStudent = StringUtils.join(exStudentClazz,',');
|
|
|
|
|
|
+ .in(BasicClazz::getId, ids)).stream().map(BasicClazz::getClazzName).collect(Collectors.toList());
|
|
|
|
+ errorStudent = StringUtils.join(exStudentClazz, ',');
|
|
}
|
|
}
|
|
|
|
|
|
List<BasicUserCourse> basicUserCourseCheck = basicUserCourseService.list(new QueryWrapper<BasicUserCourse>().lambda()
|
|
List<BasicUserCourse> basicUserCourseCheck = basicUserCourseService.list(new QueryWrapper<BasicUserCourse>().lambda()
|
|
- .in(BasicUserCourse::getClazzId,idList)
|
|
|
|
- .eq(BasicUserCourse::getEnable,true));
|
|
|
|
- if (basicUserCourseCheck.size() > 0){
|
|
|
|
|
|
+ .in(BasicUserCourse::getClazzId, idList)
|
|
|
|
+ .eq(BasicUserCourse::getEnable, true));
|
|
|
|
+ if (basicUserCourseCheck.size() > 0) {
|
|
Set<Long> ids = basicUserCourseCheck.stream().map(BasicUserCourse::getClazzId).collect(Collectors.toSet());
|
|
Set<Long> ids = basicUserCourseCheck.stream().map(BasicUserCourse::getClazzId).collect(Collectors.toSet());
|
|
- List<String> exUserCourseClazz = this.list(new QueryWrapper<BasicClazz>().lambda().in(BasicClazz::getId,ids)).stream().map(BasicClazz::getClazzName).collect(Collectors.toList());
|
|
|
|
- errorCourse = StringUtils.join(exUserCourseClazz,',');
|
|
|
|
|
|
+ List<String> exUserCourseClazz = this.list(new QueryWrapper<BasicClazz>().lambda().in(BasicClazz::getId, ids)).stream().map(BasicClazz::getClazzName).collect(Collectors.toList());
|
|
|
|
+ errorCourse = StringUtils.join(exUserCourseClazz, ',');
|
|
}
|
|
}
|
|
|
|
|
|
- if (SystemConstant.strNotNull(errorStudent) && SystemConstant.strNotNull(errorCourse)){
|
|
|
|
|
|
+ if (SystemConstant.strNotNull(errorStudent) && SystemConstant.strNotNull(errorCourse)) {
|
|
throw ExceptionResultEnum.ERROR.exception("学生已绑定了要删除的【班级】 : " + errorStudent + ",课程已绑定了要删除的【班级】 : " + errorCourse);
|
|
throw ExceptionResultEnum.ERROR.exception("学生已绑定了要删除的【班级】 : " + errorStudent + ",课程已绑定了要删除的【班级】 : " + errorCourse);
|
|
- } else if (SystemConstant.strNotNull(errorStudent) && !SystemConstant.strNotNull(errorCourse)){
|
|
|
|
|
|
+ } else if (SystemConstant.strNotNull(errorStudent) && !SystemConstant.strNotNull(errorCourse)) {
|
|
throw ExceptionResultEnum.ERROR.exception("学生已绑定了要删除的【班级】 : " + errorStudent);
|
|
throw ExceptionResultEnum.ERROR.exception("学生已绑定了要删除的【班级】 : " + errorStudent);
|
|
- } else if (SystemConstant.strNotNull(errorCourse) && !SystemConstant.strNotNull(errorCourse)){
|
|
|
|
|
|
+ } else if (SystemConstant.strNotNull(errorCourse) && !SystemConstant.strNotNull(errorCourse)) {
|
|
throw ExceptionResultEnum.ERROR.exception("课程已绑定了要删除的【班级】 : " + errorCourse);
|
|
throw ExceptionResultEnum.ERROR.exception("课程已绑定了要删除的【班级】 : " + errorCourse);
|
|
}
|
|
}
|
|
|
|
|
|
// 物理删除
|
|
// 物理删除
|
|
// 删除课程班级绑定关系
|
|
// 删除课程班级绑定关系
|
|
basicUserCourseService.remove(new QueryWrapper<BasicUserCourse>().lambda()
|
|
basicUserCourseService.remove(new QueryWrapper<BasicUserCourse>().lambda()
|
|
- .eq(BasicUserCourse::getEnable,false)
|
|
|
|
- .in(BasicUserCourse::getClazzId,idList));
|
|
|
|
|
|
+ .eq(BasicUserCourse::getEnable, false)
|
|
|
|
+ .in(BasicUserCourse::getClazzId, idList));
|
|
return this.removeByIds(idList);
|
|
return this.removeByIds(idList);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -174,9 +174,9 @@ public class BasicClazzServiceImpl extends ServiceImpl<BasicClazzMapper, BasicCl
|
|
|
|
|
|
BasicClazzParams basicClazzParams = new BasicClazzParams();
|
|
BasicClazzParams basicClazzParams = new BasicClazzParams();
|
|
basicClazzParams.setCampusId(basicCampusService.getOne(new QueryWrapper<BasicCampus>().lambda()
|
|
basicClazzParams.setCampusId(basicCampusService.getOne(new QueryWrapper<BasicCampus>().lambda()
|
|
- .eq(BasicCampus::getSchoolId, schoolId)
|
|
|
|
- .eq(BasicCampus::getCampusName, campusName)
|
|
|
|
- .eq(BasicCampus::getEnable, true))
|
|
|
|
|
|
+ .eq(BasicCampus::getSchoolId, schoolId)
|
|
|
|
+ .eq(BasicCampus::getCampusName, campusName)
|
|
|
|
+ .eq(BasicCampus::getEnable, true))
|
|
.getId());
|
|
.getId());
|
|
basicClazzParams.setClazzName(clazzName);
|
|
basicClazzParams.setClazzName(clazzName);
|
|
|
|
|
|
@@ -217,30 +217,6 @@ public class BasicClazzServiceImpl extends ServiceImpl<BasicClazzMapper, BasicCl
|
|
}).collect(Collectors.toList());
|
|
}).collect(Collectors.toList());
|
|
}
|
|
}
|
|
|
|
|
|
- @Override
|
|
|
|
- public String findClazzNamesByClazzIds(String clazzIds, String separator) {
|
|
|
|
- if (!SystemConstant.strNotNull(separator)) {
|
|
|
|
- separator = ",";
|
|
|
|
- }
|
|
|
|
- if(StringUtils.isBlank(clazzIds)){
|
|
|
|
- return null;
|
|
|
|
- }
|
|
|
|
- String[] strArr = clazzIds.split(separator);
|
|
|
|
- Set<Long> clazzIdSet = Arrays.stream(strArr).map(SystemConstant::convertIdToLong).collect(Collectors.toSet());
|
|
|
|
- List<String> clazzNameList = this.findClazzNamesByClazzIdSet(clazzIdSet);
|
|
|
|
- return String.join(separator, clazzNameList);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- @Override
|
|
|
|
- public String findClazzNamesByClazzIds(List<Long> clazzIdList, String separator) {
|
|
|
|
- if (!SystemConstant.strNotNull(separator)) {
|
|
|
|
- separator = ",";
|
|
|
|
- }
|
|
|
|
- Set<Long> clazzIdSet = new HashSet<>(clazzIdList);
|
|
|
|
- List<String> clazzNameList = this.findClazzNamesByClazzIdSet(clazzIdSet);
|
|
|
|
- return String.join(separator,clazzNameList);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
/**
|
|
/**
|
|
* 基础班级保存助手方法
|
|
* 基础班级保存助手方法
|
|
*
|
|
*
|
|
@@ -252,7 +228,7 @@ public class BasicClazzServiceImpl extends ServiceImpl<BasicClazzMapper, BasicCl
|
|
Long schoolId = sysUser.getSchoolId();
|
|
Long schoolId = sysUser.getSchoolId();
|
|
List<BasicClazz> editEntityList = new ArrayList<>();
|
|
List<BasicClazz> editEntityList = new ArrayList<>();
|
|
for (BasicClazzParams basicClazzParams : basicClazzParamsList) {
|
|
for (BasicClazzParams basicClazzParams : basicClazzParamsList) {
|
|
- SystemConstant.verifyDBFields(basicClazzParams,basicClazzParams.getClass());
|
|
|
|
|
|
+ SystemConstant.verifyDBFields(basicClazzParams, basicClazzParams.getClass());
|
|
// 普通参数
|
|
// 普通参数
|
|
Long id = basicClazzParams.getId();
|
|
Long id = basicClazzParams.getId();
|
|
Long campusId = basicClazzParams.getCampusId();
|
|
Long campusId = basicClazzParams.getCampusId();
|
|
@@ -264,14 +240,14 @@ public class BasicClazzServiceImpl extends ServiceImpl<BasicClazzMapper, BasicCl
|
|
if (Objects.isNull(basicCampusService.getById(campusId))) {
|
|
if (Objects.isNull(basicCampusService.getById(campusId))) {
|
|
throw ExceptionResultEnum.ERROR.exception("所选校区不存在");
|
|
throw ExceptionResultEnum.ERROR.exception("所选校区不存在");
|
|
}
|
|
}
|
|
- if (Objects.isNull(basicMajorService.getById(majorId))){
|
|
|
|
|
|
+ if (Objects.isNull(basicMajorService.getById(majorId))) {
|
|
throw ExceptionResultEnum.ERROR.exception("所选专业不存在");
|
|
throw ExceptionResultEnum.ERROR.exception("所选专业不存在");
|
|
}
|
|
}
|
|
|
|
|
|
// 检验班级名称在学校的唯一性
|
|
// 检验班级名称在学校的唯一性
|
|
BasicClazz checkName = this.getOne(new QueryWrapper<BasicClazz>().lambda()
|
|
BasicClazz checkName = this.getOne(new QueryWrapper<BasicClazz>().lambda()
|
|
.eq(BasicClazz::getSchoolId, schoolId)
|
|
.eq(BasicClazz::getSchoolId, schoolId)
|
|
- .eq(BasicClazz::getMajorId,majorId)
|
|
|
|
|
|
+ .eq(BasicClazz::getMajorId, majorId)
|
|
.eq(BasicClazz::getEnable, true)
|
|
.eq(BasicClazz::getEnable, true)
|
|
.eq(BasicClazz::getClazzName, clazzName));
|
|
.eq(BasicClazz::getClazzName, clazzName));
|
|
if (Objects.nonNull(checkName)) {
|
|
if (Objects.nonNull(checkName)) {
|
|
@@ -309,9 +285,9 @@ public class BasicClazzServiceImpl extends ServiceImpl<BasicClazzMapper, BasicCl
|
|
basicClazz.setId(id);
|
|
basicClazz.setId(id);
|
|
basicClazz.setUpdateId(sysUser.getId());
|
|
basicClazz.setUpdateId(sysUser.getId());
|
|
// 如果更新了班级所属的专业或校区则更新学生级联关系
|
|
// 如果更新了班级所属的专业或校区则更新学生级联关系
|
|
- if (!majorId.equals(old.getMajorId()) || !campusId.equals(old.getCampusId())){
|
|
|
|
|
|
+ if (!majorId.equals(old.getMajorId()) || !campusId.equals(old.getCampusId())) {
|
|
List<BasicStudent> basicStudentList = basicStudentService.list(new QueryWrapper<BasicStudent>().lambda()
|
|
List<BasicStudent> basicStudentList = basicStudentService.list(new QueryWrapper<BasicStudent>().lambda()
|
|
- .eq(BasicStudent::getClazzId,id));
|
|
|
|
|
|
+ .eq(BasicStudent::getClazzId, id));
|
|
basicStudentList.forEach(e -> {
|
|
basicStudentList.forEach(e -> {
|
|
e.setBelongOrgId(basicMajorService.getById(majorId).getBelongOrgId());
|
|
e.setBelongOrgId(basicMajorService.getById(majorId).getBelongOrgId());
|
|
e.setMajorId(majorId);
|
|
e.setMajorId(majorId);
|
|
@@ -325,17 +301,4 @@ public class BasicClazzServiceImpl extends ServiceImpl<BasicClazzMapper, BasicCl
|
|
}
|
|
}
|
|
return editEntityList;
|
|
return editEntityList;
|
|
}
|
|
}
|
|
-
|
|
|
|
- /**
|
|
|
|
- * 根据clazzIdSet集合查询班级名称集合
|
|
|
|
- * @param clazzIdSet 班级idset
|
|
|
|
- * @return 班级名称集合
|
|
|
|
- */
|
|
|
|
- private List<String> findClazzNamesByClazzIdSet(Set<Long> clazzIdSet){
|
|
|
|
- List<BasicClazz> basicClazzList = new ArrayList<>();
|
|
|
|
- if (clazzIdSet.size() > 0){
|
|
|
|
- basicClazzList = this.list(new QueryWrapper<BasicClazz>().lambda().in(BasicClazz::getId,clazzIdSet));
|
|
|
|
- }
|
|
|
|
- return basicClazzList.stream().map(BasicClazz::getClazzName).collect(Collectors.toList());
|
|
|
|
- }
|
|
|
|
}
|
|
}
|