不明退款增加模糊查询

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/controller/BankDepositController.java

@@ -572,7 +572,7 @@ public class BankDepositController extends BaseController {
     @InnerAuth
     @PostMapping("/refundBankUnlear")
     public void refundBankUnlear(){
-        List<BankUncleardeposit> bankUncleardeposits = bankUncleardepositService.refundBankUnclearList();
+        List<BankUncleardeposit> bankUncleardeposits = bankUncleardepositService.refundBankUnclearList(new BankUncleardeposit());
 
         for(BankUncleardeposit bankUncleardeposit : bankUncleardeposits){
             bankUncleardepositController.getInfo(bankUncleardeposit.getUncleardepositid());
@@ -585,9 +585,9 @@ public class BankDepositController extends BaseController {
      * @return
      */
     @GetMapping("/refundBankUnclearList")
-    public TableDataInfo refundBankUnclearList(){
+    public TableDataInfo refundBankUnclearList(BankUncleardeposit bankUncleardeposit){
         startPage();
-        List<BankUncleardeposit> bankUncleardeposits = bankUncleardepositService.refundBankUnclearList();
+        List<BankUncleardeposit> bankUncleardeposits = bankUncleardepositService.refundBankUnclearList(bankUncleardeposit);
 
         for(BankUncleardeposit item : bankUncleardeposits){
             if(item.getRtnXferprccode() == null){
@@ -603,11 +603,11 @@ public class BankDepositController extends BaseController {
     }
 
     @GetMapping("/refundBankUnclearInfo")
-    public TableDataInfo refundBankUnclearInfo(){
+    public TableDataInfo refundBankUnclearInfo(BankUncleardeposit bankUncleardeposit){
         List<BankUncleardeposit> list = new ArrayList<>();
         startPage();
 
-        List<BankUncleardeposit> bankUncleardeposits = bankUncleardepositService.refundBankUnclearInfo();
+        List<BankUncleardeposit> bankUncleardeposits = bankUncleardepositService.refundBankUnclearInfo(bankUncleardeposit);
         for(BankUncleardeposit item : bankUncleardeposits){
             String company = item.getRtnOppassetname();
             String bankAccount = item.getRtnOppbankno();

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/mapper/BankUncleardepositMapper.java

@@ -65,9 +65,9 @@ public interface BankUncleardepositMapper
     public List<BankUncleardeposit> selectExportList(Map map);
 
     //  查询不是服务费的不明保证金
-    public List<BankUncleardeposit> refundBankUnclearList();
+    public List<BankUncleardeposit> refundBankUnclearList(BankUncleardeposit bankUncleardeposit);
 
     // 查询退款款申请表中不存在的退款内容（）
-    public List<BankUncleardeposit> refundBankUnclearInfo();
+    public List<BankUncleardeposit> refundBankUnclearInfo(BankUncleardeposit bankUncleardeposit);
 
 }

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/service/IBankUncleardepositService.java

@@ -65,8 +65,8 @@ public interface IBankUncleardepositService
     public List<BankUncleardeposit> selectExportList(Map map);
 
     //  查询不是服务费的不明保证金
-    public List<BankUncleardeposit> refundBankUnclearList();
+    public List<BankUncleardeposit> refundBankUnclearList(BankUncleardeposit bankUncleardeposit);
 
     // 查询退款款申请表中不存在的退款内容（）
-    public List<BankUncleardeposit> refundBankUnclearInfo();
+    public List<BankUncleardeposit> refundBankUnclearInfo(BankUncleardeposit bankUncleardeposit);
 }

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/service/impl/BankUncleardepositServiceImpl.java

@@ -99,12 +99,12 @@ public class BankUncleardepositServiceImpl implements IBankUncleardepositService
     }
 
     @Override
-    public List<BankUncleardeposit> refundBankUnclearList() {
-        return bankUncleardepositMapper.refundBankUnclearList();
+    public List<BankUncleardeposit> refundBankUnclearList(BankUncleardeposit bankUncleardeposit) {
+        return bankUncleardepositMapper.refundBankUnclearList(bankUncleardeposit);
     }
 
     @Override
-    public List<BankUncleardeposit> refundBankUnclearInfo() {
-        return bankUncleardepositMapper.refundBankUnclearInfo();
+    public List<BankUncleardeposit> refundBankUnclearInfo(BankUncleardeposit bankUncleardeposit) {
+        return bankUncleardepositMapper.refundBankUnclearInfo(bankUncleardeposit);
     }
 }

ruoyi-modules/hh-mast/src/main/resources/mapper/bank/BankUncleardepositMapper.xml

@@ -210,17 +210,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select * from bank_uncleardeposit where rtn_tradedate between #{startTime} and #{endTime}
     </select>
 
-    <select id="refundBankUnclearList">
-        select u.uncleardepositid, u.ppid, u.trnuid, u.rqbody, u.acctno, u.ccycd, u.begdt, u.enddt, u.rtn_trnuid, u.rtn_status, u.rtn_code, u.rtn_severity, u.rtn_message, u.rtn_rsbody, u.rtn_rcrdtotnum, u.rtn_crnpgno, u.rtn_pgrcrdnum, u.rtn_totpgnum, u.rtn_content, u.rtn_tradedate, u.rtn_serialno, u.rtn_assetno, u.rtn_assetname, u.rtn_oppassetno, u.rtn_oppassetname, u.rtn_oppbankno, u.rtn_oppbankname, u.rtn_amt, u.rtn_selfbal, u.rtn_summary,
+    <select id="refundBankUnclearList" parameterType="com.ruoyi.mast.bank.domain.BankUncleardeposit">
+        select u.uncleardepositid, u.ppid, u.trnuid, u.acctno, u.ccycd, u.begdt, u.enddt, u.rtn_trnuid, u.rtn_status, u.rtn_code, u.rtn_severity, u.rtn_message, u.rtn_rcrdtotnum, u.rtn_crnpgno, u.rtn_pgrcrdnum, u.rtn_totpgnum, u.rtn_content, u.rtn_tradedate, u.rtn_serialno, u.rtn_assetno, u.rtn_assetname, u.rtn_oppassetno, u.rtn_oppassetname, u.rtn_oppbankno, u.rtn_oppbankname, u.rtn_amt, u.rtn_selfbal, u.rtn_summary,
                u.rtn_adjustreason,r.rtn_xferprccode,u.is_apply
         from bank_uncleardeposit u left join bank_uncleardepositrfnd r on u.rtn_serialno = r.serialno
-        where u.rtn_summary not like CONCAT('%','服务费','%') and u.rtn_adjustreason not like CONCAT('%','进入不明 原虚户=999999','%') and r.rtn_xferprccode is null and u.is_apply &lt; 3
+        <where>
+            <if test="rtnOppassetname != null">and rtn_oppassetname like concat('%',#{rtnOppassetname},'%') </if>
+            <if test="rtnOppassetno != null">and rtn_oppassetno like concat('%',#{rtnOppassetno},'%') </if>
+            and u.rtn_summary not like CONCAT('%','服务费','%') and u.rtn_adjustreason not like CONCAT('%','进入不明 原虚户=999999','%') and r.rtn_xferprccode is null and u.is_apply &lt; 3
+        </where>
     </select>
 
-    <select id="refundBankUnclearInfo">
-        select u.uncleardepositid, u.ppid, u.trnuid, u.rqbody, u.acctno, u.ccycd, u.begdt, u.enddt, u.rtn_trnuid, u.rtn_status, u.rtn_code, u.rtn_severity, u.rtn_message, u.rtn_rsbody, u.rtn_rcrdtotnum, u.rtn_crnpgno, u.rtn_pgrcrdnum, u.rtn_totpgnum, u.rtn_content, u.rtn_tradedate, u.rtn_serialno, u.rtn_assetno, u.rtn_assetname, u.rtn_oppassetno, u.rtn_oppassetname, u.rtn_oppbankno, u.rtn_oppbankname, u.rtn_amt, u.rtn_selfbal, u.rtn_summary,
+    <select id="refundBankUnclearInfo" parameterType="com.ruoyi.mast.bank.domain.BankUncleardeposit">
+        select u.uncleardepositid, u.ppid, u.trnuid, u.acctno, u.ccycd, u.begdt, u.enddt, u.rtn_trnuid, u.rtn_status, u.rtn_code, u.rtn_severity, u.rtn_message, u.rtn_rcrdtotnum, u.rtn_crnpgno, u.rtn_pgrcrdnum, u.rtn_totpgnum, u.rtn_content, u.rtn_tradedate, u.rtn_serialno, u.rtn_assetno, u.rtn_assetname, u.rtn_oppassetno, u.rtn_oppassetname, u.rtn_oppbankno, u.rtn_oppbankname, u.rtn_amt, u.rtn_selfbal, u.rtn_summary,
                u.rtn_adjustreason,r.rtn_xferprccode,u.is_apply
         from bank_uncleardeposit u left join bank_uncleardepositrfnd r on u.rtn_serialno = r.serialno
-        where u.rtn_summary not like CONCAT('%','服务费','%') and u.rtn_adjustreason not like CONCAT('%','进入不明 原虚户=999999','%') and r.rtn_xferprccode is null and u.is_apply = 3
+        <where>
+            <if test="rtnOppassetname != null">and rtn_oppassetname like concat('%',#{rtnOppassetname},'%') </if>
+            <if test="rtnOppassetno != null">and rtn_oppassetno like concat('%',#{rtnOppassetno},'%') </if>
+            and u.rtn_summary not like CONCAT('%','服务费','%') and u.rtn_adjustreason not like CONCAT('%','进入不明 原虚户=999999','%') and r.rtn_xferprccode is null and u.is_apply = 3
+        </where>
     </select>
 </mapper>