huangting/th-hotel-simple
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整Rooming List导出日期格式

Browse Source
This commit is contained in:
andy
2026-07-22 17:43:23 +07:00
parent 0de960372b
commit 76d253afc4
6 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/main/java/cn/nianxx/thhotel/workflows/reservation/service/impl/RoomingListExcelRenderer.java
View File

@@ -21,6 +21,8 @@ import org.springframework.stereotype.Component;
@Component
public class RoomingListExcelRenderer {
private static final DateTimeFormatter TARGET_DATE_FORMATTER =
DateTimeFormatter.ofPattern("yyyy/MM/dd");
private static final String[] HEADERS = {
"Line",
"Name",
@@ -98,8 +100,8 @@ public class RoomingListExcelRenderer {
row.createCell(1).setCellValue(room.primaryGuest().lastName());
row.createCell(2).setCellValue(room.primaryGuest().firstName());
row.createCell(3).setCellValue("");
row.createCell(4).setCellValue(arrival.format(DateTimeFormatter.ISO_LOCAL_DATE));
row.createCell(5).setCellValue(departure.format(DateTimeFormatter.ISO_LOCAL_DATE));
row.createCell(4).setCellValue(arrival.format(TARGET_DATE_FORMATTER));
row.createCell(5).setCellValue(departure.format(TARGET_DATE_FORMATTER));
row.createCell(6).setCellValue(defaultString(request.roomType()));
row.createCell(7).setCellValue("");
row.createCell(8).setCellValue(1);

4
server/src/test/java/cn/nianxx/thhotel/workflows/reservation/control/ReservationRoomingListGenerationControllerTest.java
View File

@@ -101,9 +101,9 @@ class ReservationRoomingListGenerationControllerTest {
.andExpect(result -> assertThat(workbookCell(result.getResponse().getContentAsByteArray(), 1, 3))
.isEmpty())
.andExpect(result -> assertThat(workbookCell(result.getResponse().getContentAsByteArray(), 1, 4))
.isEqualTo("2026-05-09"))
.isEqualTo("2026/05/09"))
.andExpect(result -> assertThat(workbookCell(result.getResponse().getContentAsByteArray(), 1, 5))
.isEqualTo("2026-05-14"))
.isEqualTo("2026/05/14"))
.andExpect(result -> assertThat(workbookCell(result.getResponse().getContentAsByteArray(), 1, 9))
.isEqualTo("2"))
.andExpect(result -> assertThat(workbookCell(result.getResponse().getContentAsByteArray(), 1, 10))

8
server/src/test/java/cn/nianxx/thhotel/workflows/reservation/service/impl/ReservationRoomingListGenerationServiceImplTest.java
View File

@@ -60,8 +60,8 @@ class ReservationRoomingListGenerationServiceImplTest {
assertThat(cellText(firstRoom.getCell(1))).isEqualTo("LI");
assertThat(cellText(firstRoom.getCell(2))).isEqualTo("CHUNHONG");
assertThat(cellText(firstRoom.getCell(3))).isEmpty();
assertThat(cellText(firstRoom.getCell(4))).isEqualTo("2026-05-09");
assertThat(cellText(firstRoom.getCell(5))).isEqualTo("2026-05-14");
assertThat(cellText(firstRoom.getCell(4))).isEqualTo("2026/05/09");
assertThat(cellText(firstRoom.getCell(5))).isEqualTo("2026/05/14");
assertThat(cellText(firstRoom.getCell(6))).isEqualTo("UG1");
assertThat(cellText(firstRoom.getCell(7))).isEmpty();
assertThat(cellText(firstRoom.getCell(8))).isEqualTo("1");
@@ -119,8 +119,8 @@ class ReservationRoomingListGenerationServiceImplTest {
try (XSSFWorkbook workbook = new XSSFWorkbook(new ByteArrayInputStream(generatedFile.content()))) {
Row firstRoom = workbook.getSheetAt(0).getRow(1);
assertThat(cellText(firstRoom.getCell(4))).isEqualTo("2026-05-09");
assertThat(cellText(firstRoom.getCell(5))).isEqualTo("2026-05-14");
assertThat(cellText(firstRoom.getCell(4))).isEqualTo("2026/05/09");
assertThat(cellText(firstRoom.getCell(5))).isEqualTo("2026/05/14");
}
}