From 9678de762666ad678cc30925b2f4f537ff37234d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 19 一月 2026 18:00:54 +0800
Subject: [PATCH] 资金管理+财务对账 分页搜索
---
src/main/java/com/ruoyi/account/mapper/AccountMapper.java | 1
src/main/java/com/ruoyi/account/service/impl/AccountReconciliationServiceImpl.java | 9 +++-
src/main/java/com/ruoyi/account/service/impl/AccountServiceImpl.java | 7 ++-
src/main/resources/mapper/account/AccountReconciliationMapper.xml | 14 +++++++
src/main/java/com/ruoyi/account/service/AccountReconciliationService.java | 3 +
src/main/java/com/ruoyi/account/mapper/AccountReconciliationMapper.java | 4 ++
src/main/resources/mapper/account/AccountMapper.xml | 14 +++++++
src/main/java/com/ruoyi/account/controller/AccountReconciliationController.java | 4 +-
src/main/java/com/ruoyi/account/service/AccountService.java | 1
src/main/java/com/ruoyi/account/controller/AccountController.java | 4 +-
10 files changed, 53 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/controller/AccountController.java b/src/main/java/com/ruoyi/account/controller/AccountController.java
index 50f1b60..2f9690b 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountController.java
+++ b/src/main/java/com/ruoyi/account/controller/AccountController.java
@@ -74,8 +74,8 @@
*/
@GetMapping("/page")
@ApiOperation("鍒嗛〉鏌ヨ")
- public AjaxResult accountListPage(Page page) {
- return AjaxResult.success(accountService.page(page));
+ public AjaxResult accountListPage(Page page,Account account) {
+ return AjaxResult.success(accountService.accountListPage(page,account));
}
diff --git a/src/main/java/com/ruoyi/account/controller/AccountReconciliationController.java b/src/main/java/com/ruoyi/account/controller/AccountReconciliationController.java
index 77ceec9..e608e9c 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountReconciliationController.java
+++ b/src/main/java/com/ruoyi/account/controller/AccountReconciliationController.java
@@ -70,8 +70,8 @@
*/
@GetMapping("/page")
@ApiOperation("鍒嗛〉鏌ヨ")
- public AjaxResult accountListPage(Page page) {
- return AjaxResult.success(accountReconciliationService.page(page));
+ public AjaxResult accountReconciliationListPage(Page page,AccountReconciliation accountReconciliation) {
+ return AjaxResult.success(accountReconciliationService.accountReconciliationListPage(page, accountReconciliation));
}
diff --git a/src/main/java/com/ruoyi/account/mapper/AccountMapper.java b/src/main/java/com/ruoyi/account/mapper/AccountMapper.java
index 63a5f7c..8a648d4 100644
--- a/src/main/java/com/ruoyi/account/mapper/AccountMapper.java
+++ b/src/main/java/com/ruoyi/account/mapper/AccountMapper.java
@@ -16,4 +16,5 @@
@Mapper
public interface AccountMapper extends BaseMapper<Account> {
+ IPage<Account> accountListPage(Page page, @Param("c") Account account);
}
diff --git a/src/main/java/com/ruoyi/account/mapper/AccountReconciliationMapper.java b/src/main/java/com/ruoyi/account/mapper/AccountReconciliationMapper.java
index 18fbf2c..635f9fe 100644
--- a/src/main/java/com/ruoyi/account/mapper/AccountReconciliationMapper.java
+++ b/src/main/java/com/ruoyi/account/mapper/AccountReconciliationMapper.java
@@ -1,11 +1,15 @@
package com.ruoyi.account.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.pojo.Account;
import com.ruoyi.account.pojo.AccountReconciliation;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
@Mapper
public interface AccountReconciliationMapper extends BaseMapper<AccountReconciliation> {
+ IPage<AccountReconciliation> accountReconciliationListPage(Page page, @Param("c") AccountReconciliation accountReconciliation);
}
diff --git a/src/main/java/com/ruoyi/account/service/AccountReconciliationService.java b/src/main/java/com/ruoyi/account/service/AccountReconciliationService.java
index f40505b..b9c2dde 100644
--- a/src/main/java/com/ruoyi/account/service/AccountReconciliationService.java
+++ b/src/main/java/com/ruoyi/account/service/AccountReconciliationService.java
@@ -1,5 +1,7 @@
package com.ruoyi.account.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.account.pojo.Account;
import com.ruoyi.account.pojo.AccountReconciliation;
@@ -7,4 +9,5 @@
public interface AccountReconciliationService extends IService<AccountReconciliation> {
+ IPage<AccountReconciliation> accountReconciliationListPage(Page page, AccountReconciliation accountReconciliation);
}
diff --git a/src/main/java/com/ruoyi/account/service/AccountService.java b/src/main/java/com/ruoyi/account/service/AccountService.java
index 1ce60e6..7de2914 100644
--- a/src/main/java/com/ruoyi/account/service/AccountService.java
+++ b/src/main/java/com/ruoyi/account/service/AccountService.java
@@ -13,4 +13,5 @@
public interface AccountService extends IService<Account> {
+ IPage<Account> accountListPage(Page page, Account account);
}
diff --git a/src/main/java/com/ruoyi/account/service/impl/AccountReconciliationServiceImpl.java b/src/main/java/com/ruoyi/account/service/impl/AccountReconciliationServiceImpl.java
index 3228171..09f18a2 100644
--- a/src/main/java/com/ruoyi/account/service/impl/AccountReconciliationServiceImpl.java
+++ b/src/main/java/com/ruoyi/account/service/impl/AccountReconciliationServiceImpl.java
@@ -1,6 +1,8 @@
package com.ruoyi.account.service.impl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.mapper.AccountMapper;
import com.ruoyi.account.mapper.AccountReconciliationMapper;
@@ -15,7 +17,10 @@
@Service
public class AccountReconciliationServiceImpl extends ServiceImpl<AccountReconciliationMapper, AccountReconciliation> implements AccountReconciliationService {
+ private AccountReconciliationMapper accountReconciliationMapper;
-
-
+ @Override
+ public IPage<AccountReconciliation> accountReconciliationListPage(Page page, AccountReconciliation accountReconciliation) {
+ return accountReconciliationMapper.accountReconciliationListPage(page,accountReconciliation);
+ }
}
diff --git a/src/main/java/com/ruoyi/account/service/impl/AccountServiceImpl.java b/src/main/java/com/ruoyi/account/service/impl/AccountServiceImpl.java
index c24f295..d1b6964 100644
--- a/src/main/java/com/ruoyi/account/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/ruoyi/account/service/impl/AccountServiceImpl.java
@@ -30,7 +30,10 @@
@Service
public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> implements AccountService {
+ private AccountMapper accountMapper;
-
-
+ @Override
+ public IPage<Account> accountListPage(Page page, Account account) {
+ return accountMapper.accountListPage(page,account);
+ }
}
diff --git a/src/main/resources/mapper/account/AccountMapper.xml b/src/main/resources/mapper/account/AccountMapper.xml
new file mode 100644
index 0000000..f276627
--- /dev/null
+++ b/src/main/resources/mapper/account/AccountMapper.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.account.mapper.AccountMapper">
+ <select id="accountListPage" resultType="com.ruoyi.account.pojo.Account">
+ select * from account
+ where 1=1
+ <if test="c.counterparty !='' and c.counterparty!=null">
+ and counterparty = #{c.counterparty}
+ </if>
+ <if test="c.typeText !='' and c.typeText!=null">
+ and type_text = #{c.typeText}
+ </if>
+ </select>
+</mapper>
diff --git a/src/main/resources/mapper/account/AccountReconciliationMapper.xml b/src/main/resources/mapper/account/AccountReconciliationMapper.xml
new file mode 100644
index 0000000..a52a8ba
--- /dev/null
+++ b/src/main/resources/mapper/account/AccountReconciliationMapper.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.account.mapper.AccountReconciliationMapper">
+ <select id="accountReconciliationListPage" resultType="com.ruoyi.account.pojo.AccountReconciliation">
+ select * from account_reconciliation
+ where 1=1
+ <if test="c.counterparty !='' and c.counterparty!=null">
+ and counterparty = #{c.counterparty}
+ </if>
+ <if test="c.status !='' and c.status!=null">
+ and status = #{c.status}
+ </if>
+ </select>
+</mapper>
--
Gitblit v1.9.3