From f88bc7734b6575480b7f5383ed94c9f14a4c7a73 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 29 七月 2024 18:19:20 +0800
Subject: [PATCH] 变更
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/VDonationworkflowServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/VDonationworkflowServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/VDonationworkflowServiceImpl.java
index 3f833fc..d84f588 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/VDonationworkflowServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/VDonationworkflowServiceImpl.java
@@ -49,6 +49,9 @@
if (StringUtils.isNotBlank(vDonationworkflow.getDeptname())){
wrappers.like(VDonationworkflow::getDeptname ,vDonationworkflow.getDeptname());
}
+ if (StringUtils.isNotBlank(vDonationworkflow.getRegionallevel())){
+ wrappers.eq(VDonationworkflow::getRegionallevel ,vDonationworkflow.getRegionallevel());
+ }
if (StringUtils.isNotBlank(vDonationworkflow.getReporterno())){
wrappers.eq(VDonationworkflow::getReporterno ,vDonationworkflow.getReporterno());
}
@@ -56,7 +59,10 @@
wrappers.like(VDonationworkflow::getReportername ,vDonationworkflow.getReportername());
}
if (vDonationworkflow.getDonatetime() != null){
- wrappers.eq(VDonationworkflow::getDonatetime ,vDonationworkflow.getDonatetime());
+ wrappers.ge(VDonationworkflow::getDonatetime ,vDonationworkflow.getStarttime());
+ }
+ if (vDonationworkflow.getDonatetime() != null){
+ wrappers.lt(VDonationworkflow::getDonatetime ,vDonationworkflow.getEndtime());
}
if (vDonationworkflow.getReporttime() != null){
wrappers.eq(VDonationworkflow::getReporttime ,vDonationworkflow.getReporttime());
--
Gitblit v1.9.3