From fbfc2ba9276e79950a0949324bc8ba976cdca99b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 08 五月 2024 17:29:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java
index eeb6d56..b48b540 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java
@@ -198,15 +198,19 @@
@Override
public List<TContract> selectAll() {
- return list(new LambdaQueryWrapper<TContract>()
- .orderByDesc(TContract::getCreateTime))
- .stream().peek(
- tContract -> tContract.setUnitName(ywUnitService.getById(tContract.getUnitId()).getUnitName())
- ).toList();
+ return baseMapper.selectAll();
}
@Override
public List<CalculateMoneyRule> selectMoneyRules(Integer contractId) {
return calculateMoneyRuleService.selectMoneyRules(contractId);
}
+
+ @Override
+ public List<TContract> selectUsingContract() {
+ return new LambdaQueryChainWrapper<>(baseMapper)
+ .le(TContract::getStartTime, DateUtils.getDate())
+ .ge(TContract::getEndTime, DateUtils.getDate())
+ .list();
+ }
}
--
Gitblit v1.8.0