From e3e5d863f7da346e8beaed4fb6ed4a4fca0cb22b Mon Sep 17 00:00:00 2001 From: whywhyo <1511349576@qq.com> Date: 星期五, 05 五月 2023 10:22:56 +0800 Subject: [PATCH] 111 --- zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java index 21a607b..88df0af 100644 --- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java +++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java @@ -13,6 +13,7 @@ import com.ruoyi.domain.ZInfoUser; import com.ruoyi.domain.ZfEconomy; import com.ruoyi.domain.ZfEconomy; +import com.ruoyi.domain.ZfEconomy; import com.ruoyi.mapper.ZfEconomyMapper; import com.ruoyi.service.ZInfoUserService; import com.ruoyi.service.ZfEconomyService; @@ -51,12 +52,13 @@ LambdaQueryWrapper<ZfEconomy> lqw = new LambdaQueryWrapper<>(); lqw.eq(zfEconomy.getType()!=null,ZfEconomy::getType,zfEconomy.getType()); lqw.eq(zfEconomy.getKind()!=null,ZfEconomy::getKind,zfEconomy.getKind()); - lqw.like(zfEconomy.getCreateTime()!=null,ZfEconomy::getCreateTime,zfEconomy.getCreateTime()); lqw.like(StringUtils.isNotEmpty(zfEconomy.getPrice()),ZfEconomy::getPrice,zfEconomy.getPrice()); lqw.like(StringUtils.isNotEmpty(zfEconomy.getUseFor()),ZfEconomy::getUseFor,zfEconomy.getUseFor()); lqw.like(StringUtils.isNotEmpty(zfEconomy.getUsePeople()),ZfEconomy::getUsePeople,zfEconomy.getUsePeople()); lqw.like(StringUtils.isNotEmpty(zfEconomy.getBalance()),ZfEconomy::getBalance,zfEconomy.getBalance()); lqw.like(StringUtils.isNotEmpty(zfEconomy.getRemark()),ZfEconomy::getRemark,zfEconomy.getRemark()); + lqw.eq(zfEconomy.getHappenTime() != null, ZfEconomy::getHappenTime, zfEconomy.getHappenTime()); + lqw.between(zfEconomy.getHappenStartTime() != null && zfEconomy.getHappenEndTime() != null, ZfEconomy::getHappenTime, zfEconomy.getHappenStartTime(), zfEconomy.getHappenEndTime()); return lqw; } @@ -139,7 +141,7 @@ } - lqw.orderByDesc(ZfEconomy::getId); + lqw.orderByDesc(ZfEconomy::getCreateTime); return lqw; } -- Gitblit v1.9.1