Merge branch 'master' of http://gogs.hajianshe.cn/gmcs/HongHu-PSM

# Conflicts:
#	ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/controller/BankDepositdescrController.java
#	ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/controller/BankUncleardepositController.java

docker/ruoyi/modules/mast/dockerfile

@@ -1,5 +1,5 @@
 # 基础镜像
-FROM  openjdk:8-jre
+FROM  openjdk:11.0.16-jre
 # author
 MAINTAINER ruoyi
 

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidQuoteController.java

@@ -81,9 +81,9 @@ public class BidQuoteController extends BaseController
 
     // 查询保证金提交待审核状态的信息
     @GetMapping("/selectEarnList")
-    public TableDataInfo selectEarnList(){
+    public TableDataInfo selectEarnList(EarnParam earnParam){
         startPage();
-        List<Earnest> earnests = bidQuoteService.selectEarnList();
+        List<Earnest> earnests = bidQuoteService.selectEarnList(earnParam);
         for(Earnest earnest : earnests){
             Long ownerDept = earnest.getOwnerDept();
             SysDept sysDept = remoteUserService.getInfoById(ownerDept,SecurityConstants.INNER);

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidTenderController.java

@@ -26,7 +26,6 @@ import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.security.annotation.InnerAuth;
 import com.ruoyi.common.security.service.TokenService;
 import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.mast.bank.domain.BankDepositdescr;
 import com.ruoyi.system.api.*;
 import com.ruoyi.system.api.domain.*;
 import com.ruoyi.system.api.util.DeptUtil;
@@ -665,7 +664,9 @@ public class BidTenderController extends BaseController {
     public int getDeposit(){
         List<BidNotice> bidNotices = bidNoticeService.selectBidNoticeList(new BidNotice());
         int i = 0;
+        System.out.println("22222222222222222222");
         for(BidNotice bidNotice : bidNotices){
+            System.out.println("111111111111111111111111111");
             String s = remoteDepositService.getDepositByNoticeId(bidNotice.getUid(), SecurityConstants.INNER);
             logger.info("同步银行入账信息结果：{}",s.length());
             i++;
@@ -712,7 +713,7 @@ public class BidTenderController extends BaseController {
                 bankDepositdescr.setRtnCode(item.getRtnCode());
                 bankDepositdescr.setRtnSeverity(item.getRtnSeverity());
                 bankDepositdescr.setRtnMessage(item.getRtnMessage());
-                bankDepositdescr.setRtnRsbody(item.getRtnRsbody());
+//                bankDepositdescr.setRtnRsbody(item.getRtnRsbody());
                 bankDepositdescr.setRtnRcrdtotnum(item.getRtnRcrdtotnum());
                 bankDepositdescr.setRtnCrnpgno(item.getRtnCrnpgno());
                 bankDepositdescr.setRtnPgrcrdnum(item.getRtnPgrcrdnum());

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/domain/EarnParam.java

@@ -0,0 +1,67 @@
+package com.hh.bidding.domain;
+
+/**
+ * @author GMCS
+ * @version 1.0
+ * @title EarnParam
+ * @description
+ * @create 2024/9/19 15:15
+ */
+// 保证金审核列表模糊查询参数
+public class EarnParam {
+
+    // 公告标题
+    private String title;
+
+    // 项目编号
+    private String code;
+
+    // 招标项目名称
+    private String projName;
+
+    // 采购商
+    private String company;
+
+    // 供应商
+    private String supplier;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getProjName() {
+        return projName;
+    }
+
+    public void setProjName(String projName) {
+        this.projName = projName;
+    }
+
+    public String getCompany() {
+        return company;
+    }
+
+    public void setCompany(String company) {
+        this.company = company;
+    }
+
+    public String getSupplier() {
+        return supplier;
+    }
+
+    public void setSupplier(String supplier) {
+        this.supplier = supplier;
+    }
+}

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/mapper/BidQuoteMapper.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.hh.bidding.domain.BidQuote;
+import com.hh.bidding.domain.EarnParam;
 import com.hh.bidding.domain.Earnest;
 
 /**
@@ -75,7 +76,7 @@ public interface BidQuoteMapper
      *
      * @return
      */
-    public List<Earnest> selectEarnList();
+    public List<Earnest> selectEarnList(EarnParam earnParam);
 
     // 查询供应商报价
     public BidQuote selectQuoteBySupplier(Map map);

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/service/IBidQuoteService.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.hh.bidding.domain.BidQuote;
+import com.hh.bidding.domain.EarnParam;
 import com.hh.bidding.domain.Earnest;
 
 /**
@@ -75,7 +76,7 @@ public interface IBidQuoteService
      *
      * @return
      */
-    public List<Earnest> selectEarnList();
+    public List<Earnest> selectEarnList(EarnParam earnParam);
 
     // 查询供应商报价
     public BidQuote selectQuoteBySupplier(Map map);

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/service/impl/BidQuoteServiceImpl.java

@@ -3,6 +3,7 @@ package com.hh.bidding.service.impl;
 import java.util.List;
 import java.util.Map;
 
+import com.hh.bidding.domain.EarnParam;
 import com.hh.bidding.domain.Earnest;
 import com.ruoyi.common.core.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -103,8 +104,8 @@ public class BidQuoteServiceImpl implements IBidQuoteService
     }
 
     @Override
-    public List<Earnest> selectEarnList() {
-        return bidQuoteMapper.selectEarnList();
+    public List<Earnest> selectEarnList(EarnParam earnParam) {
+        return bidQuoteMapper.selectEarnList(earnParam);
     }
 
     @Override

ruoyi-modules/hh-bidding/src/main/resources/mapper/BidQuoteMapper.xml

@@ -122,7 +122,7 @@
         </foreach>
     </delete>
 
-    <select id="selectEarnList" resultType="com.hh.bidding.domain.Earnest">
+    <select id="selectEarnList" parameterType="com.hh.bidding.domain.EarnParam" resultType="com.hh.bidding.domain.Earnest">
         select q.sid,q.status,q.contact,q.contact_phone,q.qid,q.hid,
                t.s_code,t.owner_dept,
                n.u_title,
@@ -133,7 +133,13 @@
             inner join bid_notice n on q.sid = n.sid
             inner join ppm_procurement_plan p on p.aid = t.xy_id
             inner join bs_supplier s on q.hid = s.hid
-        where q.status = 2
+        <where>
+            <if test="title != null  and title != ''">and n.u_title like concat('%', #{title}, '%')</if>
+            <if test="code != null  and code != ''">and t.s_code like concat('%', #{code}, '%')</if>
+            <if test="projName != null  and projName != ''">and p.a_name like concat('%', #{projName}, '%')</if>
+            <if test="supplier != null  and supplier != ''">and s.h_name like concat('%', #{supplier}, '%')</if>
+            and q.status = 2
+        </where>
     </select>
 
     <select id = "selectQuoteBySupplier" parameterType="map">

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

@@ -179,13 +179,14 @@ public class BankDepositController extends BaseController {
     @InnerAuth
     @GetMapping("/getDepositByNoticeId")
     public String getDepositByNoticeId(@RequestParam("noticeId") Long noticeId){
+        System.out.println("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
         Map<String, Object> map = bankTenderpubController.getInfos(String.valueOf(noticeId));
         if (map.size() < 2) return "请检查标段发布和标段查询请求数据是否成功！";
         BankTenderpub bt = map.get("tenderpub") == null ? null : (BankTenderpub) map.get("tenderpub");
         BankTenderquery bq = map.get("tenderquery") == null ? null : (BankTenderquery) map.get("tenderquery");
         if (bt == null) return "标段发布数据异常，请检查！";
         if (bq == null) return "标段信息查询数据异常，请检查！";
-
+        System.out.println("BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB");
         BankDeposit bankDeposit = new BankDeposit();
         bankDeposit.setPpid(bq.getPpid());
         List<BankDeposit> list = bankDepositService.selectBankDepositList(bankDeposit);
@@ -194,7 +195,7 @@ public class BankDepositController extends BaseController {
                 bankDepositService.deleteBankDepositByDepositid(bd.getDepositid());
             }
         }
-
+        System.out.println("CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC");
         bankDeposit.setSgtid(bq.getRtnSgtid());
         bankDeposit.setSgtno(bq.getRtnSgtno());
         bankDeposit.setPrjno(bq.getRtnPrjno());
@@ -202,7 +203,7 @@ public class BankDepositController extends BaseController {
         bankDeposit.setEntpnm("");
 
         AjaxResult msg1 = addBankDeposit(bankDeposit);
-
+        System.out.println("DDDDDDDDDDDDDDDDDDDDDDDDDDDDDD");
         BankDeposit tempDeposit = new BankDeposit();
         tempDeposit.setPpid(bq.getPpid());
         List<BankDeposit> tempList = bankDepositService.selectBankDepositList(tempDeposit);
@@ -213,7 +214,7 @@ public class BankDepositController extends BaseController {
         int page = pgno / 20;
         int page1 = pgno % 20;
         if (page1 > 0) page += 1;
-
+        System.out.println("EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE");
         BankDepositdesc bankDepositdesc = new BankDepositdesc();
         bankDepositdesc.setPpid(bq.getPpid());
         List<BankDepositdesc> blist = bankDepositdescService.selectBankDepositdescList(bankDepositdesc);
@@ -495,6 +496,7 @@ public class BankDepositController extends BaseController {
 
 
     public AjaxResult addBankDeposit(BankDeposit bankDeposit) {
+        System.out.println("GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG");
         // 流水号
         String TRNUID = "BZJN" + System.currentTimeMillis() + (new Random().nextInt(1000) + 1);
 

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

@@ -53,6 +53,7 @@ public class BankDepositdescrController extends BaseController
     {
         startPage();
         List<BankDepositdescr> list = bankDepositdescrService.selectBankDepositdescrList(bankDepositdescr);
+<<<<<<< HEAD
 
         Long[] uids = list.stream().map(BankDepositdescr::getPpid).toArray(Long[]::new);
 
@@ -64,6 +65,19 @@ public class BankDepositdescrController extends BaseController
             }
         }
 
+=======
+        for(BankDepositdescr item : list){
+            if("3".equals(item.getRtnRfndst())){
+                item.setStatus("退款处理中");
+            }else if ("5".equals(item.getRtnRfndst())){
+                item.setStatus("退款成功");
+            }else if ("7".equals(item.getRtnRfndst())){
+                item.setStatus("退款失败");
+            }else{
+                item.setStatus("未申请退款");
+            }
+        }
+>>>>>>> 1279c2b4580a3f2b8c59b338b06d568b3be7de46
         return getDataTable(list);
     }
 

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

@@ -210,18 +210,22 @@ public class BankTenderpubController extends BaseController {
 
         String rtn = JsonUtils.getStatus(rtnxml);
         System.out.println("BBBBBBBBBBBBBBB");
+        System.out.println(rtnxml);
 
         if (rtn.contains("成功")) {
+            System.out.println("1111111111111111111111111111111111111");
             bankTenderpubService.insertBankTenderpub(bankTenderpub);
             String account = JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/OPENTENDERTRNRS/RSBODY/ACCTNO");
             String lno = JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/OPENTENDERTRNRS/RSBODY/SGTVRTLNO");
             if (update(bankTenderpub, rtnxml) > 0) {
                 /** 同时查询保存标段查询信息 **/
+                System.out.println("222222222222222222222222");
                 BankTenderpub b = bankTenderpubService.selectBankTenderpubByTenderpubid(bankTenderpub.getTenderpubid());
                 BankTenderquery bt = new BankTenderquery();
                 bt.setPpid(Long.valueOf(bankTenderpub.getPpid()));
                 bt.setSgtid(b.getRtnSgtid());
                 AjaxResult msg = bankTenderqueryController.addBankTenderquery(bt);
+                System.out.println(msg);
                 if (msg.isSuccess()) {
                     System.out.println("获取虚拟子账户");
                     return account+lno;

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

@@ -6,15 +6,11 @@ import java.util.List;
 import java.util.Random;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.uuid.UUID;
-import com.ruoyi.mast.bank.domain.BankTenderpub;
 import com.ruoyi.mast.bank.domain.BankUncleardepositrfnd;
 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 kong.unirest.core.HttpResponse;
 import kong.unirest.core.Unirest;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -51,9 +47,15 @@ public class BankUncleardepositController extends BaseController {
     @Autowired
     private BankUncleardepositrfndController bankUncleardepositrfndController;
 
+    @Autowired
+    private RemotePlanService remotePlanService;
+
+<<<<<<< HEAD
+=======
     @Autowired
     private Environment env;
 
+>>>>>>> 1279c2b4580a3f2b8c59b338b06d568b3be7de46
     /**
      * 查询查询不明保证金明细列表
      */
@@ -62,6 +64,18 @@ public class BankUncleardepositController extends BaseController {
     public TableDataInfo list(BankUncleardeposit bankUncleardeposit) {
         startPage();
         List<BankUncleardeposit> list = bankUncleardepositService.selectBankUncleardepositList(bankUncleardeposit);
+<<<<<<< HEAD
+=======
+        for(BankUncleardeposit item : list){
+            if(item.getRtnXferprccode() == null){
+                item.setStatus("未申请退款");
+            } else if("PAYOUT".equals(item.getRtnXferprccode())){
+                 item.setStatus("退款成功");
+             }else{
+                 item.setStatus("已申请");
+            }
+        }
+>>>>>>> 1279c2b4580a3f2b8c59b338b06d568b3be7de46
         return getDataTable(list);
     }
 
@@ -93,9 +107,7 @@ public class BankUncleardepositController extends BaseController {
         bt.setDestbailamt(bankUncleardeposit.getRtnSelfbal());
 
         AjaxResult msg = bankUncleardepositrfndController.addBankUncleardepositrfnd(bt);
-
-        if ((msg != null) && msg.containsValue("成功")) return success(msg);
-        else return error(msg.get("msg").toString());
+        return msg;
     }
 
     /**

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/domain/BankDepositdesc.java

@@ -219,6 +219,8 @@ public class BankDepositdesc extends BaseEntity
     @Excel(name = "交易附言")
     private String rtnRemark;
 
+    private String rtnRfndst;
+
     public void setDepositdescid(String depositdescid) 
     {
         this.depositdescid = depositdescid;
@@ -652,6 +654,14 @@ public class BankDepositdesc extends BaseEntity
         return rtnRemark;
     }
 
+    public String getRtnRfndst() {
+        return rtnRfndst;
+    }
+
+    public void setRtnRfndst(String rtnRfndst) {
+        this.rtnRfndst = rtnRfndst;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/domain/BankDepositdescr.java

@@ -223,6 +223,10 @@ public class BankDepositdescr extends BaseEntity
     @Excel(name = "原因")
     private String reason;
 
+    private String rtnRfndst;
+
+    private String status;
+
     public void setDepositdescid(String depositdescid) 
     {
         this.depositdescid = depositdescid;
@@ -665,6 +669,22 @@ public class BankDepositdescr extends BaseEntity
         return reason;
     }
 
+    public String getRtnRfndst() {
+        return rtnRfndst;
+    }
+
+    public void setRtnRfndst(String rtnRfndst) {
+        this.rtnRfndst = rtnRfndst;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/domain/BankUncleardeposit.java

@@ -154,6 +154,10 @@ public class BankUncleardeposit extends BaseEntity
     @Excel(name = "进入不明原因")
     private String rtnAdjustreason;
 
+    private String rtnXferprccode;
+
+    private String status;
+
     public void setUncleardepositid(String uncleardepositid) 
     {
         this.uncleardepositid = uncleardepositid;
@@ -478,4 +482,20 @@ public class BankUncleardeposit extends BaseEntity
     public void setPage(String page) {
         this.page = page;
     }
+
+    public String getRtnXferprccode() {
+        return rtnXferprccode;
+    }
+
+    public void setRtnXferprccode(String rtnXferprccode) {
+        this.rtnXferprccode = rtnXferprccode;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
 }

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

@@ -59,56 +59,57 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select depositdescid, ppid, trnuid, rqbody, sgtid, sgtno, prjno, pltfmcstno, entpnm, pgno, version, rtn_trnuid, rtn_status, rtn_code, rtn_severity, rtn_message, rtn_rsbody, rtn_rcrdtotnum, rtn_crnpgno, rtn_pgrcrdnum, rtn_totpgnum, rtn_content, rtn_lescstno, rtn_tdrno, rtn_cstno, rtn_prjno, rtn_prjnm, rtn_sgtno, rtn_sgtnm, rtn_sgtst, rtn_mrgnst, rtn_tdracctno, rtn_tdracctnoccycd, rtn_tdracctnm, rtn_tdracctnobnkno, rtn_tdracctnobnknm, rtn_tdrnum, rtn_mrgnamt, rtn_tdramt, rtn_agncsvcfee, rtn_frzamt, rtn_fineamt, rtn_tdrdt, rtn_tdrtm, rtn_duetp, rtn_mbrshpno, rtn_svcfee, rtn_remark from bank_depositdesc
     </sql>
 
-    <select id="selectBankDepositdescList" parameterType="BankDepositdesc" resultMap="BankDepositdescResult">
-        <include refid="selectBankDepositdescVo"/>
+    <select id="selectBankDepositdescList" parameterType="BankDepositdesc" resultType="com.ruoyi.mast.bank.domain.BankDepositdesc">
+        select b.*,r.rtn_rfndst
+        from bank_depositdesc b left join bank_refund r on (b.sgtid = r.sgtid and b.rtn_tdracctno = r.rtn_tdracctno)
         <where>  
-            <if test="ppid != null "> and ppid = #{ppid}</if>
-            <if test="trnuid != null  and trnuid != ''"> and trnuid = #{trnuid}</if>
-            <if test="rqbody != null  and rqbody != ''"> and rqbody = #{rqbody}</if>
-            <if test="sgtid != null  and sgtid != ''"> and sgtid = #{sgtid}</if>
-            <if test="sgtno != null  and sgtno != ''"> and sgtno = #{sgtno}</if>
-            <if test="prjno != null  and prjno != ''"> and prjno = #{prjno}</if>
-            <if test="pltfmcstno != null  and pltfmcstno != ''"> and pltfmcstno = #{pltfmcstno}</if>
-            <if test="entpnm != null  and entpnm != ''"> and entpnm = #{entpnm}</if>
-            <if test="pgno != null  and pgno != ''"> and pgno = #{pgno}</if>
-            <if test="version != null  and version != ''"> and version = #{version}</if>
-            <if test="rtnTrnuid != null  and rtnTrnuid != ''"> and rtn_trnuid = #{rtnTrnuid}</if>
-            <if test="rtnStatus != null  and rtnStatus != ''"> and rtn_status = #{rtnStatus}</if>
-            <if test="rtnCode != null  and rtnCode != ''"> and rtn_code = #{rtnCode}</if>
-            <if test="rtnSeverity != null  and rtnSeverity != ''"> and rtn_severity = #{rtnSeverity}</if>
-            <if test="rtnMessage != null  and rtnMessage != ''"> and rtn_message = #{rtnMessage}</if>
-            <if test="rtnRsbody != null  and rtnRsbody != ''"> and rtn_rsbody = #{rtnRsbody}</if>
-            <if test="rtnRcrdtotnum != null  and rtnRcrdtotnum != ''"> and rtn_rcrdtotnum = #{rtnRcrdtotnum}</if>
-            <if test="rtnCrnpgno != null  and rtnCrnpgno != ''"> and rtn_crnpgno = #{rtnCrnpgno}</if>
-            <if test="rtnPgrcrdnum != null  and rtnPgrcrdnum != ''"> and rtn_pgrcrdnum = #{rtnPgrcrdnum}</if>
-            <if test="rtnTotpgnum != null  and rtnTotpgnum != ''"> and rtn_totpgnum = #{rtnTotpgnum}</if>
-            <if test="rtnContent != null  and rtnContent != ''"> and rtn_content = #{rtnContent}</if>
-            <if test="rtnLescstno != null  and rtnLescstno != ''"> and rtn_lescstno = #{rtnLescstno}</if>
-            <if test="rtnTdrno != null  and rtnTdrno != ''"> and rtn_tdrno = #{rtnTdrno}</if>
-            <if test="rtnCstno != null  and rtnCstno != ''"> and rtn_cstno = #{rtnCstno}</if>
-            <if test="rtnPrjno != null  and rtnPrjno != ''"> and rtn_prjno = #{rtnPrjno}</if>
-            <if test="rtnPrjnm != null  and rtnPrjnm != ''"> and rtn_prjnm = #{rtnPrjnm}</if>
-            <if test="rtnSgtno != null  and rtnSgtno != ''"> and rtn_sgtno = #{rtnSgtno}</if>
-            <if test="rtnSgtnm != null  and rtnSgtnm != ''"> and rtn_sgtnm = #{rtnSgtnm}</if>
-            <if test="rtnSgtst != null  and rtnSgtst != ''"> and rtn_sgtst = #{rtnSgtst}</if>
-            <if test="rtnMrgnst != null  and rtnMrgnst != ''"> and rtn_mrgnst = #{rtnMrgnst}</if>
-            <if test="rtnTdracctno != null  and rtnTdracctno != ''"> and rtn_tdracctno = #{rtnTdracctno}</if>
-            <if test="rtnTdracctnoccycd != null  and rtnTdracctnoccycd != ''"> and rtn_tdracctnoccycd = #{rtnTdracctnoccycd}</if>
-            <if test="rtnTdracctnm != null  and rtnTdracctnm != ''"> and rtn_tdracctnm = #{rtnTdracctnm}</if>
-            <if test="rtnTdracctnobnkno != null  and rtnTdracctnobnkno != ''"> and rtn_tdracctnobnkno = #{rtnTdracctnobnkno}</if>
-            <if test="rtnTdracctnobnknm != null  and rtnTdracctnobnknm != ''"> and rtn_tdracctnobnknm = #{rtnTdracctnobnknm}</if>
-            <if test="rtnTdrnum != null  and rtnTdrnum != ''"> and rtn_tdrnum = #{rtnTdrnum}</if>
-            <if test="rtnMrgnamt != null "> and rtn_mrgnamt = #{rtnMrgnamt}</if>
-            <if test="rtnTdramt != null "> and rtn_tdramt = #{rtnTdramt}</if>
-            <if test="rtnAgncsvcfee != null "> and rtn_agncsvcfee = #{rtnAgncsvcfee}</if>
-            <if test="rtnFrzamt != null "> and rtn_frzamt = #{rtnFrzamt}</if>
-            <if test="rtnFineamt != null "> and rtn_fineamt = #{rtnFineamt}</if>
-            <if test="rtnTdrdt != null  and rtnTdrdt != ''"> and rtn_tdrdt = #{rtnTdrdt}</if>
-            <if test="rtnTdrtm != null  and rtnTdrtm != ''"> and rtn_tdrtm = #{rtnTdrtm}</if>
-            <if test="rtnDuetp != null  and rtnDuetp != ''"> and rtn_duetp = #{rtnDuetp}</if>
-            <if test="rtnMbrshpno != null  and rtnMbrshpno != ''"> and rtn_mbrshpno = #{rtnMbrshpno}</if>
-            <if test="rtnSvcfee != null "> and rtn_svcfee = #{rtnSvcfee}</if>
-            <if test="rtnRemark != null  and rtnRemark != ''"> and rtn_remark = #{rtnRemark}</if>
+            <if test="ppid != null and ppid !=''" > and b.ppid = #{ppid}</if>
+            <if test="trnuid != null  and trnuid != ''"> and b.trnuid like concat('%', #{trnuid}, '%')</if>
+            <if test="rqbody != null  and rqbody != ''"> and b.rqbody = #{rqbody}</if>
+            <if test="sgtid != null  and sgtid != ''"> and b.sgtid = #{sgtid}</if>
+            <if test="sgtno != null  and sgtno != ''"> and b.sgtno = #{sgtno}</if>
+            <if test="prjno != null  and prjno != ''"> and b.prjno = #{prjno}</if>
+            <if test="pltfmcstno != null  and pltfmcstno != ''"> and b.pltfmcstno = #{pltfmcstno}</if>
+            <if test="entpnm != null  and entpnm != ''"> and b.entpnm = #{entpnm}</if>
+            <if test="pgno != null  and pgno != ''"> and b.pgno = #{pgno}</if>
+            <if test="version != null  and version != ''"> and b.version = #{version}</if>
+            <if test="rtnTrnuid != null  and rtnTrnuid != ''"> and b.rtn_trnuid = #{rtnTrnuid}</if>
+            <if test="rtnStatus != null  and rtnStatus != ''"> and b.rtn_status = #{rtnStatus}</if>
+            <if test="rtnCode != null  and rtnCode != ''"> and b.rtn_code = #{rtnCode}</if>
+            <if test="rtnSeverity != null  and rtnSeverity != ''"> and b.rtn_severity = #{rtnSeverity}</if>
+            <if test="rtnMessage != null  and rtnMessage != ''"> and b.rtn_message = #{rtnMessage}</if>
+            <if test="rtnRsbody != null  and rtnRsbody != ''"> and b.rtn_rsbody = #{rtnRsbody}</if>
+            <if test="rtnRcrdtotnum != null  and rtnRcrdtotnum != ''"> and b.rtn_rcrdtotnum = #{rtnRcrdtotnum}</if>
+            <if test="rtnCrnpgno != null  and rtnCrnpgno != ''"> and b.rtn_crnpgno = #{rtnCrnpgno}</if>
+            <if test="rtnPgrcrdnum != null  and rtnPgrcrdnum != ''"> and b.rtn_pgrcrdnum = #{rtnPgrcrdnum}</if>
+            <if test="rtnTotpgnum != null  and rtnTotpgnum != ''"> and b.rtn_totpgnum = #{rtnTotpgnum}</if>
+            <if test="rtnContent != null  and rtnContent != ''"> and b.rtn_content = #{rtnContent}</if>
+            <if test="rtnLescstno != null  and rtnLescstno != ''"> and b.rtn_lescstno = #{rtnLescstno}</if>
+            <if test="rtnTdrno != null  and rtnTdrno != ''"> and b.rtn_tdrno = #{rtnTdrno}</if>
+            <if test="rtnCstno != null  and rtnCstno != ''"> and b.rtn_cstno = #{rtnCstno}</if>
+            <if test="rtnPrjno != null  and rtnPrjno != ''"> and b.rtn_prjno = #{rtnPrjno}</if>
+            <if test="rtnPrjnm != null  and rtnPrjnm != ''"> and b.rtn_prjnm = #{rtnPrjnm}</if>
+            <if test="rtnSgtno != null  and rtnSgtno != ''"> and b.rtn_sgtno = #{rtnSgtno}</if>
+            <if test="rtnSgtnm != null  and rtnSgtnm != ''"> and b.rtn_sgtnm = #{rtnSgtnm}</if>
+            <if test="rtnSgtst != null  and rtnSgtst != ''"> and b.rtn_sgtst = #{rtnSgtst}</if>
+            <if test="rtnMrgnst != null  and rtnMrgnst != ''"> and b.rtn_mrgnst = #{rtnMrgnst}</if>
+            <if test="rtnTdracctno != null  and rtnTdracctno != ''"> and b.rtn_tdracctno = #{rtnTdracctno}</if>
+            <if test="rtnTdracctnoccycd != null  and rtnTdracctnoccycd != ''"> and b.rtn_tdracctnoccycd = #{rtnTdracctnoccycd}</if>
+            <if test="rtnTdracctnm != null  and rtnTdracctnm != ''"> and b.rtn_tdracctnm like concat('%', #{rtnTdracctnm}, '%')</if>
+            <if test="rtnTdracctnobnkno != null  and rtnTdracctnobnkno != ''"> and b.rtn_tdracctnobnkno = #{rtnTdracctnobnkno}</if>
+            <if test="rtnTdracctnobnknm != null  and rtnTdracctnobnknm != ''"> and b.rtn_tdracctnobnknm = #{rtnTdracctnobnknm}</if>
+            <if test="rtnTdrnum != null  and rtnTdrnum != ''"> and b.rtn_tdrnum = #{rtnTdrnum}</if>
+            <if test="rtnMrgnamt != null "> and b.rtn_mrgnamt = #{rtnMrgnamt}</if>
+            <if test="rtnTdramt != null "> and b.rtn_tdramt = #{rtnTdramt}</if>
+            <if test="rtnAgncsvcfee != null "> and b.rtn_agncsvcfee = #{rtnAgncsvcfee}</if>
+            <if test="rtnFrzamt != null "> and b.rtn_frzamt = #{rtnFrzamt}</if>
+            <if test="rtnFineamt != null "> and b.rtn_fineamt = #{rtnFineamt}</if>
+            <if test="rtnTdrdt != null  and rtnTdrdt != ''"> and b.rtn_tdrdt = #{rtnTdrdt}</if>
+            <if test="rtnTdrtm != null  and rtnTdrtm != ''"> and b.rtn_tdrtm = #{rtnTdrtm}</if>
+            <if test="rtnDuetp != null  and rtnDuetp != ''"> and b.rtn_duetp = #{rtnDuetp}</if>
+            <if test="rtnMbrshpno != null  and rtnMbrshpno != ''"> and b.rtn_mbrshpno = #{rtnMbrshpno}</if>
+            <if test="rtnSvcfee != null "> and b.rtn_svcfee = #{rtnSvcfee}</if>
+            <if test="rtnRemark != null  and rtnRemark != ''"> and b.rtn_remark = #{rtnRemark}</if>
         </where>
     </select>
     

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

@@ -60,57 +60,58 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select depositdescid, ppid, trnuid, rqbody, sgtid, sgtno, prjno, pltfmcstno, entpnm, pgno, version, rtn_trnuid, rtn_status, rtn_code, rtn_severity, rtn_message, rtn_rsbody, rtn_rcrdtotnum, rtn_crnpgno, rtn_pgrcrdnum, rtn_totpgnum, rtn_content, rtn_lescstno, rtn_tdrno, rtn_cstno, rtn_prjno, rtn_prjnm, rtn_sgtno, rtn_sgtnm, rtn_sgtst, rtn_mrgnst, rtn_tdracctno, rtn_tdracctnoccycd, rtn_tdracctnm, rtn_tdracctnobnkno, rtn_tdracctnobnknm, rtn_tdrnum, rtn_mrgnamt, rtn_tdramt, rtn_agncsvcfee, rtn_frzamt, rtn_fineamt, rtn_tdrdt, rtn_tdrtm, rtn_duetp, rtn_mbrshpno, rtn_svcfee, rtn_remark, reason from bank_depositdescr
     </sql>
 
-    <select id="selectBankDepositdescrList" parameterType="BankDepositdescr" resultMap="BankDepositdescrResult">
-        <include refid="selectBankDepositdescrVo"/>
+    <select id="selectBankDepositdescrList" parameterType="BankDepositdescr" resultType="com.ruoyi.mast.bank.domain.BankDepositdescr">
+        select b.*,r.rtn_rfndst
+        from bank_depositdescr b left join bank_refund r on (b.sgtid = r.sgtid and b.rtn_tdracctno = r.rtn_tdracctno)
         <where>  
-            <if test="ppid != null "> and ppid = #{ppid}</if>
-            <if test="trnuid != null  and trnuid != ''"> and trnuid = #{trnuid}</if>
-            <if test="rqbody != null  and rqbody != ''"> and rqbody = #{rqbody}</if>
-            <if test="sgtid != null  and sgtid != ''"> and sgtid = #{sgtid}</if>
-            <if test="sgtno != null  and sgtno != ''"> and sgtno = #{sgtno}</if>
-            <if test="prjno != null  and prjno != ''"> and prjno = #{prjno}</if>
-            <if test="pltfmcstno != null  and pltfmcstno != ''"> and pltfmcstno = #{pltfmcstno}</if>
-            <if test="entpnm != null  and entpnm != ''"> and entpnm = #{entpnm}</if>
-            <if test="pgno != null  and pgno != ''"> and pgno = #{pgno}</if>
-            <if test="version != null  and version != ''"> and version = #{version}</if>
-            <if test="rtnTrnuid != null  and rtnTrnuid != ''"> and rtn_trnuid = #{rtnTrnuid}</if>
-            <if test="rtnStatus != null  and rtnStatus != ''"> and rtn_status = #{rtnStatus}</if>
-            <if test="rtnCode != null  and rtnCode != ''"> and rtn_code = #{rtnCode}</if>
-            <if test="rtnSeverity != null  and rtnSeverity != ''"> and rtn_severity = #{rtnSeverity}</if>
-            <if test="rtnMessage != null  and rtnMessage != ''"> and rtn_message = #{rtnMessage}</if>
-            <if test="rtnRsbody != null  and rtnRsbody != ''"> and rtn_rsbody = #{rtnRsbody}</if>
-            <if test="rtnRcrdtotnum != null  and rtnRcrdtotnum != ''"> and rtn_rcrdtotnum = #{rtnRcrdtotnum}</if>
-            <if test="rtnCrnpgno != null  and rtnCrnpgno != ''"> and rtn_crnpgno = #{rtnCrnpgno}</if>
-            <if test="rtnPgrcrdnum != null  and rtnPgrcrdnum != ''"> and rtn_pgrcrdnum = #{rtnPgrcrdnum}</if>
-            <if test="rtnTotpgnum != null  and rtnTotpgnum != ''"> and rtn_totpgnum = #{rtnTotpgnum}</if>
-            <if test="rtnContent != null  and rtnContent != ''"> and rtn_content = #{rtnContent}</if>
-            <if test="rtnLescstno != null  and rtnLescstno != ''"> and rtn_lescstno = #{rtnLescstno}</if>
-            <if test="rtnTdrno != null  and rtnTdrno != ''"> and rtn_tdrno = #{rtnTdrno}</if>
-            <if test="rtnCstno != null  and rtnCstno != ''"> and rtn_cstno = #{rtnCstno}</if>
-            <if test="rtnPrjno != null  and rtnPrjno != ''"> and rtn_prjno = #{rtnPrjno}</if>
-            <if test="rtnPrjnm != null  and rtnPrjnm != ''"> and rtn_prjnm = #{rtnPrjnm}</if>
-            <if test="rtnSgtno != null  and rtnSgtno != ''"> and rtn_sgtno = #{rtnSgtno}</if>
-            <if test="rtnSgtnm != null  and rtnSgtnm != ''"> and rtn_sgtnm = #{rtnSgtnm}</if>
-            <if test="rtnSgtst != null  and rtnSgtst != ''"> and rtn_sgtst = #{rtnSgtst}</if>
-            <if test="rtnMrgnst != null  and rtnMrgnst != ''"> and rtn_mrgnst = #{rtnMrgnst}</if>
-            <if test="rtnTdracctno != null  and rtnTdracctno != ''"> and rtn_tdracctno = #{rtnTdracctno}</if>
-            <if test="rtnTdracctnoccycd != null  and rtnTdracctnoccycd != ''"> and rtn_tdracctnoccycd = #{rtnTdracctnoccycd}</if>
-            <if test="rtnTdracctnm != null  and rtnTdracctnm != ''"> and rtn_tdracctnm = #{rtnTdracctnm}</if>
-            <if test="rtnTdracctnobnkno != null  and rtnTdracctnobnkno != ''"> and rtn_tdracctnobnkno = #{rtnTdracctnobnkno}</if>
-            <if test="rtnTdracctnobnknm != null  and rtnTdracctnobnknm != ''"> and rtn_tdracctnobnknm = #{rtnTdracctnobnknm}</if>
-            <if test="rtnTdrnum != null  and rtnTdrnum != ''"> and rtn_tdrnum = #{rtnTdrnum}</if>
-            <if test="rtnMrgnamt != null "> and rtn_mrgnamt = #{rtnMrgnamt}</if>
-            <if test="rtnTdramt != null "> and rtn_tdramt = #{rtnTdramt}</if>
-            <if test="rtnAgncsvcfee != null "> and rtn_agncsvcfee = #{rtnAgncsvcfee}</if>
-            <if test="rtnFrzamt != null "> and rtn_frzamt = #{rtnFrzamt}</if>
-            <if test="rtnFineamt != null "> and rtn_fineamt = #{rtnFineamt}</if>
-            <if test="rtnTdrdt != null  and rtnTdrdt != ''"> and rtn_tdrdt = #{rtnTdrdt}</if>
-            <if test="rtnTdrtm != null  and rtnTdrtm != ''"> and rtn_tdrtm = #{rtnTdrtm}</if>
-            <if test="rtnDuetp != null  and rtnDuetp != ''"> and rtn_duetp = #{rtnDuetp}</if>
-            <if test="rtnMbrshpno != null  and rtnMbrshpno != ''"> and rtn_mbrshpno = #{rtnMbrshpno}</if>
-            <if test="rtnSvcfee != null "> and rtn_svcfee = #{rtnSvcfee}</if>
-            <if test="rtnRemark != null  and rtnRemark != ''"> and rtn_remark = #{rtnRemark}</if>
-            <if test="reason != null  and reason != ''"> and reason = #{reason}</if>
+            <if test="ppid != null "> and b.ppid = #{ppid}</if>
+            <if test="trnuid != null  and trnuid != ''"> and b.trnuid like concat('%', #{trnuid}, '%')</if>
+            <if test="rqbody != null  and rqbody != ''"> and b.rqbody = #{rqbody}</if>
+            <if test="sgtid != null  and sgtid != ''"> and b.sgtid = #{sgtid}</if>
+            <if test="sgtno != null  and sgtno != ''"> and b.sgtno = #{sgtno}</if>
+            <if test="prjno != null  and prjno != ''"> and b.prjno = #{prjno}</if>
+            <if test="pltfmcstno != null  and pltfmcstno != ''"> and b.pltfmcstno = #{pltfmcstno}</if>
+            <if test="entpnm != null  and entpnm != ''"> and b.entpnm = #{entpnm}</if>
+            <if test="pgno != null  and pgno != ''"> and b.pgno = #{pgno}</if>
+            <if test="version != null  and version != ''"> and b.version = #{version}</if>
+            <if test="rtnTrnuid != null  and rtnTrnuid != ''"> and b.rtn_trnuid = #{rtnTrnuid}</if>
+            <if test="rtnStatus != null  and rtnStatus != ''"> and b.rtn_status = #{rtnStatus}</if>
+            <if test="rtnCode != null  and rtnCode != ''"> and b.rtn_code = #{rtnCode}</if>
+            <if test="rtnSeverity != null  and rtnSeverity != ''"> and b.rtn_severity = #{rtnSeverity}</if>
+            <if test="rtnMessage != null  and rtnMessage != ''"> and b.rtn_message = #{rtnMessage}</if>
+            <if test="rtnRsbody != null  and rtnRsbody != ''"> and b.rtn_rsbody = #{rtnRsbody}</if>
+            <if test="rtnRcrdtotnum != null  and rtnRcrdtotnum != ''"> and b.rtn_rcrdtotnum = #{rtnRcrdtotnum}</if>
+            <if test="rtnCrnpgno != null  and rtnCrnpgno != ''"> and b.rtn_crnpgno = #{rtnCrnpgno}</if>
+            <if test="rtnPgrcrdnum != null  and rtnPgrcrdnum != ''"> and b.rtn_pgrcrdnum = #{rtnPgrcrdnum}</if>
+            <if test="rtnTotpgnum != null  and rtnTotpgnum != ''"> and b.rtn_totpgnum = #{rtnTotpgnum}</if>
+            <if test="rtnContent != null  and rtnContent != ''"> and b.rtn_content = #{rtnContent}</if>
+            <if test="rtnLescstno != null  and rtnLescstno != ''"> and b.rtn_lescstno = #{rtnLescstno}</if>
+            <if test="rtnTdrno != null  and rtnTdrno != ''"> and b.rtn_tdrno = #{rtnTdrno}</if>
+            <if test="rtnCstno != null  and rtnCstno != ''"> and b.rtn_cstno = #{rtnCstno}</if>
+            <if test="rtnPrjno != null  and rtnPrjno != ''"> and b.rtn_prjno = #{rtnPrjno}</if>
+            <if test="rtnPrjnm != null  and rtnPrjnm != ''"> and b.rtn_prjnm = #{rtnPrjnm}</if>
+            <if test="rtnSgtno != null  and rtnSgtno != ''"> and b.rtn_sgtno = #{rtnSgtno}</if>
+            <if test="rtnSgtnm != null  and rtnSgtnm != ''"> and b.rtn_sgtnm = #{rtnSgtnm}</if>
+            <if test="rtnSgtst != null  and rtnSgtst != ''"> and b.rtn_sgtst = #{rtnSgtst}</if>
+            <if test="rtnMrgnst != null  and rtnMrgnst != ''"> and b.rtn_mrgnst = #{rtnMrgnst}</if>
+            <if test="rtnTdracctno != null  and rtnTdracctno != ''"> and b.rtn_tdracctno like concat('%', #{rtnTdracctno}, '%')</if>
+            <if test="rtnTdracctnoccycd != null  and rtnTdracctnoccycd != ''"> and b.rtn_tdracctnoccycd = #{rtnTdracctnoccycd}</if>
+            <if test="rtnTdracctnm != null  and rtnTdracctnm != ''"> and b.rtn_tdracctnm like concat('%', #{rtnTdracctnm}, '%')</if>
+            <if test="rtnTdracctnobnkno != null  and rtnTdracctnobnkno != ''"> and b.rtn_tdracctnobnkno = #{rtnTdracctnobnkno}</if>
+            <if test="rtnTdracctnobnknm != null  and rtnTdracctnobnknm != ''"> and b.rtn_tdracctnobnknm like concat('%', #{rtnTdracctnobnknm}, '%')</if>
+            <if test="rtnTdrnum != null  and rtnTdrnum != ''"> and b.rtn_tdrnum = #{rtnTdrnum}</if>
+            <if test="rtnMrgnamt != null "> and b.rtn_mrgnamt = #{rtnMrgnamt}</if>
+            <if test="rtnTdramt != null "> and b.rtn_tdramt = #{rtnTdramt}</if>
+            <if test="rtnAgncsvcfee != null "> and b.rtn_agncsvcfee = #{rtnAgncsvcfee}</if>
+            <if test="rtnFrzamt != null "> and b.rtn_frzamt = #{rtnFrzamt}</if>
+            <if test="rtnFineamt != null "> and b.rtn_fineamt = #{rtnFineamt}</if>
+            <if test="rtnTdrdt != null  and rtnTdrdt != ''"> and b.rtn_tdrdt = #{rtnTdrdt}</if>
+            <if test="rtnTdrtm != null  and rtnTdrtm != ''"> and b.rtn_tdrtm = #{rtnTdrtm}</if>
+            <if test="rtnDuetp != null  and rtnDuetp != ''"> and b.rtn_duetp = #{rtnDuetp}</if>
+            <if test="rtnMbrshpno != null  and rtnMbrshpno != ''"> and b.rtn_mbrshpno = #{rtnMbrshpno}</if>
+            <if test="rtnSvcfee != null "> and b.rtn_svcfee = #{rtnSvcfee}</if>
+            <if test="rtnRemark != null  and rtnRemark != ''"> and b.rtn_remark = #{rtnRemark}</if>
+            <if test="reason != null  and reason != ''"> and b.reason = #{reason}</if>
         </where>
     </select>
     

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

@@ -42,39 +42,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select uncleardepositid, ppid, trnuid, rqbody, acctno, ccycd, begdt, enddt, rtn_trnuid, rtn_status, rtn_code, rtn_severity, rtn_message, rtn_rsbody, rtn_rcrdtotnum, rtn_crnpgno, rtn_pgrcrdnum, rtn_totpgnum, rtn_content, rtn_tradedate, rtn_serialno, rtn_assetno, rtn_assetname, rtn_oppassetno, rtn_oppassetname, rtn_oppbankno, rtn_oppbankname, rtn_amt, rtn_selfbal, rtn_summary, rtn_adjustreason from bank_uncleardeposit
     </sql>
 
-    <select id="selectBankUncleardepositList" parameterType="BankUncleardeposit" resultMap="BankUncleardepositResult">
-        <include refid="selectBankUncleardepositVo"/>
+    <select id="selectBankUncleardepositList" parameterType="BankUncleardeposit" resultType="com.ruoyi.mast.bank.domain.BankUncleardeposit">
+        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,
+        u.rtn_adjustreason,r.rtn_xferprccode
+        from bank_uncleardeposit u left join bank_uncleardepositrfnd r on u.rtn_serialno = r.serialno
         <where>  
-            <if test="ppid != null "> and ppid = #{ppid}</if>
-            <if test="trnuid != null  and trnuid != ''"> and trnuid = #{trnuid}</if>
-            <if test="rqbody != null  and rqbody != ''"> and rqbody = #{rqbody}</if>
-            <if test="acctno != null  and acctno != ''"> and acctno = #{acctno}</if>
-            <if test="ccycd != null  and ccycd != ''"> and ccycd = #{ccycd}</if>
-            <if test="begdt != null  and begdt != ''"> and begdt = #{begdt}</if>
-            <if test="enddt != null  and enddt != ''"> and enddt = #{enddt}</if>
-            <if test="rtnTrnuid != null  and rtnTrnuid != ''"> and rtn_trnuid = #{rtnTrnuid}</if>
-            <if test="rtnStatus != null  and rtnStatus != ''"> and rtn_status = #{rtnStatus}</if>
-            <if test="rtnCode != null  and rtnCode != ''"> and rtn_code = #{rtnCode}</if>
-            <if test="rtnSeverity != null  and rtnSeverity != ''"> and rtn_severity = #{rtnSeverity}</if>
-            <if test="rtnMessage != null  and rtnMessage != ''"> and rtn_message = #{rtnMessage}</if>
-            <if test="rtnRsbody != null  and rtnRsbody != ''"> and rtn_rsbody = #{rtnRsbody}</if>
-            <if test="rtnRcrdtotnum != null  and rtnRcrdtotnum != ''"> and rtn_rcrdtotnum = #{rtnRcrdtotnum}</if>
-            <if test="rtnCrnpgno != null  and rtnCrnpgno != ''"> and rtn_crnpgno = #{rtnCrnpgno}</if>
-            <if test="rtnPgrcrdnum != null  and rtnPgrcrdnum != ''"> and rtn_pgrcrdnum = #{rtnPgrcrdnum}</if>
-            <if test="rtnTotpgnum != null  and rtnTotpgnum != ''"> and rtn_totpgnum = #{rtnTotpgnum}</if>
-            <if test="rtnContent != null  and rtnContent != ''"> and rtn_content = #{rtnContent}</if>
-            <if test="rtnTradedate != null  and rtnTradedate != ''"> and rtn_tradedate = #{rtnTradedate}</if>
-            <if test="rtnSerialno != null  and rtnSerialno != ''"> and rtn_serialno = #{rtnSerialno}</if>
-            <if test="rtnAssetno != null  and rtnAssetno != ''"> and rtn_assetno = #{rtnAssetno}</if>
-            <if test="rtnAssetname != null  and rtnAssetname != ''"> and rtn_assetname like concat('%', #{rtnAssetname}, '%')</if>
-            <if test="rtnOppassetno != null  and rtnOppassetno != ''"> and rtn_oppassetno = #{rtnOppassetno}</if>
-            <if test="rtnOppassetname != null  and rtnOppassetname != ''"> and rtn_oppassetname like concat('%', #{rtnOppassetname}, '%')</if>
-            <if test="rtnOppbankno != null  and rtnOppbankno != ''"> and rtn_oppbankno = #{rtnOppbankno}</if>
-            <if test="rtnOppbankname != null  and rtnOppbankname != ''"> and rtn_oppbankname like concat('%', #{rtnOppbankname}, '%')</if>
-            <if test="rtnAmt != null "> and rtn_amt = #{rtnAmt}</if>
-            <if test="rtnSelfbal != null "> and rtn_selfbal = #{rtnSelfbal}</if>
-            <if test="rtnSummary != null  and rtnSummary != ''"> and rtn_summary = #{rtnSummary}</if>
-            <if test="rtnAdjustreason != null  and rtnAdjustreason != ''"> and rtn_adjustreason = #{rtnAdjustreason}</if>
+            <if test="ppid != null "> and u.ppid = #{ppid}</if>
+            <if test="trnuid != null  and trnuid != ''"> and u.trnuid like concat('%', #{trnuid}, '%')</if>
+            <if test="rqbody != null  and rqbody != ''"> and u.rqbody = #{rqbody}</if>
+            <if test="acctno != null  and acctno != ''"> and u.acctno = #{acctno}</if>
+            <if test="ccycd != null  and ccycd != ''"> and u.ccycd = #{ccycd}</if>
+            <if test="begdt != null  and begdt != ''"> and u.begdt = #{begdt}</if>
+            <if test="enddt != null  and enddt != ''"> and u.enddt = #{enddt}</if>
+            <if test="rtnTrnuid != null  and rtnTrnuid != ''"> and u.rtn_trnuid = #{rtnTrnuid}</if>
+            <if test="rtnStatus != null  and rtnStatus != ''"> and u.rtn_status = #{rtnStatus}</if>
+            <if test="rtnCode != null  and rtnCode != ''"> and u.rtn_code = #{rtnCode}</if>
+            <if test="rtnSeverity != null  and rtnSeverity != ''"> and u.rtn_severity = #{rtnSeverity}</if>
+            <if test="rtnMessage != null  and rtnMessage != ''"> and u.rtn_message = #{rtnMessage}</if>
+            <if test="rtnRsbody != null  and rtnRsbody != ''"> and u.rtn_rsbody = #{rtnRsbody}</if>
+            <if test="rtnRcrdtotnum != null  and rtnRcrdtotnum != ''"> and u.rtn_rcrdtotnum = #{rtnRcrdtotnum}</if>
+            <if test="rtnCrnpgno != null  and rtnCrnpgno != ''"> and u.rtn_crnpgno = #{rtnCrnpgno}</if>
+            <if test="rtnPgrcrdnum != null  and rtnPgrcrdnum != ''"> and u.rtn_pgrcrdnum = #{rtnPgrcrdnum}</if>
+            <if test="rtnTotpgnum != null  and rtnTotpgnum != ''"> and u.rtn_totpgnum = #{rtnTotpgnum}</if>
+            <if test="rtnContent != null  and rtnContent != ''"> and u.rtn_content = #{rtnContent}</if>
+            <if test="rtnTradedate != null  and rtnTradedate != ''"> and u.rtn_tradedate = #{rtnTradedate}</if>
+            <if test="rtnSerialno != null  and rtnSerialno != ''"> and u.rtn_serialno = #{rtnSerialno}</if>
+            <if test="rtnAssetno != null  and rtnAssetno != ''"> and u.rtn_assetno = #{rtnAssetno}</if>
+            <if test="rtnAssetname != null  and rtnAssetname != ''"> and u.rtn_assetname like concat('%', #{rtnAssetname}, '%')</if>
+            <if test="rtnOppassetno != null  and rtnOppassetno != ''"> and u.rtn_oppassetno like concat('%', #{rtnOppassetno}, '%')</if>
+            <if test="rtnOppassetname != null  and rtnOppassetname != ''"> and u.rtn_oppassetname like concat('%', #{rtnOppassetname}, '%')</if>
+            <if test="rtnOppbankno != null  and rtnOppbankno != ''"> and u.rtn_oppbankno like concat('%', #{rtnOppbankno}, '%') </if>
+            <if test="rtnOppbankname != null  and rtnOppbankname != ''"> and u.rtn_oppbankname like concat('%', #{rtnOppbankname}, '%')</if>
+            <if test="rtnAmt != null "> and u.rtn_amt = #{rtnAmt}</if>
+            <if test="rtnSelfbal != null "> and u.rtn_selfbal = #{rtnSelfbal}</if>
+            <if test="rtnSummary != null  and rtnSummary != ''"> and u.rtn_summary = #{rtnSummary}</if>
+            <if test="rtnAdjustreason != null  and rtnAdjustreason != ''"> and u.rtn_adjustreason = #{rtnAdjustreason}</if>
         </where>
     </select>
     

ruoyi-ui/src/components/tender/components/CompPurchase.vue

@@ -595,6 +595,11 @@ export default {
     /** 提交审核 */
     handleSubmitApproval () {
       const _this = this;
+      if (!this.dialogDetail.detail.bankAccount) {
+        this.$message.error('请先获取虚拟子账户');
+        return;
+      }
+      
       this.$modal.confirm('是否确认发起审核标题为【' + this.dialogDetail.detail.uTitle + '】的招标公告？').then(function () {
         const formData = {
           uid: _this.dialogDetail.detail.uid,

ruoyi-ui/src/views/guarantee/examine/index.vue

@@ -1,30 +1,24 @@
 <template>
     <div class="app-container">
-      <!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
-        <el-form-item label="开始时间" prop="enrollStarttime">
-            <el-date-picker
-              v-model="queryParams.enrollStarttime"
-              type="date"
-              placeholder="请输入开始时间">
-            </el-date-picker>
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+        <el-form-item label="公告标题" prop="title">
+          <el-input v-model.trim="queryParams.title" placeholder="请输入公告标题" clearable @keyup.enter.native="handleQuery" />
         </el-form-item>
-        <el-form-item label="结束时间" prop="enrollEndtime">
-          <el-date-picker
-            v-model="queryParams.enrollEndtime"
-            type="date"
-            placeholder="请输入结束时间">
-          </el-date-picker>
+        <el-form-item label="项目编号" prop="code">
+          <el-input v-model.trim="queryParams.code" placeholder="请输入项目编号" clearable @keyup.enter.native="handleQuery"></el-input>
+        </el-form-item>
+        <el-form-item label="招标项目" prop="projName">
+          <el-input v-model.trim="queryParams.projName" placeholder="请输入招标项目" clearable @keyup.enter.native="handleQuery"></el-input>
+        </el-form-item>
+        <el-form-item label="供应商公司" prop="supplier">
+          <el-input v-model.trim="queryParams.supplier" placeholder="请输入供应商" clearable @keyup.enter.native="handleQuery"></el-input>
         </el-form-item>
 
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         </el-form-item>
-      </el-form> -->
-      
-      <!-- <el-row :gutter="10" class="mb8">
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row> -->
+      </el-form>
    
       <el-table v-loading="loading" :data="guaranteeList">
         <el-table-column type="index" label="序号" align="center" />
@@ -48,6 +42,9 @@
           </template>
         </el-table-column>
       </el-table>
+
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
     </div>
   </template>
   
@@ -66,9 +63,14 @@ import { checkRole } from "@/utils/permission";
         // 显示搜索条件
         showSearch: true,
         
+        total: 0,
         queryParams: {
           pageNum: 1,
-          pageSize: 10
+          pageSize: 10,
+          title:"",
+          code:"",
+          projName:"",
+          supplier:""
         },
 
         // 开票列表
@@ -101,6 +103,11 @@ import { checkRole } from "@/utils/permission";
       /** 重置按钮操作 */
       resetQuery() {
         this.resetForm("queryForm");
+        this.queryParams.supplier = null
+        this.queryParams.projName = null
+        this.queryParams.code = null
+        this.queryParams.title = null
+        
         this.handleQuery();
       },
 

ruoyi-ui/src/views/guarantee/list/components/bank.vue

@@ -1,21 +1,28 @@
 <template>
   <div>
-
     <el-table v-loading="loading" :data="data">
       <el-table-column type="index" label="序号" align="center" />
       <el-table-column label="银行流水号" align="center" prop="rtnSerialno" />
-      <el-table-column label="供应商名称" align="center" prop="rtnOppassetname" />
-      <el-table-column label="供应商银行账号" align="center" prop="rtnOppassetno" />
-      <el-table-column label="供应商开户行" align="center" prop="rtnOppbankname" />
+      <el-table-column label="入账账号" align="center" prop="rtnOppassetno"/>
+			<el-table-column label="入账账户名" align="center" prop="rtnOppassetname"/>
+			<el-table-column label="入账账号行名" align="center" prop="rtnOppbankname"/>
       <el-table-column label="交易日期" align="center" prop="rtnTradedate" />
       <el-table-column label="交易金额" align="center" prop="rtnAmt" />
       <el-table-column label="可退款金额" align="center" prop="rtnSelfbal" />
       <el-table-column label="摘要" align="center" prop="rtnSummary" />
       <el-table-column label="进入不明原因" align="center" prop="rtnAdjustreason" />
+      <el-table-column label="状态" align="center" prop="status" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleBackGuarantee(scope.row)"
-            v-hasPermi="['invoice:kaipiao:edit']">退不明保证金</el-button>
+          <el-button
+            v-if="scope.row.status == '未申请退款'"
+						size="mini"
+						type="text"
+						icon="el-icon-edit"
+						@click="handleBackGuarantee(scope.row)"
+						v-hasPermi="['bank:uncleardeposit:edit']"
+            :loading="backLoading"
+					>退还保证金</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -49,8 +56,13 @@ export default {
       total: 0,
       queryParams: {
         pageNum: 1,
-        pageSize: 10
+        pageSize: 10,
+        rtnOppassetno: null,
+        rtnOppassetname: null,
+        rtnOppbankno: null
       },
+
+      backLoading: false
     }
   },
 
@@ -74,19 +86,34 @@ export default {
 
     handleQuery (queryParams) {
       this.queryParams.pageNum = 1
-      //   this.queryParams.aCode = queryParams.aCode
-      //   this.queryParams.aName = queryParams.aName
-      //   this.queryParams.projectId = queryParams.projectId
+      this.queryParams.rtnOppassetno = queryParams.rtnOppassetno
+      this.queryParams.rtnOppassetname = queryParams.rtnOppassetname
+      this.queryParams.rtnOppbankno = queryParams.rtnOppbankno
       this.getList()
     },
 
+    // 多选框选中数据
+		handleSelectionChange(selection) {
+			this.ids = selection.map(item => item.uncleardepositid)
+			this.single = selection.length !== 1
+			this.multiple = !selection.length
+		},
+
     handleBackGuarantee (row) {
+      this.backLoading = true
       const uncleardepositid = row.uncleardepositid || this.ids
-      getUncleardeposit(uncleardepositid).then(response => {
-        console.log(response);
-        this.$message.success('退不明保证金成功')
-        this.getList()
-      });
+      
+      this.$modal.confirm('是否确认退还保证金入账明细编号为"' + uncleardepositid + '"的数据项？')
+        .then(() => {
+          getUncleardeposit(uncleardepositid).then(response => {
+            this.$message.success('退不明保证金成功')
+            this.getList()
+            this.backLoading = false
+          })
+          .catch(err => {
+            this.backLoading = false
+          })
+      })
     },
 
   }

ruoyi-ui/src/views/guarantee/list/components/custom.vue

@@ -8,7 +8,7 @@
                     icon="el-icon-delete"
                     size="mini"
                     :disabled="multiple"
-                    @click="handleDelete"
+                    @click="handleBackGuarantee"
                     v-hasPermi="['bank:depositdesc:remove']"
                 >批量退还保证金
                 </el-button>
@@ -18,22 +18,24 @@
             <el-table-column type="selection" width="55" align="center"/>
             <el-table-column type="index" label="序号" align="center" />
             <el-table-column label="银行流水号" align="center" prop="rtnTrnuid" />
-            <el-table-column label="供应商名称" align="center" prop="rtnTdracctnm" />
-            <el-table-column label="供应商银行账号" align="center" prop="rtnTdracctno" />
-            <el-table-column label="供应商开户行" align="center" prop="rtnTdracctnobnknm" />
+            <el-table-column label="入账账户名" align="center" prop="rtnTdracctnm" />
+            <el-table-column label="入账账号" align="center" prop="rtnTdracctno" />
+            <el-table-column label="入账账号行名" align="center" prop="rtnTdracctnobnknm" />
             <el-table-column label="交易日期" align="center" prop="rtnTdrdt" />
             <el-table-column label="交易金额" align="center" prop="rtnMrgnamt" />
-            <!-- <el-table-column label="可退款金额" align="center" prop="rtnSelfbal" /> -->
             <el-table-column label="摘要" align="center" prop="rtnRemark"/>
             <el-table-column label="进入不明原因" align="center" prop="reason"/>
+            <el-table-column label="状态" align="center" prop="status" />
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
                 <el-button
+                v-if="scope.row.status != '退款成功'"
                 size="mini"
                 type="text"
                 icon="el-icon-edit"
                 @click="handleBackGuarantee(scope.row)"
-                v-hasPermi="['invoice:kaipiao:edit']"
+				v-hasPermi="['bank:depositdesc:remove']"
+                :loading="backLoading"
                 >退不明保证金</el-button>
             </template>
             </el-table-column>
@@ -72,8 +74,13 @@ export default {
             total: 0,
             queryParams: {
                 pageNum: 1,
-                pageSize: 10
+                pageSize: 10,
+                rtnTdracctnm: null,
+                rtnTdracctno: null,
+                rtnTdracctnobnknm: null
             },
+
+            backLoading: false
         }
     },
 
@@ -89,8 +96,6 @@ export default {
 
             getUnknownBond(this.queryParams).then(response => {
                 this.data = response.rows;
-
-                console.log(this.data);
                 
                 this.total = response.total;
                 this.loading = false;
@@ -99,29 +104,34 @@ export default {
 
         handleQuery (queryParams) {
             this.queryParams.pageNum = 1
-            //   this.queryParams.aCode = queryParams.aCode
-            //   this.queryParams.aName = queryParams.aName
-            //   this.queryParams.projectId = queryParams.projectId
+            this.queryParams.rtnTdracctnm = queryParams.rtnOppassetname
+            this.queryParams.rtnTdracctno = queryParams.rtnOppassetno
+            this.queryParams.rtnTdracctnobnknm = queryParams.rtnOppbankno
             this.getList()
         },
 
         // 多选框选中数据
 		handleSelectionChange(selection) {
-            console.log(selection);
 			this.ids = selection.map(item => item.depositdescid)
 			this.single = selection.length !== 1
 			this.multiple = !selection.length
 		},
 
-        /** 删除按钮操作 */
-		handleDelete(row) {
+        /** 退还保证金 */
+		handleBackGuarantee(row) {
+            this.backLoading = true
 			const depositdescids = row.depositdescid || this.ids;
+
 			this.$modal.confirm('是否确认退还保证金入账明细编号为"' + depositdescids + '"的数据项？')
             .then(() => {
 				delDepositdesc(depositdescids)
                 .then(res => {
                     this.getList();
 				    this.$modal.msgSuccess("成功");
+                    this.backLoading = false
+                })
+                .catch(err => {
+                    this.backLoading = false
                 })
 			})
 		},

ruoyi-ui/src/views/guarantee/list/index.vue

@@ -1,26 +1,36 @@
 <template>
     <div class="app-container">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
-        <el-form-item label="开始时间" prop="enrollStarttime">
-            <el-date-picker
-              v-model="queryParams.enrollStarttime"
-              type="date"
-              placeholder="请输入开始时间">
-            </el-date-picker>
-        </el-form-item>
-        <el-form-item label="结束时间" prop="enrollEndtime">
-          <el-date-picker
-            v-model="queryParams.enrollEndtime"
-            type="date"
-            placeholder="请输入结束时间">
-          </el-date-picker>
-        </el-form-item>
-
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        </el-form-item>
-      </el-form>
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+				 label-width="68px">
+			<el-form-item label="入账账号" prop="rtnOppassetno">
+				<el-input
+					v-model="queryParams.rtnOppassetno"
+					placeholder="请输入入账账号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="入账账户名" prop="rtnOppassetname" label-width="120">
+				<el-input
+					v-model="queryParams.rtnOppassetname"
+					placeholder="请输入入账账户名"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="入账账号行号" prop="rtnOppbankno" label-width="120">
+				<el-input
+					v-model="queryParams.rtnOppbankno"
+					placeholder="请输入入账账号行号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item>
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+			</el-form-item>
+		</el-form>
 
       <el-tabs v-model="activeName" @tab-click="handleClick">
         <el-tab-pane label="银行自动不明" name="first">
@@ -66,7 +76,37 @@ import CompCustom from './components/custom.vue'
         
         queryParams: {
           pageNum: 1,
-          pageSize: 10
+          pageSize: 10,
+				  ppid: null,
+          trnuid: null,
+          rqbody: null,
+          acctno: null,
+          ccycd: null,
+          begdt: null,
+          enddt: null,
+          rtnTrnuid: null,
+          rtnStatus: null,
+          rtnCode: null,
+          rtnSeverity: null,
+          rtnMessage: null,
+          rtnRsbody: null,
+          rtnRcrdtotnum: null,
+          rtnCrnpgno: null,
+          rtnPgrcrdnum: null,
+          rtnTotpgnum: null,
+          rtnContent: null,
+          rtnTradedate: null,
+          rtnSerialno: null,
+          rtnAssetno: null,
+          rtnAssetname: null,
+          rtnOppassetno: null,
+          rtnOppassetname: null,
+          rtnOppbankno: null,
+          rtnOppbankname: null,
+          rtnAmt: null,
+          rtnSelfbal: null,
+          rtnSummary: null,
+          rtnAdjustreason: null
         }
       };
     },
@@ -90,12 +130,19 @@ import CompCustom from './components/custom.vue'
       /** 搜索按钮操作 */
       handleQuery() {
         this.queryParams.pageNum = 1;
-        this.getList();
+
+        if (this.activeName == 'first') {
+          this.$refs.refBank.handleQuery(this.queryParams)
+        } else {
+          this.$refs.refCustom.handleQuery(this.queryParams)
+        }
       },
 
       /** 重置按钮操作 */
       resetQuery() {
-        this.resetForm("queryForm");
+        this.queryParams.rtnOppassetno = null
+        this.queryParams.rtnOppassetname = null
+        this.queryParams.rtnOppbankno = null
         this.handleQuery();
       },