zss
9 天以前 9678de762666ad678cc30925b2f4f537ff37234d
资金管理+财务对账 分页搜索
已添加2个文件
已修改8个文件
61 ■■■■ 文件已修改
src/main/java/com/ruoyi/account/controller/AccountController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/account/controller/AccountReconciliationController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/account/mapper/AccountMapper.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/account/mapper/AccountReconciliationMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/account/service/AccountReconciliationService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/account/service/AccountService.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/account/service/impl/AccountReconciliationServiceImpl.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/account/service/impl/AccountServiceImpl.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/account/AccountMapper.xml 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/account/AccountReconciliationMapper.xml 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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));
    }
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));
    }
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);
}
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);
}
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);
}
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);
}
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);
    }
}
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);
    }
}
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>
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>