From a9228f8c5f0c2a30ec558bacc887b71a494d080b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=BA=AC=E9=80=9A?= <2405957150@qq.com> Date: Sat, 7 Jun 2025 13:19:39 +0800 Subject: [PATCH] feat: --- .../controller/NonWorkingDayDrinkingReportController.java | 6 +++--- .../ruoyi/database/domain/NonWorkingDayDrinkingReport.java | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/NonWorkingDayDrinkingReportController.java b/gather-app/src/main/java/com/ruoyi/business/controller/NonWorkingDayDrinkingReportController.java index c896b1f..5c92658 100644 --- a/gather-app/src/main/java/com/ruoyi/business/controller/NonWorkingDayDrinkingReportController.java +++ b/gather-app/src/main/java/com/ruoyi/business/controller/NonWorkingDayDrinkingReportController.java @@ -42,7 +42,7 @@ public class NonWorkingDayDrinkingReportController extends BaseController { private final gwglLogService gwglLogService; @ApiOperation("查询非工作日饮酒报备单") - @GetMapping("/list") + @PostMapping("/list") public TableDataInfo query(NonWorkingDayDrinkingReport nonWorkingDayDrinkingReport) { List sysDepts = deptService.selectAllDeptList(); // 部门领导 @@ -56,9 +56,9 @@ public class NonWorkingDayDrinkingReportController extends BaseController { queryWrapper.orderByDesc("create_time"); String fTime = nonWorkingDayDrinkingReport.getFTime(); String eTime = nonWorkingDayDrinkingReport.getETime(); - LocalDateTime time = LocalDateTime.parse(fTime); - LocalDateTime time1 = LocalDateTime.parse(eTime); if (fTime != null && fTime != null) { + LocalDateTime time = LocalDateTime.parse(fTime); + LocalDateTime time1 = LocalDateTime.parse(eTime); queryWrapper.between("create_time", time, time1); } // 管理员 diff --git a/gather-app/src/main/java/com/ruoyi/database/domain/NonWorkingDayDrinkingReport.java b/gather-app/src/main/java/com/ruoyi/database/domain/NonWorkingDayDrinkingReport.java index 3410050..2bbaedf 100644 --- a/gather-app/src/main/java/com/ruoyi/database/domain/NonWorkingDayDrinkingReport.java +++ b/gather-app/src/main/java/com/ruoyi/database/domain/NonWorkingDayDrinkingReport.java @@ -20,6 +20,13 @@ public class NonWorkingDayDrinkingReport { @ApiModelProperty("姓名") private String name; + + @ApiModelProperty("家属姓名") + private String homeName; + + @ApiModelProperty("家属联系方式") + private String homePhone; + @ApiModelProperty("userId") private Long userId;