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

调整房表生成提示和日期格式

Browse Source
This commit is contained in:
andy
2026-08-06 12:44:53 +08:00
parent 6cc9bb4439
commit fd801caa73
8 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,7 @@ import org.springframework.stereotype.Component;
public class RoomingListExcelRenderer {
private static final DateTimeFormatter TARGET_DATE_FORMATTER =
DateTimeFormatter.ofPattern("yyyy/MM/dd");
DateTimeFormatter.ofPattern("dd/MM/yyyy");
private static final String[] HEADERS = {
"Line",
"Name",

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

@@ -104,9 +104,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("09/05/2026"))
.andExpect(result -> assertThat(workbookCell(result.getResponse().getContentAsByteArray(), 1, 5))
.isEqualTo("2026/05/14"))
.isEqualTo("14/05/2026"))
.andExpect(result -> assertThat(workbookCell(result.getResponse().getContentAsByteArray(), 1, 9))
.isEqualTo("2"))
.andExpect(result -> assertThat(workbookCell(result.getResponse().getContentAsByteArray(), 1, 10))
@@ -141,9 +141,9 @@ class ReservationRoomingListGenerationControllerTest {
.andExpect(result -> assertThat(workbookCell(result.getResponse().getContentAsByteArray(), 1, 2))
.isEqualTo("ONE"))
.andExpect(result -> assertThat(workbookCell(result.getResponse().getContentAsByteArray(), 1, 4))
.isEqualTo("2026/05/10"))
.isEqualTo("10/05/2026"))
.andExpect(result -> assertThat(workbookCell(result.getResponse().getContentAsByteArray(), 1, 5))
.isEqualTo("2026/05/16"))
.isEqualTo("16/05/2026"))
.andExpect(result -> assertThat(workbookCell(result.getResponse().getContentAsByteArray(), 1, 9))
.isEqualTo("2"))
.andExpect(result -> assertThat(workbookCell(result.getResponse().getContentAsByteArray(), 1, 13))
@@ -180,9 +180,9 @@ class ReservationRoomingListGenerationControllerTest {
.andExpect(result -> assertThat(workbookCell(result.getResponse().getContentAsByteArray(), 1, 2))
.isEqualTo("HAIYUN"))
.andExpect(result -> assertThat(workbookCell(result.getResponse().getContentAsByteArray(), 1, 4))
.isEqualTo("2026/08/03"))
.isEqualTo("03/08/2026"))
.andExpect(result -> assertThat(workbookCell(result.getResponse().getContentAsByteArray(), 1, 5))
.isEqualTo("2026/08/08"))
.isEqualTo("08/08/2026"))
.andExpect(result -> assertThat(workbookCell(result.getResponse().getContentAsByteArray(), 1, 9))
.isEqualTo("3"))
.andExpect(result -> assertThat(workbookCell(result.getResponse().getContentAsByteArray(), 1, 13))

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

@@ -61,8 +61,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("09/05/2026");
assertThat(cellText(firstRoom.getCell(5))).isEqualTo("14/05/2026");
assertThat(cellText(firstRoom.getCell(6))).isEqualTo("UG1");
assertThat(cellText(firstRoom.getCell(7))).isEmpty();
assertThat(cellText(firstRoom.getCell(8))).isEqualTo("1");
@@ -146,8 +146,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("09/05/2026");
assertThat(cellText(firstRoom.getCell(5))).isEqualTo("14/05/2026");
}
}
@@ -164,8 +164,8 @@ class ReservationRoomingListGenerationServiceImplTest {
Row firstRoom = workbook.getSheetAt(0).getRow(1);
assertThat(cellText(firstRoom.getCell(1))).isEqualTo("ALPHA");
assertThat(cellText(firstRoom.getCell(2))).isEqualTo("ONE");
assertThat(cellText(firstRoom.getCell(4))).isEqualTo("2026/05/10");
assertThat(cellText(firstRoom.getCell(5))).isEqualTo("2026/05/16");
assertThat(cellText(firstRoom.getCell(4))).isEqualTo("10/05/2026");
assertThat(cellText(firstRoom.getCell(5))).isEqualTo("16/05/2026");
assertThat(cellText(firstRoom.getCell(9))).isEqualTo("2");
assertThat(cellText(firstRoom.getCell(13))).isEqualTo("BRAVO TWO");
@@ -192,8 +192,8 @@ class ReservationRoomingListGenerationServiceImplTest {
assertThat(cellText(leaderRoom.getCell(0))).isEqualTo("1");
assertThat(cellText(leaderRoom.getCell(1))).isEqualTo("CAI");
assertThat(cellText(leaderRoom.getCell(2))).isEqualTo("HAIYUN");
assertThat(cellText(leaderRoom.getCell(4))).isEqualTo("2026/08/03");
assertThat(cellText(leaderRoom.getCell(5))).isEqualTo("2026/08/08");
assertThat(cellText(leaderRoom.getCell(4))).isEqualTo("03/08/2026");
assertThat(cellText(leaderRoom.getCell(5))).isEqualTo("08/08/2026");
assertThat(cellText(leaderRoom.getCell(9))).isEqualTo("3");
assertThat(cellText(leaderRoom.getCell(13))).isEqualTo("HUANG YUHENG, MA XIUHAN");