请款付款历史

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

@@ -1,15 +1,17 @@
 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.*;
+
+import java.util.List;
 
 
 /**
@@ -68,4 +70,12 @@ public class AccountRequestFundsController {
         accountRequestFundsService.delete(dto.getId());
     }
 
+    /**
+     * 获取历史付款信息
+     */
+    @GetMapping("/getPayHistoricalInfo")
+    public List<AccountRequestFundsVo> getPayHistoricalInfo() {
+        return accountRequestFundsService.getPayHistoricalInfo();
+    }
+
 }

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

@@ -1,13 +1,14 @@
 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;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -24,4 +25,9 @@ public interface AccountRequestFundsMapper extends BaseMapper<AccountRequestFund
      */
     Page<AccountRequestFundsVo> getPage(@Param("page") Page<Object> page, @Param("ew") QueryWrapper<Object> wrapper);
 
+    /**
+     * 获取历史付款信息
+     */
+    List<AccountRequestFundsVo> getPayHistoricalInfo();
+
 }

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

@@ -1,11 +1,13 @@
 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;
 
 
 /**
@@ -13,7 +15,7 @@ import com.fjhx.account.entity.account.dto.AccountRequestFundsDto;
  * 请款表 服务类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-10
  */
 public interface AccountRequestFundsService extends BaseService<AccountRequestFunds> {
@@ -43,4 +45,9 @@ public interface AccountRequestFundsService extends BaseService<AccountRequestFu
      */
     void delete(Long id);
 
+    /**
+     * 获取历史付款信息
+     */
+    List<AccountRequestFundsVo> getPayHistoricalInfo();
+
 }

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

@@ -211,4 +211,12 @@ public class AccountRequestFundsServiceImpl extends ServiceImpl<AccountRequestFu
         this.removeById(id);
     }
 
+    /**
+     * 获取历史付款信息
+     */
+    @Override
+    public List<AccountRequestFundsVo> getPayHistoricalInfo() {
+        return baseMapper.getPayHistoricalInfo();
+    }
+
 }

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

@@ -2,37 +2,50 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.account.mapper.account.AccountRequestFundsMapper">
     <select id="getPage" resultType="com.fjhx.account.entity.account.vo.AccountRequestFundsVo">
-        select
-            arf.id,
-            arf.department_id,
-            arf.corporation_id,
-            arf.account_management_id,
-            arf.payment_time,
-            arf.payment_remarks,
-            arf.currency,
-            arf.status,
-            arf.type,
-            arf.total,
-            arf.quantity,
-            arf.payment_method,
-            arf.name,
-            arf.opening_bank,
-            arf.account_opening,
-            arf.interbank_number,
-            arf.remarks,
-            arf.create_user,
-            arf.create_time,
-            arf.update_user,
-            arf.update_time,
-            arf.write_off_status,
-            arf.advance_id,
-            arf.advance_amounts,
-            ap.`status` accountPaymentStatus,
-            am.alias accountManagementName
+        select arf.id,
+               arf.department_id,
+               arf.corporation_id,
+               arf.account_management_id,
+               arf.payment_time,
+               arf.payment_remarks,
+               arf.currency,
+               arf.status,
+               arf.type,
+               arf.total,
+               arf.quantity,
+               arf.payment_method,
+               arf.name,
+               arf.opening_bank,
+               arf.account_opening,
+               arf.interbank_number,
+               arf.remarks,
+               arf.create_user,
+               arf.create_time,
+               arf.update_user,
+               arf.update_time,
+               arf.write_off_status,
+               arf.advance_id,
+               arf.advance_amounts,
+               ap.`status` accountPaymentStatus,
+               am.alias    accountManagementName
         from account_request_funds arf
                  left join account_payment ap on arf.id = ap.business_id
                  left join account_management am on arf.account_management_id = am.id
             ${ew.customSqlSegment}
     </select>
+    <select id="getPayHistoricalInfo" resultType="com.fjhx.account.entity.account.vo.AccountRequestFundsVo">
+        SELECT DISTINCT COALESCE
+                            (arf.`name`, '')               name,
+                        COALESCE(arf.account_opening, '')  accountOpening,
+                        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, '')
+                  ) != ''
+    </select>
 
 </mapper>