|
|
@@ -1260,19 +1260,20 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
|
|
|
*/
|
|
|
@Override
|
|
|
public ByteArrayOutputStream exportQuery(CourseTableExportQueryDto dto) throws IOException {
|
|
|
- BaseSemester semester = baseSemesterMapper.selectById(dto.getSemesterId());
|
|
|
- //根据年级、专业部,查询需要导出的班级
|
|
|
- List<BaseClass> classList = baseClassService.list(
|
|
|
- new QueryWrapper<BaseClass>().lambda()
|
|
|
- .eq(BaseClass::getDeleteMark, DeleteMark.NODELETE.getCode())
|
|
|
- .eq(BaseClass::getIsGraduate, 1)
|
|
|
- .in(BaseClass::getGradeId, dto.getGradeIds())
|
|
|
- .in(BaseClass::getOrgId, dto.getDeptIds())
|
|
|
- );
|
|
|
+ BaseSemester baseSemester = baseSemesterMapper.selectById(dto.getSemesterId());
|
|
|
CourseTableExportQueryUtil exportQueryUtil = new CourseTableExportQueryUtil();
|
|
|
String schoolName = "重庆市铜梁职业教育中心";
|
|
|
ByteArrayOutputStream bot = new ByteArrayOutputStream();
|
|
|
- if("calss".equals(dto.getCourseType())){
|
|
|
+ if("calss".equals(dto.getCourseType())){//班级课表
|
|
|
+ //根据年级、专业部,查询需要导出的班级
|
|
|
+ List<BaseClass> classList = baseClassService.list(
|
|
|
+ new QueryWrapper<BaseClass>().lambda()
|
|
|
+ .eq(BaseClass::getDeleteMark, DeleteMark.NODELETE.getCode())
|
|
|
+ .eq(BaseClass::getIsGraduate, 1)
|
|
|
+ .in(BaseClass::getGradeId, dto.getGradeIds())
|
|
|
+ .in(BaseClass::getOrgId, dto.getDeptIds())
|
|
|
+ );
|
|
|
+
|
|
|
Workbook workbook = new XSSFWorkbook();
|
|
|
String sheetName = "班级课表";
|
|
|
Sheet sheet = workbook.createSheet(sheetName);
|
|
|
@@ -1291,9 +1292,9 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
|
|
|
|
|
|
int bigHeadRow = (classTableRowCount + 2) * i;
|
|
|
//生成第一行title
|
|
|
- ImportExcelUtil.createBigHead(workbook, sheet, bigHead, bigHeadRow, 9);
|
|
|
+ ImportExcelUtil.createBigHead(workbook, sheet, bigHead, bigHeadRow, 8);
|
|
|
//生成副标题,展示所属学期
|
|
|
- ImportExcelUtil.createSubtitle(workbook, sheet, semester.getName(), bigHeadRow + 1, 9);
|
|
|
+ ImportExcelUtil.createSubtitle(workbook, sheet, baseSemester.getName(), bigHeadRow + 1, 8);
|
|
|
//生成第三行,显示学校名字、班主任和班级名字
|
|
|
exportQueryUtil.createThirdTitle(workbook, sheet, bigHeadRow + 2, schoolName, rightName);
|
|
|
//生成表头
|
|
|
@@ -1302,6 +1303,25 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
|
|
|
exportQueryUtil.createContent(workbook, sheet, bigHeadRow + 4, tableVo, dto.getCourseType());
|
|
|
}
|
|
|
workbook.write(bot);
|
|
|
+ }else if("teacher".equals(dto.getCourseType())){//教师课表
|
|
|
+ //根据学期和周次,查询当前所有有课表的教师id
|
|
|
+ LocalDateTime startDateTime = LocalDateTime.ofInstant(baseSemester.getTeachingStart().toInstant(), ZoneId.systemDefault());
|
|
|
+
|
|
|
+ LocalDate startDate = startDateTime.plusDays((dto.getWeek() - 1) * 7L).toLocalDate();
|
|
|
+ LocalDate endDate = startDate.plusDays(6);
|
|
|
+
|
|
|
+ List<CourseTable> list = this.list(
|
|
|
+ new QueryWrapper<CourseTable>().lambda()
|
|
|
+ .eq(CourseTable::getBaseSemesterId, dto.getSemesterId())
|
|
|
+ .ge(CourseTable::getScheduleDate, startDate)
|
|
|
+ .le(CourseTable::getScheduleDate, endDate)
|
|
|
+ );
|
|
|
+
|
|
|
+
|
|
|
+ }else if("classroom".equals(dto.getCourseType())){//教室课表
|
|
|
+
|
|
|
+ }else if("all".equals(dto.getCourseType())){//总课表
|
|
|
+
|
|
|
}
|
|
|
|
|
|
return bot;
|