lijingtong
/
PublicAffairs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat:

This commit is contained in:
李京通 2025-06-07 13:19:39 +08:00
parent 2b2d5bd83b
commit a9228f8c5f
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gather-app/src/main/java/com/ruoyi/business/controller/NonWorkingDayDrinkingReportController.java
View File

@ -42,7 +42,7 @@ public class NonWorkingDayDrinkingReportController extends BaseController {
private final gwglLogService gwglLogService;
@ApiOperation("查询非工作日饮酒报备单")
@GetMapping("/list")
@PostMapping("/list")
public TableDataInfo query(NonWorkingDayDrinkingReport nonWorkingDayDrinkingReport) {
List<SysDept> 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);
}
// 管理员

7
gather-app/src/main/java/com/ruoyi/database/domain/NonWorkingDayDrinkingReport.java
View File

@ -20,6 +20,13 @@ public class NonWorkingDayDrinkingReport {
@ApiModelProperty("姓名")
private String name;
@ApiModelProperty("家属姓名")
private String homeName;
@ApiModelProperty("家属联系方式")
private String homePhone;
@ApiModelProperty("userId")
private Long userId;