From a90d4c73e67b27338e941f88673fd17fe8b2b5ff Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 30 四月 2024 14:51:43 +0800
Subject: [PATCH] 前后端文件名统一调整

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java |   10 +++-------
 1 files changed, 3 insertions(+), 7 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..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,11 +198,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 +209,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