From 67508a2e3d00e59d429966ab42f4a45002b31dc6 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期五, 12 四月 2024 12:12:28 +0800
Subject: [PATCH] 最新版本
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
index 4aa25ca..05a95ea 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
@@ -270,6 +270,8 @@
.eq(Objects.nonNull(pageWrap.getModel().getType()),
Retention::getType,
pageWrap.getModel().getType())
+ //杩囨护杞﹁締鏁版嵁
+ .ne(Retention::getType,3)
.and(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
p-> p.like(Company::getName, pageWrap.getModel().getCompanyName())
.or()
@@ -277,7 +279,7 @@
.ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
Retention::getEventDate,pageWrap.getModel().getStartTime())
.le(Objects.nonNull(pageWrap.getModel().getEndTime()),
- Retention::getEventDate,pageWrap.getModel().getStartTime());
+ Retention::getEventDate,pageWrap.getModel().getEndTime());
queryWrapper.orderByDesc(Retention::getCreateDate);
IPage<Retention> retentionIPage = retentionJoinMapper.selectJoinPage(page, Retention.class, queryWrapper);
return retentionIPage;
--
Gitblit v1.9.3