From e9573dc619e9a1e17d511c5ea4ab461919955be2 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 24 三月 2025 15:17:03 +0800
Subject: [PATCH] 合同终止时间修改

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFlowManagementServiceImpl.java |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFlowManagementServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFlowManagementServiceImpl.java
index f5fe8b4..9cf988d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFlowManagementServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFlowManagementServiceImpl.java
@@ -27,27 +27,28 @@
     @Override
     public PageInfo<TFlowManagement> pageList(TFlowManagementQuery query) {
         PageInfo<TFlowManagement> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
-        List<TFlowManagement> list = makeQuery(query);
-        pageInfo.setRecords(list);
-        pageInfo.setTotal(list.size());
-        return pageInfo;
-    }
-    @Override
-    public List<TFlowManagement> makeQuery(TFlowManagementQuery query){
         LambdaQueryWrapper<TFlowManagement> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(StringUtils.isNotEmpty(query.getSysSerialNumber()),TFlowManagement::getSysSerialNumber,query.getSysSerialNumber())
                 .eq(StringUtils.isNotEmpty(query.getBankSerialNumber()),TFlowManagement::getBankSerialNumber,query.getBankSerialNumber())
                 .like(StringUtils.isNotEmpty(query.getPayer()),TFlowManagement::getPayer,query.getPayer())
                 .ge(StringUtils.isNotEmpty(query.getPayStartTime()),TFlowManagement::getPayTime,query.getPayStartTime())
                 .lt(StringUtils.isNotEmpty(query.getPayEndTime()),TFlowManagement::getPayTime,query.getPayEndTime())
-                .eq(null != query.getFlowStatus(),TFlowManagement::getFlowStatus,query.getFlowStatus())
+                .eq(null != query.getPayType(),TFlowManagement::getPayType,query.getPayType())
                 .orderByDesc(TFlowManagement::getCreateTime)
         ;
-        return this.baseMapper.selectList(queryWrapper);
+        return this.baseMapper.selectPage(pageInfo,queryWrapper);
     }
 
     @Override
     public TFlowManagementStatisticsVo getPaymentStats(TFlowManagementQuery query) {
         return this.baseMapper.getPaymentStats(query);
     }
+
+    @Override
+    public List<TFlowManagement> findByBankSerialNumber(String bankSerialNumber){
+        LambdaQueryWrapper<TFlowManagement> queryWrapper = new LambdaQueryWrapper<>() ;
+        queryWrapper.eq(StringUtils.isNotEmpty(bankSerialNumber),TFlowManagement::getBankSerialNumber,bankSerialNumber);
+        return this.baseMapper.selectList(queryWrapper);
+    }
+
 }

--
Gitblit v1.7.1