From 5fa6e6f8410ef9d057174bcff2a3c5038c54a551 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期日, 27 四月 2025 18:41:20 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBankFlowServiceImpl.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 317ec8a..a643025 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
@@ -3,10 +3,12 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.importExcel.TBankFlowImportExcel;
import com.ruoyi.system.mapper.TBankFlowMapper;
import com.ruoyi.system.model.TBankFlow;
+import com.ruoyi.system.model.TBill;
import com.ruoyi.system.model.TFlowManagement;
import com.ruoyi.system.query.TBankFlowQuery;
import com.ruoyi.system.query.TFlowManagementQuery;
@@ -45,13 +47,14 @@
.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())
+ .eq(StringUtils.isNotEmpty(query.getBusinessDeptId())&& !"0".equals(query.getBusinessDeptId()),TBankFlow::getBusinessDeptId,query.getBusinessDeptId())
.orderByDesc(TBankFlow::getCreateTime);
return this.baseMapper.selectPage(pageInfo, queryWrapper);
}
@Override
public TBankFlowStatisticsVo getPaymentStats(TBankFlowQuery query) {
- return this.baseMapper.getPaymentStats(query);
+ return this.baseMapper.getPaymentStats(query,SecurityUtils.getBusinessDeptId());
}
/**
@@ -61,13 +64,20 @@
*/
@Override
public List<TBankFlow> searchByBankSerialNumber(String bankSerialNumber) {
+ String businessDeptId = SecurityUtils.getBusinessDeptId();
+
LambdaQueryWrapper<TBankFlow> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.like(StringUtils.isNotEmpty(bankSerialNumber),TBankFlow::getBankSerialNumber,bankSerialNumber);
- return this.baseMapper.selectList(queryWrapper);
+ queryWrapper.like(StringUtils.isNotEmpty(bankSerialNumber),TBankFlow::getBankSerialNumber,bankSerialNumber)
+ .eq(StringUtils.isNotEmpty(bankSerialNumber) && !"0".equals(bankSerialNumber),TBankFlow::getBusinessDeptId,businessDeptId)
+ .orderByDesc(TBankFlow::getPayTime);
+ PageInfo<TBankFlow> pageInfo = new PageInfo<>(1, 20);
+ pageInfo = this.baseMapper.selectPage(pageInfo, queryWrapper);
+ return pageInfo.getRecords();
}
@Override
public void saveImportBatch(List<TBankFlowImportExcel> list, List<TBankFlowImportExcel> failList) {
+ String businessDeptId = SecurityUtils.getBusinessDeptId();
for (TBankFlowImportExcel row : list) {
try {
TBankFlow preexist = findUniq(row.getBankSerialNumber());
@@ -78,6 +88,7 @@
}
TBankFlow flow = new TBankFlow();
BeanUtils.copyProperties(row,flow);
+ flow.setBusinessDeptId(businessDeptId);
try {
LocalDateTime parse = LocalDateTime.parse(row.getPayTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
flow.setPayTime(parse);
--
Gitblit v1.7.1