From a5f8fdde3b6ef9224a92f39a4a2773ee60460d96 Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期五, 28 二月 2025 16:02:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xizang-changyun' into xizang-changyun
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFlowManagementServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 98ef5a0..3bc07fe 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,13 +27,6 @@
@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())
@@ -43,7 +36,7 @@
.eq(null != query.getFlowStatus(),TFlowManagement::getFlowStatus,query.getFlowStatus())
.orderByDesc(TFlowManagement::getCreateTime)
;
- return this.baseMapper.selectList(queryWrapper);
+ return this.baseMapper.selectPage(pageInfo,queryWrapper);
}
@Override
@@ -51,4 +44,11 @@
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