From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFlowManagementServiceImpl.java | 23 +++++++++++++++--------
1 files changed, 15 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 f793220..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
@@ -8,6 +8,7 @@
import com.ruoyi.system.query.TFlowManagementQuery;
import com.ruoyi.system.service.TFlowManagementService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.system.vo.TFlowManagementStatisticsVo;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -26,22 +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.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