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/TBankFlowServiceImpl.java | 18 +++---------------
1 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBankFlowServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBankFlowServiceImpl.java
index cff875a..147a3ea 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBankFlowServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBankFlowServiceImpl.java
@@ -1,8 +1,6 @@
package com.ruoyi.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.Query;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.utils.StringUtils;
@@ -22,7 +20,6 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
@@ -43,23 +40,14 @@
@Override
public PageInfo<TBankFlow> pageList(TBankFlowQuery query) {
PageInfo<TBankFlow> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
- List<TBankFlow> list = makeQuery(query);
- pageInfo.setRecords(list);
- pageInfo.setTotal(list.size());
- return pageInfo;
- }
-
- @Override
- public List<TBankFlow> makeQuery(TBankFlowQuery query) {
LambdaQueryWrapper<TBankFlow> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(StringUtils.isNotEmpty(query.getBankSerialNumber()),TBankFlow::getBankSerialNumber,query.getBankSerialNumber())
.like(StringUtils.isNotEmpty(query.getPayer()),TBankFlow::getPayer,query.getPayer())
.ge(StringUtils.isNotEmpty(query.getPayStartTime()),TBankFlow::getPayTime,query.getPayStartTime())
.lt(StringUtils.isNotEmpty(query.getPayEndTime()),TBankFlow::getPayTime,query.getPayEndTime())
.eq(null != query.getFlowStatus(),TBankFlow::getFlowStatus,query.getFlowStatus())
- .orderByDesc(TBankFlow::getCreateTime)
- ;
- return this.baseMapper.selectList(queryWrapper);
+ .orderByDesc(TBankFlow::getCreateTime);
+ return this.baseMapper.selectPage(pageInfo, queryWrapper);
}
@Override
@@ -105,7 +93,7 @@
}
TFlowManagementQuery query = new TFlowManagementQuery();
query.setBankSerialNumber(row.getBankSerialNumber());
- List<TFlowManagement> list1 = flowManagementService.makeQuery(query);
+ List<TFlowManagement> list1 = flowManagementService.findByBankSerialNumber(row.getBankSerialNumber());
for (TFlowManagement tFlowManagement : list1) {
// 如果相同流水号金额相同 ：抵扣金额为流水金额，剩余金额为0，状态为正常
if (row.getFlowMoney().compareTo(tFlowManagement.getFlowMoney()) == 0){
--
Gitblit v1.7.1