From 0d4a80fd817b39417ad7eee88aa5d14bf571f79c Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期五, 28 六月 2024 17:29:09 +0800
Subject: [PATCH] zjh 本地 2024/06/28 --1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictCompController.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictCompController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictCompController.java
index 4ff09ee..3fe97d8 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictCompController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictCompController.java
@@ -123,17 +123,15 @@
public AjaxResult getCusTomterListByCompId(@RequestParam(required = false) @ApiParam(value = "鍗曚綅id") String compId,
@RequestParam(required = false) @ApiParam(value = "鍚嶅瓧") String name,
@RequestParam(required = false) @ApiParam(value = "閮ㄩ棬id") String deptId,
- @RequestParam(required = false) @ApiParam(value = "棰勭害鏃堕棿") Date reservationTime,
- @RequestParam(defaultValue = "1") @ApiParam(value = "椤电爜鏁�") Integer page,
- @RequestParam(defaultValue = "10") @ApiParam(value = "姣忛〉鏄剧ず鏉℃暟") Integer pageSize) {
- IPage<TjReservation> pages=new Page<>(page,pageSize);
+ @RequestParam(required = false) @ApiParam(value = "棰勭害鏃堕棿") Date reservationTime) {
+
LambdaQueryWrapper<TjReservation> wq=new LambdaQueryWrapper<>();
if(null !=compId)wq.eq(TjReservation::getCompanyId,compId);
if(null !=name)wq.eq(TjReservation::getName,name);
if(null !=deptId)wq.eq(TjReservation::getDepartment,deptId);
if(null !=reservationTime)wq.between(TjReservation::getReservationTime, DateUtil.beginOfDay(reservationTime),DateUtil.endOfDay(reservationTime));
- IPage<TjReservation> iPage = reservationService.page(pages, wq);
- return AjaxResult.success(iPage);
+ wq.eq(TjReservation::getIsExpire,"2");
+ return AjaxResult.success(reservationService.list(wq));
}
--
Gitblit v1.8.0