|
|
@@ -846,6 +846,7 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
|
|
|
changeBed.setName(sourceBed.getName());
|
|
|
changeBed.setMajorId(sourceBed.getMajorId());
|
|
|
changeBed.setMajor(sourceBed.getMajor());
|
|
|
+ changeBed.setInstructor(sourceBed.getInstructor());
|
|
|
welcomeBeds.add(changeBed);
|
|
|
|
|
|
sourceBed.setIsCheck(0);
|
|
|
@@ -856,6 +857,7 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
|
|
|
sourceBed.setName(null);
|
|
|
sourceBed.setMajorId(null);
|
|
|
sourceBed.setMajor(null);
|
|
|
+ sourceBed.setInstructor(null);
|
|
|
welcomeBeds.add(sourceBed);
|
|
|
|
|
|
// 修改寝室信息
|
|
|
@@ -911,16 +913,100 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
|
|
|
if (ObjectUtils.isEmpty(sourceBed) || ObjectUtils.isEmpty(changeBed)) {
|
|
|
return CommonResult.fail("床位不存在");
|
|
|
}
|
|
|
+// 源数据
|
|
|
String studentCard = sourceBed.getStudentCard();
|
|
|
String cardNum = sourceBed.getCardNum();
|
|
|
Integer classstrId = sourceBed.getClassstrId();
|
|
|
String classstr = sourceBed.getClassstr();
|
|
|
String name = sourceBed.getName();
|
|
|
Integer majorId = sourceBed.getMajorId();
|
|
|
- sourceBed.getMajor();
|
|
|
-// welcomeBeds.add(changeBed);
|
|
|
+ String major = sourceBed.getMajor();
|
|
|
+ String instructor = sourceBed.getInstructor();
|
|
|
+
|
|
|
+// 交换床位数据
|
|
|
+ String studentCard2 = changeBed.getStudentCard();
|
|
|
+ String cardNum2 = changeBed.getCardNum();
|
|
|
+ Integer classstrId2 = changeBed.getClassstrId();
|
|
|
+ String classstr2 = changeBed.getClassstr();
|
|
|
+ String name2 = changeBed.getName();
|
|
|
+ Integer majorId2 = changeBed.getMajorId();
|
|
|
+ String major2 = changeBed.getMajor();
|
|
|
+ String instructor2 = changeBed.getInstructor();
|
|
|
+
|
|
|
+
|
|
|
+ sourceBed.setStudentCard(studentCard2);
|
|
|
+ sourceBed.setCardNum(cardNum2);
|
|
|
+ sourceBed.setClassstrId(classstrId2);
|
|
|
+ sourceBed.setClassstr(classstr2);
|
|
|
+ sourceBed.setName(name2);
|
|
|
+ sourceBed.setMajorId(majorId2);
|
|
|
+ sourceBed.setMajor(major2);
|
|
|
+ sourceBed.setInstructor(instructor2);
|
|
|
+
|
|
|
+ changeBed.setStudentCard(studentCard);
|
|
|
+ changeBed.setCardNum(cardNum);
|
|
|
+ changeBed.setClassstrId(classstrId);
|
|
|
+ changeBed.setClassstr(classstr);
|
|
|
+ changeBed.setName(name);
|
|
|
+ changeBed.setMajorId(majorId);
|
|
|
+ changeBed.setMajor(major);
|
|
|
+ changeBed.setInstructor(instructor);
|
|
|
+
|
|
|
+ ArrayList<WelcomeBed> welcomeBeds = new ArrayList<>();
|
|
|
+ welcomeBeds.add(sourceBed);
|
|
|
+ welcomeBeds.add(changeBed);
|
|
|
+
|
|
|
+ welcomeBedService.updateBatchById(welcomeBeds);
|
|
|
+ return CommonResult.ok();
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public CommonResult studentAccommodationPage(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrId, String name) {
|
|
|
+ PageUtils<WelcomeBed> result = welcomeBedService.studentAccommodationPage(currentPage, pageCount, schoolId, buildId, dormitoryId,collegeId, majorId, classstrId,name);
|
|
|
+ return CommonResult.ok(result);
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void studentAccommodationListExport(HttpServletResponse response, Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrId, String name) {
|
|
|
+ List<WelcomeBed> result=welcomeBedService.studentAccommodationList( schoolId, buildId, dormitoryId,collegeId, majorId, classstrId,name);
|
|
|
+
|
|
|
+ //导出
|
|
|
+ Workbook workbook = new XSSFWorkbook();
|
|
|
+ Sheet sheet = workbook.createSheet("床位信息");
|
|
|
+
|
|
|
+ Row headerRow = sheet.createRow(0);
|
|
|
+ headerRow.createCell(0).setCellValue("序号");
|
|
|
+ headerRow.createCell(1).setCellValue("录取号");
|
|
|
+ headerRow.createCell(2).setCellValue("学生姓名");
|
|
|
+ headerRow.createCell(3).setCellValue("校区名称");
|
|
|
+ headerRow.createCell(4).setCellValue("学院");
|
|
|
+ headerRow.createCell(5).setCellValue("专业");
|
|
|
+ headerRow.createCell(6).setCellValue("班级");
|
|
|
+ headerRow.createCell(7).setCellValue("性别");
|
|
|
+ headerRow.createCell(8).setCellValue("楼栋名称");
|
|
|
+ headerRow.createCell(9).setCellValue("寝室号");
|
|
|
+ headerRow.createCell(10).setCellValue("床位号");
|
|
|
+ headerRow.createCell(11).setCellValue("辅导员");
|
|
|
+
|
|
|
+ for (int i = 0; i < result.size(); i++) {
|
|
|
+ WelcomeBed bed = result.get(i);
|
|
|
+ Row dataRow = sheet.createRow(i + 1);
|
|
|
+ dataRow.createCell(0).setCellValue(i + 1);
|
|
|
+ dataRow.createCell(1).setCellValue(bed.getCardNum());
|
|
|
+ dataRow.createCell(2).setCellValue(bed.getName());
|
|
|
+ dataRow.createCell(3).setCellValue(bed.getSchool());
|
|
|
+ dataRow.createCell(4).setCellValue(bed.getCollege());
|
|
|
+ dataRow.createCell(5).setCellValue(bed.getMajor());
|
|
|
+ dataRow.createCell(6).setCellValue(bed.getClassstr());
|
|
|
+ dataRow.createCell(7).setCellValue(bed.getSex());
|
|
|
+ dataRow.createCell(8).setCellValue(bed.getBuild());
|
|
|
+ dataRow.createCell(9).setCellValue(bed.getDormitory());
|
|
|
+ dataRow.createCell(10).setCellValue(bed.getNumber());
|
|
|
+ dataRow.createCell(11).setCellValue(bed.getInstructor());
|
|
|
+ }
|
|
|
+ // 将工作簿写入文件
|
|
|
+ ExcelUtils.excelDownload(workbook, "学生住宿信息.xlsx", response);
|
|
|
|
|
|
- return null;
|
|
|
}
|
|
|
}
|
|
|
|