From 870dfdba90fc4062b66de669ad9ff3f4707bf496 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 09 六月 2025 10:32:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java
index 529c16c..df0bc26 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java
@@ -341,6 +341,11 @@
queryWrapper.le(StringUtils.isNotBlank(applyDetailPageDTO.getStartTimeE()),ApplyDetail::getStartTime,applyDetailPageDTO.getStartTimeE()+" 23:59:59.0");
queryWrapper.ge(StringUtils.isNotBlank(applyDetailPageDTO.getEndTimeS()),ApplyDetail::getEndTime,applyDetailPageDTO.getEndTimeS()+" 00:00:00.0");
queryWrapper.le(StringUtils.isNotBlank(applyDetailPageDTO.getEndTimeE()),ApplyDetail::getEndTime,applyDetailPageDTO.getEndTimeE()+" 23:59:59.0");
+
+
+ queryWrapper.apply(Objects.nonNull(applyDetailPageDTO.getIsSettleClaims())&&Constants.equalsInteger(applyDetailPageDTO.getIsSettleClaims(),Constants.ONE),
+ " ( t4.START_TIME <= now() and t4.END_TIME >= DATE_SUB(now(), INTERVAL 30 DAY) ) ");
+
return applyDetailJoinMapper.selectJoinList(ApplyDetail.class,queryWrapper);
}
--
Gitblit v1.9.3