From d855582916a6540b2b4dd37dbaa747c651622f94 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 22 七月 2024 18:47:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java | 11 +++--------
1 files changed, 3 insertions(+), 8 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 f26f06f..9182297 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
@@ -134,7 +134,6 @@
public AjaxResult importData(MultipartFile file, TContract tContract) {
// 淇濆瓨鍚堝悓
tContract.setCreateTime(DateUtils.getNowDate());
- tContract.setDeleted("0");
save(tContract);
List<CalculateRule> list = calculateRuleService.readExcel(file);
@@ -198,11 +197,7 @@
@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
@@ -213,8 +208,8 @@
@Override
public List<TContract> selectUsingContract() {
return new LambdaQueryChainWrapper<>(baseMapper)
- .gt(TContract::getStartTime, DateUtils.getNowDate())
- .lt(TContract::getEndTime, DateUtils.getNowDate())
+ .le(TContract::getStartTime, DateUtils.getDate())
+ .ge(TContract::getEndTime, DateUtils.getDate())
.list();
}
}
--
Gitblit v1.8.0