历史付款列表添加关键字搜索

hx-account/src/main/java/com/fjhx/account/controller/account/AccountRequestFundsController.java

@@ -1,15 +1,18 @@
 package com.fjhx.account.controller.account;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.fjhx.common.constant.SourceConstant;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.account.entity.account.vo.AccountRequestFundsVo;
-import com.fjhx.account.entity.account.dto.AccountRequestFundsSelectDto;
 import com.fjhx.account.entity.account.dto.AccountRequestFundsDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.account.entity.account.dto.AccountRequestFundsSelectDto;
+import com.fjhx.account.entity.account.vo.AccountRequestFundsVo;
 import com.fjhx.account.service.account.AccountRequestFundsService;
+import com.fjhx.common.constant.SourceConstant;
+import com.ruoyi.common.core.domain.BaseSelectDto;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -73,9 +76,9 @@ public class AccountRequestFundsController {
     /**
      * 获取历史付款信息
      */
-    @GetMapping("/getPayHistoricalInfo")
-    public List<AccountRequestFundsVo> getPayHistoricalInfo() {
-        return accountRequestFundsService.getPayHistoricalInfo();
+    @PostMapping("/getPayHistoricalInfo")
+    public List<AccountRequestFundsVo> getPayHistoricalInfo(@RequestBody AccountRequestFundsSelectDto dto) {
+        return accountRequestFundsService.getPayHistoricalInfo(dto);
     }
 
 }

hx-account/src/main/java/com/fjhx/account/mapper/account/AccountRequestFundsMapper.java

@@ -1,9 +1,9 @@
 package com.fjhx.account.mapper.account;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.fjhx.account.entity.account.po.AccountRequestFunds;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.account.po.AccountRequestFunds;
 import com.fjhx.account.entity.account.vo.AccountRequestFundsVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
@@ -26,7 +26,7 @@ public interface AccountRequestFundsMapper extends BaseMapper<AccountRequestFund
      */
     Page<AccountRequestFundsVo> getPage(@Param("page") Page<Object> page, @Param("ew") QueryWrapper<Object> wrapper);
 
-    List<AccountRequestFundsVo> getPayHistoricalInfo(@Param("userId") Long userId);
+    List<AccountRequestFundsVo> getPayHistoricalInfo(@Param("ew") IWrapper<AccountRequestFunds> wrapper);
 
 
 }

hx-account/src/main/java/com/fjhx/account/service/account/AccountRequestFundsService.java

@@ -1,11 +1,11 @@
 package com.fjhx.account.service.account;
 
-import com.fjhx.account.entity.account.po.AccountRequestFunds;
-import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.account.entity.account.vo.AccountRequestFundsVo;
-import com.fjhx.account.entity.account.dto.AccountRequestFundsSelectDto;
 import com.fjhx.account.entity.account.dto.AccountRequestFundsDto;
+import com.fjhx.account.entity.account.dto.AccountRequestFundsSelectDto;
+import com.fjhx.account.entity.account.po.AccountRequestFunds;
+import com.fjhx.account.entity.account.vo.AccountRequestFundsVo;
+import com.ruoyi.common.core.service.BaseService;
 
 import java.util.List;
 
@@ -15,7 +15,7 @@ import java.util.List;
  * 请款表 服务类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-10
  */
 public interface AccountRequestFundsService extends BaseService<AccountRequestFunds> {
@@ -48,6 +48,5 @@ public interface AccountRequestFundsService extends BaseService<AccountRequestFu
     /**
      * 获取历史付款信息
      */
-    List<AccountRequestFundsVo> getPayHistoricalInfo();
-
+    List<AccountRequestFundsVo> getPayHistoricalInfo(AccountRequestFundsSelectDto dto);
 }

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountRequestFundsServiceImpl.java

@@ -28,6 +28,8 @@ import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.common.utils.wrapper.SqlField;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.utils.UserUtil;
@@ -247,8 +249,15 @@ public class AccountRequestFundsServiceImpl extends ServiceImpl<AccountRequestFu
      * 获取历史付款信息
      */
     @Override
-    public List<AccountRequestFundsVo> getPayHistoricalInfo() {
-        return baseMapper.getPayHistoricalInfo(SecurityUtils.getUserId());
+    public List<AccountRequestFundsVo> getPayHistoricalInfo(AccountRequestFundsSelectDto dto) {
+        IWrapper<AccountRequestFunds> wrapper = IWrapper.getWrapper();
+        wrapper.apply("CONCAT(COALESCE(arf.`name`, ''), COALESCE(arf.account_opening, ''), COALESCE(arf.opening_bank, ''), COALESCE(arf.interbank_number, '')) != ''");
+        wrapper.eq("arf.create_user", SecurityUtils.getUserId());
+        wrapper.keyword(dto.getKeyword(),
+                new SqlField("arf.`name`"),
+                new SqlField("arf.interbank_number")
+        );
+        return baseMapper.getPayHistoricalInfo(wrapper);
     }
 
 }

hx-account/src/main/resources/mapper/account/AccountRequestFundsMapper.xml

@@ -42,13 +42,7 @@
                         COALESCE(arf.opening_bank, '')     openingBank,
                         COALESCE(arf.interbank_number, '') interbankNumber
         FROM account_request_funds arf
-        WHERE CONCAT(
-                      COALESCE(arf.`name`, ''),
-                      COALESCE(arf.account_opening, ''),
-                      COALESCE(arf.opening_bank, ''),
-                      COALESCE(arf.interbank_number, '')
-                  ) != ''
-        and arf.create_user = #{userId}
+            ${ew.customSqlSegment}
     </select>
 
 </mapper>