不明保证金退款筛选条件更新

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

@@ -16,6 +16,7 @@ import com.ruoyi.mast.bank.utils.JsonUtils;
 import com.ruoyi.system.api.RemoteBidNoticeService;
 import com.ruoyi.system.api.RemotePlanService;
 import com.ruoyi.system.api.domain.BidNotice;
+import com.sun.org.apache.xpath.internal.operations.Bool;
 import kong.unirest.core.HttpResponse;
 import kong.unirest.core.Unirest;
 import org.apache.poi.hssf.eventusermodel.AbortableHSSFListener;
@@ -75,6 +76,9 @@ public class BankDepositController extends BaseController {
     @Autowired
     private RemoteBidNoticeService remoteBidNoticeService;
 
+    @Autowired
+    private IBankTenderqueryService bankTenderqueryService;
+
     /**
      * 查询查询保证金入账数量列表
      */
@@ -609,6 +613,7 @@ public class BankDepositController extends BaseController {
 
         List<BankUncleardeposit> bankUncleardeposits = bankUncleardepositService.refundBankUnclearInfo(bankUncleardeposit);
         for(BankUncleardeposit item : bankUncleardeposits){
+            Boolean flag = false;
             String company = item.getRtnOppassetname();
             String bankAccount = item.getRtnOppbankno();
             BigDecimal amount = item.getRtnAmt();
@@ -617,8 +622,26 @@ public class BankDepositController extends BaseController {
             bankRefund.setRtnTdracctnm(company);
             bankRefund.setRtnTdracctno(bankAccount);
             bankRefund.setRtnRfndamt(amount);
+
             List<BankRefund> bankRefunds = bankRefundService.selectBankRefundList(bankRefund);
-            if(bankRefunds.size() == 0){
+
+            for(BankRefund refund : bankRefunds){
+                String prjno = refund.getPrjno();
+                String rtnSgtacctno = "";
+
+                BankTenderquery bankTenderquery = new BankTenderquery();
+                bankTenderquery.setPrjno(prjno);
+                List<BankTenderquery> bankTenderqueries = bankTenderqueryService.selectBankTenderqueryList(bankTenderquery);
+                if(bankTenderqueries.size() > 0){
+                    rtnSgtacctno = bankTenderqueries.get(0).getRtnSgtacctno();
+                }
+
+                if(bankUncleardeposit.getRtnAdjustreason().contains(rtnSgtacctno)){
+                    flag = true;
+                }
+            }
+
+            if(bankRefunds.size() == 0 || flag == false){
                 list.add(item);
             }
         }