From a94aacd36460d76297878c304f4837813191232c Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 29 九月 2025 18:04:47 +0800
Subject: [PATCH] 钉钉授权 与 通知开发
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
index f1b7560..fe01aeb 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
@@ -145,8 +145,11 @@
queryWrapper.selectAs(Company::getCompanyNamePath,TrainTime::getCompanyName);
queryWrapper.selectAs(SystemUser::getRealname,TrainTime::getCreateName);
queryWrapper.eq(TrainTime::getIsdeleted, Constants.ZERO);
- queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getName()), ms->ms.like(Member::getPhone,pageWrap.getModel().getName())
- .or().like(Member::getName,pageWrap.getModel().getName()));
+ queryWrapper.ge(pageWrap.getModel().getStartTimeStart() != null, TrainTime::getStartTime, pageWrap.getModel().getStartTimeStart());
+ queryWrapper.le(pageWrap.getModel().getStartTimeEnd() != null, TrainTime::getStartTime, pageWrap.getModel().getStartTimeEnd());
+
+ queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()), ms->ms.like(Member::getPhone,pageWrap.getModel().getKeyWords())
+ .or().like(Member::getName,pageWrap.getModel().getKeyWords()));
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName());
queryWrapper.orderByDesc(TrainTime::getId);
IPage<TrainTime> result = trainTimeJoinMapper.selectJoinPage(page, TrainTime.class,queryWrapper);
--
Gitblit v1.9.3