From b6d477ad41e2a8ff9393de2beba2e735c78cf781 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 22 七月 2024 18:06:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 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..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,15 +197,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