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

# Conflicts:
#	ruoyi-ui/src/views/bank/uncleardeposit/index.vue

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteBidTenderService.java

@@ -37,4 +37,16 @@ public interface RemoteBidTenderService {
 
     @GetMapping("/tender/sendSmsExpert")
     public int sendSmsExpert(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    @GetMapping("/tender/getDeposit")
+    public int getDeposit(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    @PostMapping("/tender/changeEarnestStatus")
+    public int changeEarnestStatus(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    @PostMapping("/tender/refund")
+    public int refund(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    @PostMapping("/tender/refundWinner")
+    public int refundWinner(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteDepositService.java

@@ -0,0 +1,47 @@
+package com.ruoyi.system.api;
+
+import com.ruoyi.common.core.constant.SecurityConstants;
+import com.ruoyi.common.core.constant.ServiceNameConstants;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.system.api.domain.BankDepositdesc;
+import com.ruoyi.system.api.domain.BankDepositdescr;
+import com.ruoyi.system.api.domain.BankTenderpub;
+import com.ruoyi.system.api.factory.RemoteTenderpubFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author GMCS
+ * @version 1.0
+ * @title RemoteDepositService
+ * @description
+ * @create 2024/9/14 10:30
+ */
+@FeignClient(contextId = "remoteDepositService", value = ServiceNameConstants.HH_MAST,
+        fallbackFactory = RemoteTenderpubFallbackFactory.class)
+public interface RemoteDepositService {
+
+    // 同步入账保证金
+    @GetMapping("/deposit/getDepositByNoticeId")
+    public String getDepositByNoticeId(@RequestParam("noticeId") Long noticeId,@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    // 保证金详情列表
+    @GetMapping("/deposit/getDepositList")
+    public List<BankDepositdesc> getDepositList(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    // 插入保证金入账失败原因
+    @PostMapping("/deposit/insertDepositReason")
+    public int insertDepositReason(@RequestBody BankDepositdescr bankDepositdescr,@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    @GetMapping("/deposit/getDeposits")
+    public List<BankDepositdesc> getDeposits(@RequestParam("uid") Long uid,@RequestParam("account") String account,@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    @PostMapping("/deposit/refundDeposit")
+    public int refundDeposit(@RequestParam("depositdescids") String[] depositdescids,@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    @PostMapping("/deposit/updateDeposit2")
+    public int updateDeposit2(@RequestParam("id") String id,@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+}

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/BankDepositdesc.java

@@ -0,0 +1,697 @@
+package com.ruoyi.system.api.domain;
+
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.math.BigDecimal;
+
+/**
+ * 查询保证金入账明细对象 bank_depositdesc
+ * 
+ * @author ruoyi
+ * @date 2024-09-03
+ */
+public class BankDepositdesc extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 查询保证金入账明细id */
+    private String depositdescid;
+
+    /** 采购计划id */
+    @Excel(name = "采购计划id")
+    private Long ppid;
+
+    /** 客户端交易的唯一流水号建议值为yyyymmdd+序号 */
+    @Excel(name = "客户端交易的唯一流水号建议值为yyyymmdd+序号")
+    private String trnuid;
+
+    /** 报文节点 */
+    @Excel(name = "报文节点")
+    private String rqbody;
+
+    /** 标段id */
+    @Excel(name = "标段id")
+    private String sgtid;
+
+    /** 标段编号 */
+    @Excel(name = "标段编号")
+    private String sgtno;
+
+    /** 项目编号 */
+    @Excel(name = "项目编号")
+    private String prjno;
+
+    /** 核心客户号 */
+    @Excel(name = "核心客户号")
+    private String pltfmcstno;
+
+    /** 企业名称 */
+    @Excel(name = "企业名称")
+    private String entpnm;
+
+    /** 页码不输默认查询第一页 */
+    @Excel(name = "页码不输默认查询第一页")
+    private String pgno;
+
+    /** 版本号（2.0新增响应字段remark） */
+    @Excel(name = "版本号", readConverterExp = "2=.0新增响应字段remark")
+    private String version;
+
+    /** 客户端交易的唯一标志 */
+    @Excel(name = "客户端交易的唯一标志")
+    private String rtnTrnuid;
+
+    /** 交易处理状态 */
+    @Excel(name = "交易处理状态")
+    private String rtnStatus;
+
+    /** 处理结果码 */
+    @Excel(name = "处理结果码")
+    private String rtnCode;
+
+    /** 处理结果等级(info/warn/error) */
+    @Excel(name = "处理结果等级(info/warn/error)")
+    private String rtnSeverity;
+
+    /** 处理信息描述 */
+    @Excel(name = "处理信息描述")
+    private String rtnMessage;
+
+    /** 报文节点 */
+    @Excel(name = "报文节点")
+    private String rtnRsbody;
+
+    /** 记录总数 */
+    @Excel(name = "记录总数")
+    private String rtnRcrdtotnum;
+
+    /** 当前页码 */
+    @Excel(name = "当前页码")
+    private String rtnCrnpgno;
+
+    /** 每页记录数 */
+    @Excel(name = "每页记录数")
+    private String rtnPgrcrdnum;
+
+    /** 总页数 */
+    @Excel(name = "总页数")
+    private String rtnTotpgnum;
+
+    /** 明细报文标识 */
+    @Excel(name = "明细报文标识")
+    private String rtnContent;
+
+    /** 租户号（默认：000） */
+    @Excel(name = "租户号", readConverterExp = "默=认：000")
+    private String rtnLescstno;
+
+    /** 投标编号（调用退款接口时使用） */
+    @Excel(name = "投标编号", readConverterExp = "调=用退款接口时使用")
+    private String rtnTdrno;
+
+    /** 客户编号（默认：10+核心客户号） */
+    @Excel(name = "客户编号", readConverterExp = "默=认：10+核心客户号")
+    private String rtnCstno;
+
+    /** 项目编号 */
+    @Excel(name = "项目编号")
+    private String rtnPrjno;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String rtnPrjnm;
+
+    /** 标段编号 */
+    @Excel(name = "标段编号")
+    private String rtnSgtno;
+
+    /** 标段名称 */
+    @Excel(name = "标段名称")
+    private String rtnSgtnm;
+
+    /** 投标状态0-未中标1-已中标 */
+    @Excel(name = "投标状态0-未中标1-已中标")
+    private String rtnSgtst;
+
+    /** 保证金状态 1-竞标 */
+    @Excel(name = "保证金状态 1-竞标")
+    private String rtnMrgnst;
+
+    /** 投标账号 */
+    @Excel(name = "投标账号")
+    private String rtnTdracctno;
+
+    /** 投标账号币种01-人民币 */
+    @Excel(name = "投标账号币种01-人民币")
+    private String rtnTdracctnoccycd;
+
+    /** 投标账户名称 */
+    @Excel(name = "投标账户名称")
+    private String rtnTdracctnm;
+
+    /** 投标账号行号 */
+    @Excel(name = "投标账号行号")
+    private String rtnTdracctnobnkno;
+
+    /** 投标账号行名 */
+    @Excel(name = "投标账号行名")
+    private String rtnTdracctnobnknm;
+
+    /** 投标数量 */
+    @Excel(name = "投标数量")
+    private String rtnTdrnum;
+
+    /** 保证金金额 double */
+    @Excel(name = "保证金金额 double")
+    private BigDecimal rtnMrgnamt;
+
+    /** 中标金额 double */
+    @Excel(name = "中标金额 double")
+    private BigDecimal rtnTdramt;
+
+    /** 代理服务费 double */
+    @Excel(name = "代理服务费 double")
+    private BigDecimal rtnAgncsvcfee;
+
+    /** 冻结金额 double */
+    @Excel(name = "冻结金额 double")
+    private BigDecimal rtnFrzamt;
+
+    /** 罚没金额 double */
+    @Excel(name = "罚没金额 double")
+    private BigDecimal rtnFineamt;
+
+    /** 投标日期yyyymmdd */
+    @Excel(name = "投标日期yyyymmdd")
+    private String rtnTdrdt;
+
+    /** 投标时间hhmmss */
+    @Excel(name = "投标时间hhmmss")
+    private String rtnTdrtm;
+
+    /** 缴纳类型0-一般保证金 1- 长期保证金 2-现金3-保函 */
+    @Excel(name = "缴纳类型0-一般保证金 1- 长期保证金 2-现金3-保函")
+    private String rtnDuetp;
+
+    /** 会员编号 */
+    @Excel(name = "会员编号")
+    private String rtnMbrshpno;
+
+    /** 服务费 double */
+    @Excel(name = "服务费 double")
+    private BigDecimal rtnSvcfee;
+
+    /** 交易附言 */
+    @Excel(name = "交易附言")
+    private String rtnRemark;
+
+    public void setDepositdescid(String depositdescid) 
+    {
+        this.depositdescid = depositdescid;
+    }
+
+    public String getDepositdescid() 
+    {
+        return depositdescid;
+    }
+    public void setPpid(Long ppid) 
+    {
+        this.ppid = ppid;
+    }
+
+    public Long getPpid() 
+    {
+        return ppid;
+    }
+    public void setTrnuid(String trnuid) 
+    {
+        this.trnuid = trnuid;
+    }
+
+    public String getTrnuid() 
+    {
+        return trnuid;
+    }
+    public void setRqbody(String rqbody) 
+    {
+        this.rqbody = rqbody;
+    }
+
+    public String getRqbody() 
+    {
+        return rqbody;
+    }
+    public void setSgtid(String sgtid) 
+    {
+        this.sgtid = sgtid;
+    }
+
+    public String getSgtid() 
+    {
+        return sgtid;
+    }
+    public void setSgtno(String sgtno) 
+    {
+        this.sgtno = sgtno;
+    }
+
+    public String getSgtno() 
+    {
+        return sgtno;
+    }
+    public void setPrjno(String prjno) 
+    {
+        this.prjno = prjno;
+    }
+
+    public String getPrjno() 
+    {
+        return prjno;
+    }
+    public void setPltfmcstno(String pltfmcstno) 
+    {
+        this.pltfmcstno = pltfmcstno;
+    }
+
+    public String getPltfmcstno() 
+    {
+        return pltfmcstno;
+    }
+    public void setEntpnm(String entpnm) 
+    {
+        this.entpnm = entpnm;
+    }
+
+    public String getEntpnm() 
+    {
+        return entpnm;
+    }
+    public void setPgno(String pgno) 
+    {
+        this.pgno = pgno;
+    }
+
+    public String getPgno() 
+    {
+        return pgno;
+    }
+    public void setVersion(String version) 
+    {
+        this.version = version;
+    }
+
+    public String getVersion() 
+    {
+        return version;
+    }
+    public void setRtnTrnuid(String rtnTrnuid) 
+    {
+        this.rtnTrnuid = rtnTrnuid;
+    }
+
+    public String getRtnTrnuid() 
+    {
+        return rtnTrnuid;
+    }
+    public void setRtnStatus(String rtnStatus) 
+    {
+        this.rtnStatus = rtnStatus;
+    }
+
+    public String getRtnStatus() 
+    {
+        return rtnStatus;
+    }
+    public void setRtnCode(String rtnCode) 
+    {
+        this.rtnCode = rtnCode;
+    }
+
+    public String getRtnCode() 
+    {
+        return rtnCode;
+    }
+    public void setRtnSeverity(String rtnSeverity) 
+    {
+        this.rtnSeverity = rtnSeverity;
+    }
+
+    public String getRtnSeverity() 
+    {
+        return rtnSeverity;
+    }
+    public void setRtnMessage(String rtnMessage) 
+    {
+        this.rtnMessage = rtnMessage;
+    }
+
+    public String getRtnMessage() 
+    {
+        return rtnMessage;
+    }
+    public void setRtnRsbody(String rtnRsbody) 
+    {
+        this.rtnRsbody = rtnRsbody;
+    }
+
+    public String getRtnRsbody() 
+    {
+        return rtnRsbody;
+    }
+    public void setRtnRcrdtotnum(String rtnRcrdtotnum) 
+    {
+        this.rtnRcrdtotnum = rtnRcrdtotnum;
+    }
+
+    public String getRtnRcrdtotnum() 
+    {
+        return rtnRcrdtotnum;
+    }
+    public void setRtnCrnpgno(String rtnCrnpgno) 
+    {
+        this.rtnCrnpgno = rtnCrnpgno;
+    }
+
+    public String getRtnCrnpgno() 
+    {
+        return rtnCrnpgno;
+    }
+    public void setRtnPgrcrdnum(String rtnPgrcrdnum) 
+    {
+        this.rtnPgrcrdnum = rtnPgrcrdnum;
+    }
+
+    public String getRtnPgrcrdnum() 
+    {
+        return rtnPgrcrdnum;
+    }
+    public void setRtnTotpgnum(String rtnTotpgnum) 
+    {
+        this.rtnTotpgnum = rtnTotpgnum;
+    }
+
+    public String getRtnTotpgnum() 
+    {
+        return rtnTotpgnum;
+    }
+    public void setRtnContent(String rtnContent) 
+    {
+        this.rtnContent = rtnContent;
+    }
+
+    public String getRtnContent() 
+    {
+        return rtnContent;
+    }
+    public void setRtnLescstno(String rtnLescstno) 
+    {
+        this.rtnLescstno = rtnLescstno;
+    }
+
+    public String getRtnLescstno() 
+    {
+        return rtnLescstno;
+    }
+    public void setRtnTdrno(String rtnTdrno) 
+    {
+        this.rtnTdrno = rtnTdrno;
+    }
+
+    public String getRtnTdrno() 
+    {
+        return rtnTdrno;
+    }
+    public void setRtnCstno(String rtnCstno) 
+    {
+        this.rtnCstno = rtnCstno;
+    }
+
+    public String getRtnCstno() 
+    {
+        return rtnCstno;
+    }
+    public void setRtnPrjno(String rtnPrjno) 
+    {
+        this.rtnPrjno = rtnPrjno;
+    }
+
+    public String getRtnPrjno() 
+    {
+        return rtnPrjno;
+    }
+    public void setRtnPrjnm(String rtnPrjnm) 
+    {
+        this.rtnPrjnm = rtnPrjnm;
+    }
+
+    public String getRtnPrjnm() 
+    {
+        return rtnPrjnm;
+    }
+    public void setRtnSgtno(String rtnSgtno) 
+    {
+        this.rtnSgtno = rtnSgtno;
+    }
+
+    public String getRtnSgtno() 
+    {
+        return rtnSgtno;
+    }
+    public void setRtnSgtnm(String rtnSgtnm) 
+    {
+        this.rtnSgtnm = rtnSgtnm;
+    }
+
+    public String getRtnSgtnm() 
+    {
+        return rtnSgtnm;
+    }
+    public void setRtnSgtst(String rtnSgtst) 
+    {
+        this.rtnSgtst = rtnSgtst;
+    }
+
+    public String getRtnSgtst() 
+    {
+        return rtnSgtst;
+    }
+    public void setRtnMrgnst(String rtnMrgnst) 
+    {
+        this.rtnMrgnst = rtnMrgnst;
+    }
+
+    public String getRtnMrgnst() 
+    {
+        return rtnMrgnst;
+    }
+    public void setRtnTdracctno(String rtnTdracctno) 
+    {
+        this.rtnTdracctno = rtnTdracctno;
+    }
+
+    public String getRtnTdracctno() 
+    {
+        return rtnTdracctno;
+    }
+    public void setRtnTdracctnoccycd(String rtnTdracctnoccycd) 
+    {
+        this.rtnTdracctnoccycd = rtnTdracctnoccycd;
+    }
+
+    public String getRtnTdracctnoccycd() 
+    {
+        return rtnTdracctnoccycd;
+    }
+    public void setRtnTdracctnm(String rtnTdracctnm) 
+    {
+        this.rtnTdracctnm = rtnTdracctnm;
+    }
+
+    public String getRtnTdracctnm() 
+    {
+        return rtnTdracctnm;
+    }
+    public void setRtnTdracctnobnkno(String rtnTdracctnobnkno) 
+    {
+        this.rtnTdracctnobnkno = rtnTdracctnobnkno;
+    }
+
+    public String getRtnTdracctnobnkno() 
+    {
+        return rtnTdracctnobnkno;
+    }
+    public void setRtnTdracctnobnknm(String rtnTdracctnobnknm) 
+    {
+        this.rtnTdracctnobnknm = rtnTdracctnobnknm;
+    }
+
+    public String getRtnTdracctnobnknm() 
+    {
+        return rtnTdracctnobnknm;
+    }
+    public void setRtnTdrnum(String rtnTdrnum) 
+    {
+        this.rtnTdrnum = rtnTdrnum;
+    }
+
+    public String getRtnTdrnum() 
+    {
+        return rtnTdrnum;
+    }
+    public void setRtnMrgnamt(BigDecimal rtnMrgnamt) 
+    {
+        this.rtnMrgnamt = rtnMrgnamt;
+    }
+
+    public BigDecimal getRtnMrgnamt() 
+    {
+        return rtnMrgnamt;
+    }
+    public void setRtnTdramt(BigDecimal rtnTdramt) 
+    {
+        this.rtnTdramt = rtnTdramt;
+    }
+
+    public BigDecimal getRtnTdramt() 
+    {
+        return rtnTdramt;
+    }
+    public void setRtnAgncsvcfee(BigDecimal rtnAgncsvcfee) 
+    {
+        this.rtnAgncsvcfee = rtnAgncsvcfee;
+    }
+
+    public BigDecimal getRtnAgncsvcfee() 
+    {
+        return rtnAgncsvcfee;
+    }
+    public void setRtnFrzamt(BigDecimal rtnFrzamt) 
+    {
+        this.rtnFrzamt = rtnFrzamt;
+    }
+
+    public BigDecimal getRtnFrzamt() 
+    {
+        return rtnFrzamt;
+    }
+    public void setRtnFineamt(BigDecimal rtnFineamt) 
+    {
+        this.rtnFineamt = rtnFineamt;
+    }
+
+    public BigDecimal getRtnFineamt() 
+    {
+        return rtnFineamt;
+    }
+    public void setRtnTdrdt(String rtnTdrdt) 
+    {
+        this.rtnTdrdt = rtnTdrdt;
+    }
+
+    public String getRtnTdrdt() 
+    {
+        return rtnTdrdt;
+    }
+    public void setRtnTdrtm(String rtnTdrtm) 
+    {
+        this.rtnTdrtm = rtnTdrtm;
+    }
+
+    public String getRtnTdrtm() 
+    {
+        return rtnTdrtm;
+    }
+    public void setRtnDuetp(String rtnDuetp) 
+    {
+        this.rtnDuetp = rtnDuetp;
+    }
+
+    public String getRtnDuetp() 
+    {
+        return rtnDuetp;
+    }
+    public void setRtnMbrshpno(String rtnMbrshpno) 
+    {
+        this.rtnMbrshpno = rtnMbrshpno;
+    }
+
+    public String getRtnMbrshpno() 
+    {
+        return rtnMbrshpno;
+    }
+    public void setRtnSvcfee(BigDecimal rtnSvcfee) 
+    {
+        this.rtnSvcfee = rtnSvcfee;
+    }
+
+    public BigDecimal getRtnSvcfee() 
+    {
+        return rtnSvcfee;
+    }
+    public void setRtnRemark(String rtnRemark) 
+    {
+        this.rtnRemark = rtnRemark;
+    }
+
+    public String getRtnRemark() 
+    {
+        return rtnRemark;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("depositdescid", getDepositdescid())
+            .append("ppid", getPpid())
+            .append("trnuid", getTrnuid())
+            .append("rqbody", getRqbody())
+            .append("sgtid", getSgtid())
+            .append("sgtno", getSgtno())
+            .append("prjno", getPrjno())
+            .append("pltfmcstno", getPltfmcstno())
+            .append("entpnm", getEntpnm())
+            .append("pgno", getPgno())
+            .append("version", getVersion())
+            .append("rtnTrnuid", getRtnTrnuid())
+            .append("rtnStatus", getRtnStatus())
+            .append("rtnCode", getRtnCode())
+            .append("rtnSeverity", getRtnSeverity())
+            .append("rtnMessage", getRtnMessage())
+            .append("rtnRsbody", getRtnRsbody())
+            .append("rtnRcrdtotnum", getRtnRcrdtotnum())
+            .append("rtnCrnpgno", getRtnCrnpgno())
+            .append("rtnPgrcrdnum", getRtnPgrcrdnum())
+            .append("rtnTotpgnum", getRtnTotpgnum())
+            .append("rtnContent", getRtnContent())
+            .append("rtnLescstno", getRtnLescstno())
+            .append("rtnTdrno", getRtnTdrno())
+            .append("rtnCstno", getRtnCstno())
+            .append("rtnPrjno", getRtnPrjno())
+            .append("rtnPrjnm", getRtnPrjnm())
+            .append("rtnSgtno", getRtnSgtno())
+            .append("rtnSgtnm", getRtnSgtnm())
+            .append("rtnSgtst", getRtnSgtst())
+            .append("rtnMrgnst", getRtnMrgnst())
+            .append("rtnTdracctno", getRtnTdracctno())
+            .append("rtnTdracctnoccycd", getRtnTdracctnoccycd())
+            .append("rtnTdracctnm", getRtnTdracctnm())
+            .append("rtnTdracctnobnkno", getRtnTdracctnobnkno())
+            .append("rtnTdracctnobnknm", getRtnTdracctnobnknm())
+            .append("rtnTdrnum", getRtnTdrnum())
+            .append("rtnMrgnamt", getRtnMrgnamt())
+            .append("rtnTdramt", getRtnTdramt())
+            .append("rtnAgncsvcfee", getRtnAgncsvcfee())
+            .append("rtnFrzamt", getRtnFrzamt())
+            .append("rtnFineamt", getRtnFineamt())
+            .append("rtnTdrdt", getRtnTdrdt())
+            .append("rtnTdrtm", getRtnTdrtm())
+            .append("rtnDuetp", getRtnDuetp())
+            .append("rtnMbrshpno", getRtnMbrshpno())
+            .append("rtnSvcfee", getRtnSvcfee())
+            .append("rtnRemark", getRtnRemark())
+            .toString();
+    }
+}

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/BankDepositdescr.java

@@ -0,0 +1,711 @@
+package com.ruoyi.system.api.domain;
+
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.math.BigDecimal;
+
+/**
+ * 查询保证金入账明细r对象 bank_depositdescr
+ * 
+ * @author ruoyi
+ * @date 2024-09-14
+ */
+public class BankDepositdescr extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 查询保证金入账明细id */
+    private String depositdescid;
+
+    /** 采购计划id */
+    @Excel(name = "采购计划id")
+    private Long ppid;
+
+    /** 客户端交易的唯一流水号建议值为yyyymmdd+序号 */
+    @Excel(name = "客户端交易的唯一流水号建议值为yyyymmdd+序号")
+    private String trnuid;
+
+    /** 报文节点 */
+    @Excel(name = "报文节点")
+    private String rqbody;
+
+    /** 标段id */
+    @Excel(name = "标段id")
+    private String sgtid;
+
+    /** 标段编号 */
+    @Excel(name = "标段编号")
+    private String sgtno;
+
+    /** 项目编号 */
+    @Excel(name = "项目编号")
+    private String prjno;
+
+    /** 核心客户号 */
+    @Excel(name = "核心客户号")
+    private String pltfmcstno;
+
+    /** 企业名称 */
+    @Excel(name = "企业名称")
+    private String entpnm;
+
+    /** 页码不输默认查询第一页 */
+    @Excel(name = "页码不输默认查询第一页")
+    private String pgno;
+
+    /** 版本号（2.0新增响应字段remark） */
+    @Excel(name = "版本号", readConverterExp = "2=.0新增响应字段remark")
+    private String version;
+
+    /** 客户端交易的唯一标志 */
+    @Excel(name = "客户端交易的唯一标志")
+    private String rtnTrnuid;
+
+    /** 交易处理状态 */
+    @Excel(name = "交易处理状态")
+    private String rtnStatus;
+
+    /** 处理结果码 */
+    @Excel(name = "处理结果码")
+    private String rtnCode;
+
+    /** 处理结果等级(info/warn/error) */
+    @Excel(name = "处理结果等级(info/warn/error)")
+    private String rtnSeverity;
+
+    /** 处理信息描述 */
+    @Excel(name = "处理信息描述")
+    private String rtnMessage;
+
+    /** 报文节点 */
+    @Excel(name = "报文节点")
+    private String rtnRsbody;
+
+    /** 记录总数 */
+    @Excel(name = "记录总数")
+    private String rtnRcrdtotnum;
+
+    /** 当前页码 */
+    @Excel(name = "当前页码")
+    private String rtnCrnpgno;
+
+    /** 每页记录数 */
+    @Excel(name = "每页记录数")
+    private String rtnPgrcrdnum;
+
+    /** 总页数 */
+    @Excel(name = "总页数")
+    private String rtnTotpgnum;
+
+    /** 明细报文标识 */
+    @Excel(name = "明细报文标识")
+    private String rtnContent;
+
+    /** 租户号（默认：000） */
+    @Excel(name = "租户号", readConverterExp = "默=认：000")
+    private String rtnLescstno;
+
+    /** 投标编号（调用退款接口时使用） */
+    @Excel(name = "投标编号", readConverterExp = "调=用退款接口时使用")
+    private String rtnTdrno;
+
+    /** 客户编号（默认：10+核心客户号） */
+    @Excel(name = "客户编号", readConverterExp = "默=认：10+核心客户号")
+    private String rtnCstno;
+
+    /** 项目编号 */
+    @Excel(name = "项目编号")
+    private String rtnPrjno;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String rtnPrjnm;
+
+    /** 标段编号 */
+    @Excel(name = "标段编号")
+    private String rtnSgtno;
+
+    /** 标段名称 */
+    @Excel(name = "标段名称")
+    private String rtnSgtnm;
+
+    /** 投标状态0-未中标1-已中标 */
+    @Excel(name = "投标状态0-未中标1-已中标")
+    private String rtnSgtst;
+
+    /** 保证金状态 1-竞标 */
+    @Excel(name = "保证金状态 1-竞标")
+    private String rtnMrgnst;
+
+    /** 投标账号 */
+    @Excel(name = "投标账号")
+    private String rtnTdracctno;
+
+    /** 投标账号币种01-人民币 */
+    @Excel(name = "投标账号币种01-人民币")
+    private String rtnTdracctnoccycd;
+
+    /** 投标账户名称 */
+    @Excel(name = "投标账户名称")
+    private String rtnTdracctnm;
+
+    /** 投标账号行号 */
+    @Excel(name = "投标账号行号")
+    private String rtnTdracctnobnkno;
+
+    /** 投标账号行名 */
+    @Excel(name = "投标账号行名")
+    private String rtnTdracctnobnknm;
+
+    /** 投标数量 */
+    @Excel(name = "投标数量")
+    private String rtnTdrnum;
+
+    /** 保证金金额 double */
+    @Excel(name = "保证金金额 double")
+    private BigDecimal rtnMrgnamt;
+
+    /** 中标金额 double */
+    @Excel(name = "中标金额 double")
+    private BigDecimal rtnTdramt;
+
+    /** 代理服务费 double */
+    @Excel(name = "代理服务费 double")
+    private BigDecimal rtnAgncsvcfee;
+
+    /** 冻结金额 double */
+    @Excel(name = "冻结金额 double")
+    private BigDecimal rtnFrzamt;
+
+    /** 罚没金额 double */
+    @Excel(name = "罚没金额 double")
+    private BigDecimal rtnFineamt;
+
+    /** 投标日期yyyymmdd */
+    @Excel(name = "投标日期yyyymmdd")
+    private String rtnTdrdt;
+
+    /** 投标时间hhmmss */
+    @Excel(name = "投标时间hhmmss")
+    private String rtnTdrtm;
+
+    /** 缴纳类型0-一般保证金 1- 长期保证金 2-现金3-保函 */
+    @Excel(name = "缴纳类型0-一般保证金 1- 长期保证金 2-现金3-保函")
+    private String rtnDuetp;
+
+    /** 会员编号 */
+    @Excel(name = "会员编号")
+    private String rtnMbrshpno;
+
+    /** 服务费 double */
+    @Excel(name = "服务费 double")
+    private BigDecimal rtnSvcfee;
+
+    /** 交易附言 */
+    @Excel(name = "交易附言")
+    private String rtnRemark;
+
+    /** 原因 */
+    @Excel(name = "原因")
+    private String reason;
+
+    public void setDepositdescid(String depositdescid) 
+    {
+        this.depositdescid = depositdescid;
+    }
+
+    public String getDepositdescid() 
+    {
+        return depositdescid;
+    }
+    public void setPpid(Long ppid) 
+    {
+        this.ppid = ppid;
+    }
+
+    public Long getPpid() 
+    {
+        return ppid;
+    }
+    public void setTrnuid(String trnuid) 
+    {
+        this.trnuid = trnuid;
+    }
+
+    public String getTrnuid() 
+    {
+        return trnuid;
+    }
+    public void setRqbody(String rqbody) 
+    {
+        this.rqbody = rqbody;
+    }
+
+    public String getRqbody() 
+    {
+        return rqbody;
+    }
+    public void setSgtid(String sgtid) 
+    {
+        this.sgtid = sgtid;
+    }
+
+    public String getSgtid() 
+    {
+        return sgtid;
+    }
+    public void setSgtno(String sgtno) 
+    {
+        this.sgtno = sgtno;
+    }
+
+    public String getSgtno() 
+    {
+        return sgtno;
+    }
+    public void setPrjno(String prjno) 
+    {
+        this.prjno = prjno;
+    }
+
+    public String getPrjno() 
+    {
+        return prjno;
+    }
+    public void setPltfmcstno(String pltfmcstno) 
+    {
+        this.pltfmcstno = pltfmcstno;
+    }
+
+    public String getPltfmcstno() 
+    {
+        return pltfmcstno;
+    }
+    public void setEntpnm(String entpnm) 
+    {
+        this.entpnm = entpnm;
+    }
+
+    public String getEntpnm() 
+    {
+        return entpnm;
+    }
+    public void setPgno(String pgno) 
+    {
+        this.pgno = pgno;
+    }
+
+    public String getPgno() 
+    {
+        return pgno;
+    }
+    public void setVersion(String version) 
+    {
+        this.version = version;
+    }
+
+    public String getVersion() 
+    {
+        return version;
+    }
+    public void setRtnTrnuid(String rtnTrnuid) 
+    {
+        this.rtnTrnuid = rtnTrnuid;
+    }
+
+    public String getRtnTrnuid() 
+    {
+        return rtnTrnuid;
+    }
+    public void setRtnStatus(String rtnStatus) 
+    {
+        this.rtnStatus = rtnStatus;
+    }
+
+    public String getRtnStatus() 
+    {
+        return rtnStatus;
+    }
+    public void setRtnCode(String rtnCode) 
+    {
+        this.rtnCode = rtnCode;
+    }
+
+    public String getRtnCode() 
+    {
+        return rtnCode;
+    }
+    public void setRtnSeverity(String rtnSeverity) 
+    {
+        this.rtnSeverity = rtnSeverity;
+    }
+
+    public String getRtnSeverity() 
+    {
+        return rtnSeverity;
+    }
+    public void setRtnMessage(String rtnMessage) 
+    {
+        this.rtnMessage = rtnMessage;
+    }
+
+    public String getRtnMessage() 
+    {
+        return rtnMessage;
+    }
+    public void setRtnRsbody(String rtnRsbody) 
+    {
+        this.rtnRsbody = rtnRsbody;
+    }
+
+    public String getRtnRsbody() 
+    {
+        return rtnRsbody;
+    }
+    public void setRtnRcrdtotnum(String rtnRcrdtotnum) 
+    {
+        this.rtnRcrdtotnum = rtnRcrdtotnum;
+    }
+
+    public String getRtnRcrdtotnum() 
+    {
+        return rtnRcrdtotnum;
+    }
+    public void setRtnCrnpgno(String rtnCrnpgno) 
+    {
+        this.rtnCrnpgno = rtnCrnpgno;
+    }
+
+    public String getRtnCrnpgno() 
+    {
+        return rtnCrnpgno;
+    }
+    public void setRtnPgrcrdnum(String rtnPgrcrdnum) 
+    {
+        this.rtnPgrcrdnum = rtnPgrcrdnum;
+    }
+
+    public String getRtnPgrcrdnum() 
+    {
+        return rtnPgrcrdnum;
+    }
+    public void setRtnTotpgnum(String rtnTotpgnum) 
+    {
+        this.rtnTotpgnum = rtnTotpgnum;
+    }
+
+    public String getRtnTotpgnum() 
+    {
+        return rtnTotpgnum;
+    }
+    public void setRtnContent(String rtnContent) 
+    {
+        this.rtnContent = rtnContent;
+    }
+
+    public String getRtnContent() 
+    {
+        return rtnContent;
+    }
+    public void setRtnLescstno(String rtnLescstno) 
+    {
+        this.rtnLescstno = rtnLescstno;
+    }
+
+    public String getRtnLescstno() 
+    {
+        return rtnLescstno;
+    }
+    public void setRtnTdrno(String rtnTdrno) 
+    {
+        this.rtnTdrno = rtnTdrno;
+    }
+
+    public String getRtnTdrno() 
+    {
+        return rtnTdrno;
+    }
+    public void setRtnCstno(String rtnCstno) 
+    {
+        this.rtnCstno = rtnCstno;
+    }
+
+    public String getRtnCstno() 
+    {
+        return rtnCstno;
+    }
+    public void setRtnPrjno(String rtnPrjno) 
+    {
+        this.rtnPrjno = rtnPrjno;
+    }
+
+    public String getRtnPrjno() 
+    {
+        return rtnPrjno;
+    }
+    public void setRtnPrjnm(String rtnPrjnm) 
+    {
+        this.rtnPrjnm = rtnPrjnm;
+    }
+
+    public String getRtnPrjnm() 
+    {
+        return rtnPrjnm;
+    }
+    public void setRtnSgtno(String rtnSgtno) 
+    {
+        this.rtnSgtno = rtnSgtno;
+    }
+
+    public String getRtnSgtno() 
+    {
+        return rtnSgtno;
+    }
+    public void setRtnSgtnm(String rtnSgtnm) 
+    {
+        this.rtnSgtnm = rtnSgtnm;
+    }
+
+    public String getRtnSgtnm() 
+    {
+        return rtnSgtnm;
+    }
+    public void setRtnSgtst(String rtnSgtst) 
+    {
+        this.rtnSgtst = rtnSgtst;
+    }
+
+    public String getRtnSgtst() 
+    {
+        return rtnSgtst;
+    }
+    public void setRtnMrgnst(String rtnMrgnst) 
+    {
+        this.rtnMrgnst = rtnMrgnst;
+    }
+
+    public String getRtnMrgnst() 
+    {
+        return rtnMrgnst;
+    }
+    public void setRtnTdracctno(String rtnTdracctno) 
+    {
+        this.rtnTdracctno = rtnTdracctno;
+    }
+
+    public String getRtnTdracctno() 
+    {
+        return rtnTdracctno;
+    }
+    public void setRtnTdracctnoccycd(String rtnTdracctnoccycd) 
+    {
+        this.rtnTdracctnoccycd = rtnTdracctnoccycd;
+    }
+
+    public String getRtnTdracctnoccycd() 
+    {
+        return rtnTdracctnoccycd;
+    }
+    public void setRtnTdracctnm(String rtnTdracctnm) 
+    {
+        this.rtnTdracctnm = rtnTdracctnm;
+    }
+
+    public String getRtnTdracctnm() 
+    {
+        return rtnTdracctnm;
+    }
+    public void setRtnTdracctnobnkno(String rtnTdracctnobnkno) 
+    {
+        this.rtnTdracctnobnkno = rtnTdracctnobnkno;
+    }
+
+    public String getRtnTdracctnobnkno() 
+    {
+        return rtnTdracctnobnkno;
+    }
+    public void setRtnTdracctnobnknm(String rtnTdracctnobnknm) 
+    {
+        this.rtnTdracctnobnknm = rtnTdracctnobnknm;
+    }
+
+    public String getRtnTdracctnobnknm() 
+    {
+        return rtnTdracctnobnknm;
+    }
+    public void setRtnTdrnum(String rtnTdrnum) 
+    {
+        this.rtnTdrnum = rtnTdrnum;
+    }
+
+    public String getRtnTdrnum() 
+    {
+        return rtnTdrnum;
+    }
+    public void setRtnMrgnamt(BigDecimal rtnMrgnamt) 
+    {
+        this.rtnMrgnamt = rtnMrgnamt;
+    }
+
+    public BigDecimal getRtnMrgnamt() 
+    {
+        return rtnMrgnamt;
+    }
+    public void setRtnTdramt(BigDecimal rtnTdramt) 
+    {
+        this.rtnTdramt = rtnTdramt;
+    }
+
+    public BigDecimal getRtnTdramt() 
+    {
+        return rtnTdramt;
+    }
+    public void setRtnAgncsvcfee(BigDecimal rtnAgncsvcfee) 
+    {
+        this.rtnAgncsvcfee = rtnAgncsvcfee;
+    }
+
+    public BigDecimal getRtnAgncsvcfee() 
+    {
+        return rtnAgncsvcfee;
+    }
+    public void setRtnFrzamt(BigDecimal rtnFrzamt) 
+    {
+        this.rtnFrzamt = rtnFrzamt;
+    }
+
+    public BigDecimal getRtnFrzamt() 
+    {
+        return rtnFrzamt;
+    }
+    public void setRtnFineamt(BigDecimal rtnFineamt) 
+    {
+        this.rtnFineamt = rtnFineamt;
+    }
+
+    public BigDecimal getRtnFineamt() 
+    {
+        return rtnFineamt;
+    }
+    public void setRtnTdrdt(String rtnTdrdt) 
+    {
+        this.rtnTdrdt = rtnTdrdt;
+    }
+
+    public String getRtnTdrdt() 
+    {
+        return rtnTdrdt;
+    }
+    public void setRtnTdrtm(String rtnTdrtm) 
+    {
+        this.rtnTdrtm = rtnTdrtm;
+    }
+
+    public String getRtnTdrtm() 
+    {
+        return rtnTdrtm;
+    }
+    public void setRtnDuetp(String rtnDuetp) 
+    {
+        this.rtnDuetp = rtnDuetp;
+    }
+
+    public String getRtnDuetp() 
+    {
+        return rtnDuetp;
+    }
+    public void setRtnMbrshpno(String rtnMbrshpno) 
+    {
+        this.rtnMbrshpno = rtnMbrshpno;
+    }
+
+    public String getRtnMbrshpno() 
+    {
+        return rtnMbrshpno;
+    }
+    public void setRtnSvcfee(BigDecimal rtnSvcfee) 
+    {
+        this.rtnSvcfee = rtnSvcfee;
+    }
+
+    public BigDecimal getRtnSvcfee() 
+    {
+        return rtnSvcfee;
+    }
+    public void setRtnRemark(String rtnRemark) 
+    {
+        this.rtnRemark = rtnRemark;
+    }
+
+    public String getRtnRemark() 
+    {
+        return rtnRemark;
+    }
+    public void setReason(String reason) 
+    {
+        this.reason = reason;
+    }
+
+    public String getReason() 
+    {
+        return reason;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("depositdescid", getDepositdescid())
+            .append("ppid", getPpid())
+            .append("trnuid", getTrnuid())
+            .append("rqbody", getRqbody())
+            .append("sgtid", getSgtid())
+            .append("sgtno", getSgtno())
+            .append("prjno", getPrjno())
+            .append("pltfmcstno", getPltfmcstno())
+            .append("entpnm", getEntpnm())
+            .append("pgno", getPgno())
+            .append("version", getVersion())
+            .append("rtnTrnuid", getRtnTrnuid())
+            .append("rtnStatus", getRtnStatus())
+            .append("rtnCode", getRtnCode())
+            .append("rtnSeverity", getRtnSeverity())
+            .append("rtnMessage", getRtnMessage())
+            .append("rtnRsbody", getRtnRsbody())
+            .append("rtnRcrdtotnum", getRtnRcrdtotnum())
+            .append("rtnCrnpgno", getRtnCrnpgno())
+            .append("rtnPgrcrdnum", getRtnPgrcrdnum())
+            .append("rtnTotpgnum", getRtnTotpgnum())
+            .append("rtnContent", getRtnContent())
+            .append("rtnLescstno", getRtnLescstno())
+            .append("rtnTdrno", getRtnTdrno())
+            .append("rtnCstno", getRtnCstno())
+            .append("rtnPrjno", getRtnPrjno())
+            .append("rtnPrjnm", getRtnPrjnm())
+            .append("rtnSgtno", getRtnSgtno())
+            .append("rtnSgtnm", getRtnSgtnm())
+            .append("rtnSgtst", getRtnSgtst())
+            .append("rtnMrgnst", getRtnMrgnst())
+            .append("rtnTdracctno", getRtnTdracctno())
+            .append("rtnTdracctnoccycd", getRtnTdracctnoccycd())
+            .append("rtnTdracctnm", getRtnTdracctnm())
+            .append("rtnTdracctnobnkno", getRtnTdracctnobnkno())
+            .append("rtnTdracctnobnknm", getRtnTdracctnobnknm())
+            .append("rtnTdrnum", getRtnTdrnum())
+            .append("rtnMrgnamt", getRtnMrgnamt())
+            .append("rtnTdramt", getRtnTdramt())
+            .append("rtnAgncsvcfee", getRtnAgncsvcfee())
+            .append("rtnFrzamt", getRtnFrzamt())
+            .append("rtnFineamt", getRtnFineamt())
+            .append("rtnTdrdt", getRtnTdrdt())
+            .append("rtnTdrtm", getRtnTdrtm())
+            .append("rtnDuetp", getRtnDuetp())
+            .append("rtnMbrshpno", getRtnMbrshpno())
+            .append("rtnSvcfee", getRtnSvcfee())
+            .append("rtnRemark", getRtnRemark())
+            .append("reason", getReason())
+            .toString();
+    }
+}

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/PpmProcurementPlan.java

@@ -6,6 +6,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -93,7 +94,7 @@ public class PpmProcurementPlan extends BaseEntity
 
     /** 保证金 */
     @Excel(name = "保证金")
-    private Long earnestMoney;
+    private BigDecimal earnestMoney;
 
     /** 招标开始时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -279,15 +280,15 @@ public class PpmProcurementPlan extends BaseEntity
     {
         return allowTenderAmount;
     }
-    public void setEarnestMoney(Long earnestMoney)
-    {
-        this.earnestMoney = earnestMoney;
-    }
 
-    public Long getEarnestMoney()
-    {
+    public BigDecimal getEarnestMoney() {
         return earnestMoney;
     }
+
+    public void setEarnestMoney(BigDecimal earnestMoney) {
+        this.earnestMoney = earnestMoney;
+    }
+
     public void setEnrollStarttime(Date enrollStarttime)
     {
         this.enrollStarttime = enrollStarttime;

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteBidTenderFallbackFactory.java

@@ -57,6 +57,26 @@ public class RemoteBidTenderFallbackFactory implements FallbackFactory<RemoteBid
             public int sendSmsExpert(String source) {
                 return 0;
             }
+
+            @Override
+            public int getDeposit(String source) {
+                return 0;
+            }
+
+            @Override
+            public int changeEarnestStatus(String source) {
+                return 0;
+            }
+
+            @Override
+            public int refund(String source) {
+                return 0;
+            }
+
+            @Override
+            public int refundWinner(String source) {
+                return 0;
+            }
         };
     }
 }

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteDepositFallbackFactory.java

@@ -0,0 +1,64 @@
+package com.ruoyi.system.api.factory;
+
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.system.api.RemoteDepositService;
+import com.ruoyi.system.api.RemoteTenderpubService;
+import com.ruoyi.system.api.domain.BankDepositdesc;
+import com.ruoyi.system.api.domain.BankDepositdescr;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author GMCS
+ * @version 1.0
+ * @title RemoteDepositFallbackFactory
+ * @description
+ * @create 2024/9/14 10:31
+ */
+@Component
+public class RemoteDepositFallbackFactory implements FallbackFactory<RemoteDepositService> {
+
+    private static final Logger log = LoggerFactory.getLogger(RemoteDepositFallbackFactory.class);
+
+    @Override
+    public RemoteDepositService create(Throwable throwable) {
+
+        log.error("用户服务调用失败:{}", throwable.getMessage());
+
+        return new RemoteDepositService() {
+            @Override
+            public String getDepositByNoticeId(Long noticeId, String source) {
+                return null;
+            }
+
+            @Override
+            public List<BankDepositdesc> getDepositList(String source) {
+                return null;
+            }
+
+            @Override
+            public int insertDepositReason(BankDepositdescr bankDepositdescr, String source) {
+                return 0;
+            }
+
+            @Override
+            public List<BankDepositdesc> getDeposits(Long uid, String account, String source) {
+                return null;
+            }
+
+            @Override
+            public int refundDeposit(String[] depositdescids, String source) {
+                return 0;
+            }
+
+            @Override
+            public int updateDeposit2(String id, String source) {
+                return 0;
+            }
+        };
+    }
+}

ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -7,4 +7,5 @@ com.ruoyi.system.api.factory.RemoteMaterialFallbackFactory
 com.ruoyi.system.api.factory.RemoteApprovalRecordFallbackFactory
 com.ruoyi.system.api.factory.RemoteBidTenderFallbackFactory
 com.ruoyi.system.api.factory.RemoteExpertFallbackFactory
-com.ruoyi.system.api.factory.RemoteTenderpubFallbackFactory
+com.ruoyi.system.api.factory.RemoteTenderpubFallbackFactory
+com.ruoyi.system.api.factory.RemoteDepositFallbackFactory

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

@@ -504,7 +504,7 @@ public class BidNoticeController extends BaseController {
         btp.setSgtno("BD" + DateUtils.dateTimeNow());
         btp.setSgtnm(bidNotice.getuTitle());
 
-        btp.setMrgnamt(BigDecimal.valueOf(ppp.getEarnestMoney()));
+        btp.setMrgnamt(ppp.getEarnestMoney());
         btp.setStrtsgtdt(DateUtils.parseDateToStr("yyyyMMdd", bidNotice.getuGetTime()));    //发标日期
 
         /** 保证金截至时间为开标时间前一小时 **/
@@ -518,10 +518,11 @@ public class BidNoticeController extends BaseController {
 
         String code = remoteTenderpubService.addInnerAuth(btp, SecurityConstants.INNER);
 
-        if(code != null){
+        if(code != null && code.length() == 24){
+            System.out.println("AAAAAAAAAAAAA");
             bidNotice.setBankAccount(code);
             int i = bidNoticeService.updateBidNotice(bidNotice);
-            return toAjax(i);
+            return AjaxResult.success("操作成功",code);
         }
         return error("获取虚拟子账户失败");
     }

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

@@ -15,6 +15,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.nacos.common.utils.MD5Utils;
 import com.hh.bidding.domain.*;
 import com.hh.bidding.domain.BidTender;
+import com.hh.bidding.domain.BidWinningResults;
 import com.hh.bidding.service.*;
 import com.ruoyi.common.core.constant.PriceConstants;
 import com.ruoyi.common.core.constant.SecurityConstants;
@@ -24,16 +25,15 @@ 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.system.api.RemoteBidTenderService;
-import com.ruoyi.system.api.RemoteMaterialService;
-import com.ruoyi.system.api.RemotePlanService;
-import com.ruoyi.system.api.RemoteUserService;
+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;
 import com.ruoyi.system.api.util.SmsUtil;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.ibatis.annotations.Param;
 import org.aspectj.weaver.loadtime.Aj;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -94,6 +94,11 @@ public class BidTenderController extends BaseController {
     @Autowired
     private IBidInfoService bidInfoService;
 
+    @Autowired
+    private RemoteDepositService remoteDepositService;
+
+    @Autowired
+    private IBidWinningResultsService bidWinningResultsService;
 
     public String getOwnerdepts() {
         List<Long> ids = remoteUserService.getDeptIds(SecurityUtils.getLoginUser().getUserid(), 1, "CHILDREN_COMPANY", SecurityConstants.INNER);
@@ -653,6 +658,252 @@ public class BidTenderController extends BaseController {
         return 0;
     }
 
+    // 定时同步银行入账信息
+    @InnerAuth
+    @GetMapping("/getDeposit")
+    public int getDeposit(){
+        List<BidNotice> bidNotices = bidNoticeService.selectBidNoticeList(new BidNotice());
+        int i = 0;
+        for(BidNotice bidNotice : bidNotices){
+            String s = remoteDepositService.getDepositByNoticeId(bidNotice.getUid(), SecurityConstants.INNER);
+            logger.info("同步银行入账信息结果：{}",s.length());
+            i++;
+        }
+        return i;
+    }
+    
+    // 定时更新是否提交保证金状态
+    @InnerAuth
+    @PostMapping("/changeEarnestStatus")
+    public int changeEarnestStatus(){
+        List<BankDepositdesc> depositList = remoteDepositService.getDepositList(SecurityConstants.INNER);
+        int res = 0;
+        for(BankDepositdesc item : depositList){
+            Long uid = item.getPpid();
+            String account = item.getRtnTdracctno();
+            String company = item.getRtnTdracctnm();
+            Map<String,String> map = new HashMap<>();
+            map.put("account",account);
+            map.put("company",company);
+            BidNotice bidNotice = bidNoticeService.selectBidNoticeByUid(uid);
+            Long sid = bidNotice.getSid();
+            BidTender bidTender = bidTenderService.selectBidTenderBySid(sid);
+            Integer aid = bidTender.getXyId();
+            PpmProcurementPlan plan = remotePlanService.getPlan(aid, SecurityConstants.INNER);
+            BigDecimal earnestMoney = plan.getEarnestMoney();
+            Long hid = bidTenderService.selectHidByAccount(map);
+
+            if(hid == null){
+                com.ruoyi.system.api.domain.BankDepositdescr bankDepositdescr = new com.ruoyi.system.api.domain.BankDepositdescr();
+                bankDepositdescr.setDepositdescid(item.getDepositdescid());
+                bankDepositdescr.setPpid(item.getPpid());
+                bankDepositdescr.setTrnuid(item.getTrnuid());
+                bankDepositdescr.setRqbody(item.getRqbody());
+                bankDepositdescr.setSgtid(item.getSgtid());
+                bankDepositdescr.setSgtno(item.getSgtno());
+                bankDepositdescr.setPrjno(item.getPrjno());
+                bankDepositdescr.setPltfmcstno(item.getPltfmcstno());
+                bankDepositdescr.setEntpnm(item.getEntpnm());
+                bankDepositdescr.setPgno(item.getPgno());
+                bankDepositdescr.setVersion(item.getVersion());
+                bankDepositdescr.setRtnTrnuid(item.getRtnTrnuid());
+                bankDepositdescr.setRtnStatus(item.getRtnStatus());
+                bankDepositdescr.setRtnCode(item.getRtnCode());
+                bankDepositdescr.setRtnSeverity(item.getRtnSeverity());
+                bankDepositdescr.setRtnMessage(item.getRtnMessage());
+                bankDepositdescr.setRtnRsbody(item.getRtnRsbody());
+                bankDepositdescr.setRtnRcrdtotnum(item.getRtnRcrdtotnum());
+                bankDepositdescr.setRtnCrnpgno(item.getRtnCrnpgno());
+                bankDepositdescr.setRtnPgrcrdnum(item.getRtnPgrcrdnum());
+                bankDepositdescr.setRtnTotpgnum(item.getRtnTotpgnum());
+                bankDepositdescr.setRtnContent(item.getRtnContent());
+                bankDepositdescr.setRtnLescstno(item.getRtnLescstno());
+                bankDepositdescr.setRtnTdrno(item.getRtnTdrno());
+                bankDepositdescr.setRtnCstno(item.getRtnCstno());
+                bankDepositdescr.setRtnPrjno(item.getRtnPrjno());
+                bankDepositdescr.setRtnPrjnm(item.getRtnPrjnm());
+                bankDepositdescr.setRtnSgtno(item.getRtnSgtno());
+                bankDepositdescr.setRtnSgtst(item.getRtnSgtst());
+                bankDepositdescr.setRtnMrgnst(item.getRtnMrgnst());
+                bankDepositdescr.setRtnTdracctno(item.getRtnTdracctno());
+                bankDepositdescr.setRtnTdracctnoccycd(item.getRtnTdracctnoccycd());
+                bankDepositdescr.setRtnTdracctnm(item.getRtnTdracctnm());
+                bankDepositdescr.setRtnTdracctnobnkno(item.getRtnTdracctnobnkno());
+                bankDepositdescr.setRtnTdracctnobnknm(item.getRtnTdracctnobnknm());;
+                bankDepositdescr.setRtnTdrnum(item.getRtnTdrnum());
+                bankDepositdescr.setRtnMrgnamt(item.getRtnMrgnamt());
+                bankDepositdescr.setRtnTdramt(item.getRtnTdramt());
+                bankDepositdescr.setRtnAgncsvcfee(item.getRtnAgncsvcfee());
+                bankDepositdescr.setRtnFrzamt(item.getRtnFrzamt());
+                bankDepositdescr.setRtnFineamt(item.getRtnFineamt());
+                bankDepositdescr.setRtnTdrdt(item.getRtnTdrdt());
+                bankDepositdescr.setRtnTdrtm(item.getRtnTdrtm());
+                bankDepositdescr.setRtnDuetp(item.getRtnDuetp());
+                bankDepositdescr.setRtnMbrshpno(item.getRtnMbrshpno());
+                bankDepositdescr.setRtnSvcfee(item.getRtnSvcfee());
+                bankDepositdescr.setRtnRemark(item.getRtnRemark());
+                bankDepositdescr.setReason("供应商库内没有的对应账号的供应商");
+                remoteDepositService.insertDepositReason(bankDepositdescr,SecurityConstants.INNER);
+                continue;
+            }
+
+            if(earnestMoney.compareTo(item.getRtnMrgnamt()) != 0){
+                com.ruoyi.system.api.domain.BankDepositdescr bankDepositdescr = new com.ruoyi.system.api.domain.BankDepositdescr();
+                bankDepositdescr.setDepositdescid(item.getDepositdescid());
+                bankDepositdescr.setPpid(item.getPpid());
+                bankDepositdescr.setTrnuid(item.getTrnuid());
+                bankDepositdescr.setRqbody(item.getRqbody());
+                bankDepositdescr.setSgtid(item.getSgtid());
+                bankDepositdescr.setSgtno(item.getSgtno());
+                bankDepositdescr.setPrjno(item.getPrjno());
+                bankDepositdescr.setPltfmcstno(item.getPltfmcstno());
+                bankDepositdescr.setEntpnm(item.getEntpnm());
+                bankDepositdescr.setPgno(item.getPgno());
+                bankDepositdescr.setVersion(item.getVersion());
+                bankDepositdescr.setRtnTrnuid(item.getRtnTrnuid());
+                bankDepositdescr.setRtnStatus(item.getRtnStatus());
+                bankDepositdescr.setRtnCode(item.getRtnCode());
+                bankDepositdescr.setRtnSeverity(item.getRtnSeverity());
+                bankDepositdescr.setRtnMessage(item.getRtnMessage());
+                bankDepositdescr.setRtnRsbody(item.getRtnRsbody());
+                bankDepositdescr.setRtnRcrdtotnum(item.getRtnRcrdtotnum());
+                bankDepositdescr.setRtnCrnpgno(item.getRtnCrnpgno());
+                bankDepositdescr.setRtnPgrcrdnum(item.getRtnPgrcrdnum());
+                bankDepositdescr.setRtnTotpgnum(item.getRtnTotpgnum());
+                bankDepositdescr.setRtnContent(item.getRtnContent());
+                bankDepositdescr.setRtnLescstno(item.getRtnLescstno());
+                bankDepositdescr.setRtnTdrno(item.getRtnTdrno());
+                bankDepositdescr.setRtnCstno(item.getRtnCstno());
+                bankDepositdescr.setRtnPrjno(item.getRtnPrjno());
+                bankDepositdescr.setRtnPrjnm(item.getRtnPrjnm());
+                bankDepositdescr.setRtnSgtno(item.getRtnSgtno());
+                bankDepositdescr.setRtnSgtst(item.getRtnSgtst());
+                bankDepositdescr.setRtnMrgnst(item.getRtnMrgnst());
+                bankDepositdescr.setRtnTdracctno(item.getRtnTdracctno());
+                bankDepositdescr.setRtnTdracctnoccycd(item.getRtnTdracctnoccycd());
+                bankDepositdescr.setRtnTdracctnm(item.getRtnTdracctnm());
+                bankDepositdescr.setRtnTdracctnobnkno(item.getRtnTdracctnobnkno());
+                bankDepositdescr.setRtnTdracctnobnknm(item.getRtnTdracctnobnknm());;
+                bankDepositdescr.setRtnTdrnum(item.getRtnTdrnum());
+                bankDepositdescr.setRtnMrgnamt(item.getRtnMrgnamt());
+                bankDepositdescr.setRtnTdramt(item.getRtnTdramt());
+                bankDepositdescr.setRtnAgncsvcfee(item.getRtnAgncsvcfee());
+                bankDepositdescr.setRtnFrzamt(item.getRtnFrzamt());
+                bankDepositdescr.setRtnFineamt(item.getRtnFineamt());
+                bankDepositdescr.setRtnTdrdt(item.getRtnTdrdt());
+                bankDepositdescr.setRtnTdrtm(item.getRtnTdrtm());
+                bankDepositdescr.setRtnDuetp(item.getRtnDuetp());
+                bankDepositdescr.setRtnMbrshpno(item.getRtnMbrshpno());
+                bankDepositdescr.setRtnSvcfee(item.getRtnSvcfee());
+                bankDepositdescr.setRtnRemark(item.getRtnRemark());
+                bankDepositdescr.setReason("提交保证金金额异常");
+                remoteDepositService.insertDepositReason(bankDepositdescr,SecurityConstants.INNER);
+                continue;
+            }
+
+            BidQuote bidQuote = new BidQuote();
+            bidQuote.setSid(sid);
+            bidQuote.setHid(hid);
+            List<BidQuote> bidQuotes = bidQuoteService.selectQuoteList(bidQuote);
+            if(!CollectionUtils.isEmpty(bidQuotes)){
+                BidQuote quote = bidQuotes.get(0);
+                if(quote.getStatus() < 3){
+                    quote.setStatus(3L);
+                    int i = bidQuoteService.updateBidQuote(quote);
+                    remoteDepositService.updateDeposit2(item.getDepositdescid(),SecurityConstants.INNER);
+                    res += i;
+                }
+            }
+        }
+        return res;
+    }
+
+    // 保证金退还
+    @InnerAuth
+    @Transactional
+    @PostMapping("/refund")
+    public int refund(){
+        List<BidQuote> bidQuotes = bidQuoteService.selectQuoteList2(new BidQuote());
+        List<String> ids = new ArrayList<>();
+        for(BidQuote item : bidQuotes){
+            if(item.getStatus() >= 3){
+                Long hid = item.getHid();
+                Long sid = item.getSid();
+                BidWinner bidWinner = bidWinnerService.selectBidWinnerBySid(sid);
+                if(bidWinner == null){
+                    continue;
+                }
+                if(bidWinner.getHid().equals(hid)){
+                    continue;
+                }
+                BidWinningResults bidWinningResults = bidWinningResultsService.selectBidWinningResultsBySid(sid);
+                if(bidWinningResults != null && new Date().compareTo(bidWinningResults.getGsResDate()) > 0){
+                    BidNotice bidNotice = bidNoticeService.selectBidNoticeBySid(sid);
+                    Long uid = bidNotice.getUid();
+                    String account = bidWinningResultsService.getAccountByHid(hid);
+                    List<BankDepositdesc> depositList = remoteDepositService.getDeposits(uid, account, SecurityConstants.INNER);
+
+                    if(CollectionUtils.isEmpty(depositList)){
+                        System.out.println(account + "-1" + "uid:" + uid);
+                        continue;
+                    }
+                    BankDepositdesc bankDepositdesc = depositList.get(0);
+                    ids.add(bankDepositdesc.getDepositdescid());
+                }
+            }
+            item.setStatus(6L);
+            bidQuoteService.updateBidQuote(item);
+        }
+        String[] depositdescids = new String[ids.size()];
+
+        for (int i = 0; i < ids.size(); i++){
+            depositdescids[i] = ids.get(i);
+        }
+
+        int i = remoteDepositService.refundDeposit(depositdescids, SecurityConstants.INNER);
+        return i;
+    }
+
+    @InnerAuth
+    @Transactional
+    @PostMapping("/refundWinner")
+    public int refundWinner(){
+        List<BidWinner> bidWinners = bidWinnerService.selectBidWinnerList(new BidWinner());
+        List<String> ids = new ArrayList<>();
+
+        for(BidWinner item :bidWinners){
+            Long hid = item.getHid();
+            Long sid = item.getSid();
+            if(item.getStatus() == 3){
+                BidNotice bidNotice = bidNoticeService.selectBidNoticeBySid(sid);
+                Long uid = bidNotice.getUid();
+                String account = bidWinningResultsService.getAccountByHid(hid);
+                List<BankDepositdesc> depositList = remoteDepositService.getDeposits(uid, account, SecurityConstants.INNER);
+
+                if(CollectionUtils.isEmpty(depositList)){
+                    System.out.println(account + "-1" + "uid:" + uid);
+                    continue;
+                }
+                BankDepositdesc bankDepositdesc = depositList.get(0);
+                ids.add(bankDepositdesc.getDepositdescid());
+            }
+            Map<String,Long> map = new HashMap<>();
+            map.put("sid",sid);
+            map.put("hid",hid);
+            BidQuote bidQuote = bidQuoteService.selectQuoteBySupplier(map);
+            bidQuote.setStatus(6L);
+            bidQuoteService.updateBidQuote(bidQuote);
+        }
+        String[] depositdescids = new String[ids.size()];
+
+        for (int i = 0; i < ids.size(); i++){
+            depositdescids[i] = ids.get(i);
+        }
+
+        int i = remoteDepositService.refundDeposit(depositdescids, SecurityConstants.INNER);
+        return i;
+    }
+
     // 查询可终止项目
     @GetMapping("/selectTenderByState")
     public TableDataInfo selectTenderByState(BidTender bidTender) {

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

@@ -14,15 +14,18 @@ import com.ruoyi.common.core.constant.PriceConstants;
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.utils.DateUtils;
 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.system.api.RemoteApprovalRecordService;
+import com.ruoyi.system.api.RemoteDepositService;
 import com.ruoyi.system.api.RemotePlanService;
 import com.ruoyi.system.api.RemoteUserService;
 import com.ruoyi.system.api.domain.*;
 import org.aspectj.weaver.loadtime.Aj;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
@@ -74,6 +77,9 @@ public class BidWinningResultsController extends BaseController {
     @Autowired
     private IBidTenderService bidTenderService;
 
+    @Autowired
+    private RemoteDepositService remoteDepositService;
+
     /**
      * 查询中标公告列表
      */
@@ -358,4 +364,5 @@ public class BidWinningResultsController extends BaseController {
         int i = bidChangeRecordService.insertBidChangeRecord(bidChangeRecord);
         return success("变更成功");
     }
+
 }

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

@@ -80,4 +80,9 @@ public interface BidQuoteMapper
     // 查询供应商报价
     public BidQuote selectQuoteBySupplier(Map map);
 
+    // 查询报价列表
+    public List<BidQuote> selectQuoteList(BidQuote bidQuote);
+
+    // 查询报价列表
+    public List<BidQuote> selectQuoteList2(BidQuote bidQuote);
 }

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

@@ -212,4 +212,6 @@ public interface BidTenderMapper
 
     public BsSupplier selectSupplierByHid(Long sid);
 
+    // 根据打款银行账户获取供应商ID
+    public Long selectHidByAccount(Map map);
 }

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

@@ -87,4 +87,7 @@ public interface BidWinningResultsMapper
      */
     public BidWinningResults selectWinningResultById(Long gsId);
 
+    // 获取供应商银行账户
+    public String getAccountByHid(Long hid);
+
 }

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

@@ -79,4 +79,10 @@ public interface IBidQuoteService
 
     // 查询供应商报价
     public BidQuote selectQuoteBySupplier(Map map);
+
+    // 查询报价列表
+    public List<BidQuote> selectQuoteList(BidQuote bidQuote);
+
+    // 查询报价列表
+    public List<BidQuote> selectQuoteList2(BidQuote bidQuote);
 }

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

@@ -209,4 +209,7 @@ public interface IBidTenderService
     public int updateTenderByCState(BidTender bidTender);
 
     public BsSupplier selectSupplierByHid(Long sid);
+
+    // 根据打款银行账户获取供应商ID
+    public Long selectHidByAccount(Map map);
 }

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

@@ -87,4 +87,7 @@ public interface IBidWinningResultsService
      */
     public BidWinningResults selectWinningResultById(Long gsId);
 
+    // 获取供应商银行账户
+    public String getAccountByHid(Long hid);
+
 }

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

@@ -111,4 +111,14 @@ public class BidQuoteServiceImpl implements IBidQuoteService
     public BidQuote selectQuoteBySupplier(Map map) {
         return bidQuoteMapper.selectQuoteBySupplier(map);
     }
+
+    @Override
+    public List<BidQuote> selectQuoteList(BidQuote bidQuote) {
+        return bidQuoteMapper.selectQuoteList(bidQuote);
+    }
+
+    @Override
+    public List<BidQuote> selectQuoteList2(BidQuote bidQuote) {
+        return bidQuoteMapper.selectQuoteList2(bidQuote);
+    }
 }

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

@@ -233,4 +233,9 @@ public class BidTenderServiceImpl implements IBidTenderService {
     public BsSupplier selectSupplierByHid(Long sid) {
         return bidTenderMapper.selectSupplierByHid(sid);
     }
+
+    @Override
+    public Long selectHidByAccount(Map map) {
+        return bidTenderMapper.selectHidByAccount(map);
+    }
 }

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

@@ -118,4 +118,9 @@ public class BidWinningResultsServiceImpl implements IBidWinningResultsService
     public BidWinningResults selectWinningResultById(Long gsId) {
         return bidWinningResultsMapper.selectWinningResultById(gsId);
     }
+
+    @Override
+    public String getAccountByHid(Long hid) {
+        return bidWinningResultsMapper.getAccountByHid(hid);
+    }
 }

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

@@ -237,9 +237,9 @@
             <if test="fjRemark != null">fj_remark = #{fjRemark},</if>
             <if test="uUpdateTime != null">u_updateTime = #{uUpdateTime},</if>
             <if test="fjType != null">fj_type = #{fjType},</if>
-            <if test="uUpdateTime != null">u_updateTime = #{uUpdateTime}</if>
-            <if test="isSms != null">is_sms = #{isSms}</if>
-            <if test="bankAccount != null">bank_account = #{bankAccount}</if>
+            <if test="uUpdateTime != null">u_updateTime = #{uUpdateTime},</if>
+            <if test="isSms != null">is_sms = #{isSms},</if>
+            <if test="bankAccount != null">bank_account = #{bankAccount},</if>
         </trim>
         where uid = #{uid}
     </update>

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

@@ -140,4 +140,30 @@
         select * from bid_quote where sid = #{sid} and hid = #{hid}
     </select>
 
+    <select id="selectQuoteList" parameterType="com.hh.bidding.domain.BidQuote" resultMap="BidQuoteResult">
+        <include refid="selectBidQuoteVo"/>
+        <where>
+            <if test="qid != null" >and qid = #{qid}</if>
+            <if test="hid != null "> and hid = #{hid}</if>
+            <if test="sid != null "> and sid = #{sid}</if>
+            <if test="isEarnest != null "> and is_earnest = #{isEarnest}</if>
+            <if test="audit != null "> and audit = #{audit}</if>
+            <if test="quoteNumber != null "> and quote_number = #{quoteNumber}</if>
+            <if test="status != null "> and status = #{status}</if>
+        </where>
+    </select>
+
+    <select id="selectQuoteList2" parameterType="com.hh.bidding.domain.BidQuote" resultMap="BidQuoteResult">
+        <include refid="selectBidQuoteVo"/>
+        <where>
+            <if test="qid != null" >and qid = #{qid}</if>
+            <if test="hid != null "> and hid = #{hid}</if>
+            <if test="sid != null "> and sid = #{sid}</if>
+            <if test="isEarnest != null "> and is_earnest = #{isEarnest}</if>
+            <if test="audit != null "> and audit = #{audit}</if>
+            <if test="quoteNumber != null "> and quote_number = #{quoteNumber}</if>
+            and status &gt;= 3 and status &lt; 6
+        </where>
+    </select>
+
 </mapper>

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

@@ -565,4 +565,8 @@
         select * from bs_supplier where hid = #{hid}
     </select>
 
+    <select id = "selectHidByAccount" parameterType="Map">
+        select hid from bs_supplier where h_account = #{account} and h_name = #{company}
+    </select>
+
 </mapper>

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

@@ -100,7 +100,7 @@
 
     <select id="selectBidWinningResultsBySid" parameterType="Long" resultMap="BidWinningResultsResult">
         <include refid="selectBidWinningResultsVo"/>
-        where sid = #{sid}
+        where t.sid = #{sid} and w.gs_state = 1
     </select>
 
     <insert id="insertBidWinningResults" parameterType="com.hh.bidding.domain.BidWinningResults">
@@ -237,4 +237,8 @@
         <id property="gsId" column="gs_id"/>
         <association property="bidCandidate"/>
     </resultMap>
+
+    <select id="getAccountByHid" parameterType="Long">
+        select h_account from bs_supplier where hid = #{hid}
+    </select>
 </mapper>

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

@@ -1,37 +1,32 @@
 package com.ruoyi.mast.bank.controller;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 import java.io.IOException;
 import java.util.Map;
 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.BankDepositdesc;
-import com.ruoyi.mast.bank.domain.BankTenderpub;
-import com.ruoyi.mast.bank.domain.BankTenderquery;
+import com.ruoyi.common.security.annotation.InnerAuth;
+import com.ruoyi.mast.bank.domain.*;
 import com.ruoyi.mast.bank.service.IBankDepositdescService;
+import com.ruoyi.mast.bank.service.IBankDepositdescrService;
 import com.ruoyi.mast.bank.utils.JsonUtils;
 import com.ruoyi.system.api.RemotePlanService;
 import kong.unirest.core.HttpResponse;
 import kong.unirest.core.Unirest;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.mast.bank.domain.BankDeposit;
 import com.ruoyi.mast.bank.service.IBankDepositService;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
@@ -59,9 +54,15 @@ public class BankDepositController extends BaseController {
     @Autowired
     private BankDepositdescController bankDepositdescController;
 
+    @Autowired
+    private IBankDepositdescrService bankDepositdescrService;
+
     @Autowired
     private Environment env;
 
+    @Autowired
+    private BankRefundbatController bankRefundbatController;
+
     /**
      * 查询查询保证金入账数量列表
      */
@@ -85,11 +86,319 @@ public class BankDepositController extends BaseController {
         util.exportExcel(response, list, "查询保证金入账数量数据");
     }
 
+    /**
+     * 修改查询保证金入账数量
+     */
+    // @RequiresPermissions("bank:deposit:edit")
+    @Log(title = "查询保证金入账数量", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BankDeposit bankDeposit) {
+        List<BankDeposit> list = bankDepositService.selectBankDepositList(bankDeposit);
+        if (list.isEmpty()) return AjaxResult.error("");
+        BankDeposit bt = list.get(0);
+
+        String rtnxml = postBank(bt);
+
+        return toAjax(update(bt, rtnxml));
+    }
+
+
+    private int update(BankDeposit bankDeposit, String rtnxml) {
+
+        List<BankDeposit> list = bankDepositService.selectBankDepositList(bankDeposit);
+        if (list.isEmpty()) return 0;
+        BankDeposit bd = list.get(0);
+        bd.setRtnTrnuid(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINNUMTRNRS/TRNUID"));
+        bd.setRtnStatus("1");
+        bd.setRtnCode(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINNUMTRNRS/STATUS/CODE"));
+        bd.setRtnSeverity(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINNUMTRNRS/STATUS/SEVERITY"));
+        bd.setRtnMessage(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINNUMTRNRS/STATUS/MESSAGE"));
+        bd.setRtnRsbody("1");
+        bd.setRtnTdrnum(Long.valueOf(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINNUMTRNRS/RSBODY/TDRNUM")));
+
+        return bankDepositService.updateBankDeposit(bd);
+    }
+
+    private String postBank(BankDeposit bankDeposit) {
+        String host = env.getProperty("BANK.HOST") + ":" + env.getProperty("BANK.PORT");
+        HttpResponse rep = Unirest.post(host).body("<FOX>\n" +
+                "    <SIGNONMSGSRQV1>\n" +
+                "        <SONRQ>\n" +
+                "            <DTCLIENT>" + DateUtils.getTime() + "</DTCLIENT>\n" +
+                "            <CID>" + env.getProperty("BANK.CID") + "</CID>\n" +
+                "            <USERID>" + env.getProperty("BANK.USERID") + "</USERID>\n" +
+                "            <USERPASS>" + env.getProperty("BANK.USERPASS") + "</USERPASS>\n" +
+                "            <GENUSERKEY>" + env.getProperty("BANK.GENUSERKEY") + "</GENUSERKEY>\n" +
+                "            <APPID>BZJN</APPID>\n" +
+                "            <APPVER>1</APPVER>\n" +
+                "        </SONRQ>\n" +
+                "    </SIGNONMSGSRQV1>\n" +
+                "    <SECURITIES_MSGSRQV1>\n" +
+                "        <QUERYDEPOSITINNUMTRNRQ>\n" +
+                "            <TRNUID>" + bankDeposit.getTrnuid() + "</TRNUID>\n" +
+                "            <RQBODY>\n" +
+                "                <SGTID>" + bankDeposit.getSgtid() + "</SGTID>\n" +
+                "                <SGTNO>" + bankDeposit.getSgtno() + "</SGTNO>\n" +
+                "                <PRJNO>" + bankDeposit.getPrjno() + "</PRJNO>\n" +
+                "                <PLTFMCSTNO>" + bankDeposit.getPltfmcstno() + "</PLTFMCSTNO>\n" +
+                "            </RQBODY>\n" +
+                "        </QUERYDEPOSITINNUMTRNRQ>\n" +
+                "    </SECURITIES_MSGSRQV1>\n" +
+                "</FOX>").asString();
+
+        return rep.getBody().toString();
+    }
+
+
+    /**
+     * 删除查询保证金入账数量
+     */
+    // @RequiresPermissions("bank:deposit:remove")
+    @Log(title = "查询保证金入账数量", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{depositids}")
+    public AjaxResult remove(@PathVariable String[] depositids) {
+        return toAjax(bankDepositService.deleteBankDepositByDepositids(depositids));
+    }
+
+    @InnerAuth
+    @GetMapping("/getDepositByNoticeId")
+    public String getDepositByNoticeId(@RequestParam("noticeId") Long noticeId){
+        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 "标段信息查询数据异常，请检查！";
+
+        BankDeposit bankDeposit = new BankDeposit();
+        bankDeposit.setPpid(bq.getPpid());
+        List<BankDeposit> list = bankDepositService.selectBankDepositList(bankDeposit);
+        if (!list.isEmpty()) {
+            for (BankDeposit bd : list) {
+                bankDepositService.deleteBankDepositByDepositid(bd.getDepositid());
+            }
+        }
+
+        bankDeposit.setSgtid(bq.getRtnSgtid());
+        bankDeposit.setSgtno(bq.getRtnSgtno());
+        bankDeposit.setPrjno(bq.getRtnPrjno());
+        bankDeposit.setPltfmcstno(env.getProperty("BANK.PLTFMCSTNO"));
+        bankDeposit.setEntpnm("");
+
+        AjaxResult msg1 = addBankDeposit(bankDeposit);
+
+        BankDeposit tempDeposit = new BankDeposit();
+        tempDeposit.setPpid(bq.getPpid());
+        List<BankDeposit> tempList = bankDepositService.selectBankDepositList(tempDeposit);
+        if (tempList.isEmpty()) return "查询银行返回标段保证金入账数量错误！";
+        if (tempList.get(0).getRtnTdrnum() == null)
+            return "银行返回标段保证金入账数量错误！";
+        int pgno = Integer.parseInt(tempList.get(0).getRtnTdrnum().toString());
+        int page = pgno / 20;
+        int page1 = pgno % 20;
+        if (page1 > 0) page += 1;
+
+        BankDepositdesc bankDepositdesc = new BankDepositdesc();
+        bankDepositdesc.setPpid(bq.getPpid());
+        List<BankDepositdesc> blist = bankDepositdescService.selectBankDepositdescList(bankDepositdesc);
+        if (!blist.isEmpty()) {
+            for (BankDepositdesc bdd : blist) {
+                bankDepositdescService.deleteBankDepositdescByDepositdescid(bdd.getDepositdescid());
+            }
+        }
+
+        bankDepositdesc.setSgtid(bq.getRtnSgtid());
+        bankDepositdesc.setSgtno(bq.getRtnSgtno());
+        bankDepositdesc.setPrjno(bq.getRtnPrjno());
+        bankDepositdesc.setPltfmcstno(env.getProperty("BANK.PLTFMCSTNO"));
+        bankDepositdesc.setEntpnm("");
+
+        for (int i = 0; i < page; i++) {
+            bankDepositdesc.setPgno(String.valueOf(i + 1));
+            AjaxResult msg2 = bankDepositdescController.addBankDepositdesc(bankDepositdesc);
+
+            if (!msg2.get("msg").toString().contains("成功")) {
+                return "保证金入账明细：" + msg2.get("msg").toString();
+            }
+        }
+
+        if (msg1.get("msg").toString().contains("成功")) {
+            return "银行接口请求成功！";
+        } else {
+            return "保证金入账数量：" + msg1.get("msg").toString();
+        }
+    }
+
+    @InnerAuth
+    @GetMapping("/getDepositList")
+    public List<com.ruoyi.system.api.domain.BankDepositdesc> getDepositList(){
+        List<BankDepositdesc> bankDepositdescs = bankDepositdescService.selectBankDepositdescList2(new BankDepositdesc());
+        List<com.ruoyi.system.api.domain.BankDepositdesc> list = new ArrayList<>();
+        for (BankDepositdesc item : bankDepositdescs){
+            com.ruoyi.system.api.domain.BankDepositdesc t = new com.ruoyi.system.api.domain.BankDepositdesc();
+            t.setDepositdescid(item.getDepositdescid());
+            t.setPpid(item.getPpid());
+            t.setTrnuid(item.getTrnuid());
+            t.setRqbody(item.getRqbody());
+            t.setSgtid(item.getSgtid());
+            t.setSgtno(item.getSgtno());
+            t.setPrjno(item.getPrjno());
+            t.setPltfmcstno(item.getPltfmcstno());
+            t.setEntpnm(item.getEntpnm());
+            t.setPgno(item.getPgno());
+            t.setVersion(item.getVersion());
+            t.setRtnTrnuid(item.getRtnTrnuid());
+            t.setRtnStatus(item.getRtnStatus());
+            t.setRtnCode(item.getRtnCode());
+            t.setRtnSeverity(item.getRtnSeverity());
+            t.setRtnMessage(item.getRtnMessage());
+            t.setRtnRsbody(item.getRtnRsbody());
+            t.setRtnRcrdtotnum(item.getRtnRcrdtotnum());
+            t.setRtnCrnpgno(item.getRtnCrnpgno());
+            t.setRtnPgrcrdnum(item.getRtnPgrcrdnum());
+            t.setRtnTotpgnum(item.getRtnTotpgnum());
+            t.setRtnContent(item.getRtnContent());
+            t.setRtnLescstno(item.getRtnLescstno());
+            t.setRtnTdrno(item.getRtnTdrno());
+            t.setRtnCstno(item.getRtnCstno());
+            t.setRtnPrjno(item.getRtnPrjno());
+            t.setRtnPrjnm(item.getRtnPrjnm());
+            t.setRtnSgtno(item.getRtnSgtno());
+            t.setRtnSgtst(item.getRtnSgtst());
+            t.setRtnMrgnst(item.getRtnMrgnst());
+            t.setRtnTdracctno(item.getRtnTdracctno());
+            t.setRtnTdracctnoccycd(item.getRtnTdracctnoccycd());
+            t.setRtnTdracctnm(item.getRtnTdracctnm());
+            t.setRtnTdracctnobnkno(item.getRtnTdracctnobnkno());
+            t.setRtnTdracctnobnknm(item.getRtnTdracctnobnknm());;
+            t.setRtnTdrnum(item.getRtnTdrnum());
+            t.setRtnMrgnamt(item.getRtnMrgnamt());
+            t.setRtnTdramt(item.getRtnTdramt());
+            t.setRtnAgncsvcfee(item.getRtnAgncsvcfee());
+            t.setRtnFrzamt(item.getRtnFrzamt());
+            t.setRtnFineamt(item.getRtnFineamt());
+            t.setRtnTdrdt(item.getRtnTdrdt());
+            t.setRtnTdrtm(item.getRtnTdrtm());
+            t.setRtnDuetp(item.getRtnDuetp());
+            t.setRtnMbrshpno(item.getRtnMbrshpno());
+            t.setRtnSvcfee(item.getRtnSvcfee());
+            t.setRtnRemark(item.getRtnRemark());
+            list.add(t);
+        }
+        return list;
+    }
+
+    @InnerAuth
+    @PostMapping("/updateDeposit2")
+    public int updateDeposit2(@RequestParam("id") String id){
+        BankDepositdesc bankDepositdesc = new BankDepositdesc();
+        bankDepositdesc.setDepositdescid(id);
+        bankDepositdesc.setRtnAgncsvcfee(new BigDecimal(2));
+        return bankDepositdescService.updateBankDepositdesc2(bankDepositdesc);
+    }
+
+    @InnerAuth
+    @PostMapping("insertDepositReason")
+    public int insertDepositReason(@RequestBody com.ruoyi.system.api.domain.BankDepositdescr bankDepositdescr){
+        BankDepositdescr t = new BankDepositdescr();
+        t.setDepositdescid(bankDepositdescr.getDepositdescid());
+        t.setPpid(bankDepositdescr.getPpid());
+        t.setTrnuid(bankDepositdescr.getTrnuid());
+        t.setRqbody(bankDepositdescr.getRqbody());
+        t.setSgtid(bankDepositdescr.getSgtid());
+        t.setSgtno(bankDepositdescr.getSgtno());
+        t.setPrjno(bankDepositdescr.getPrjno());
+        t.setPltfmcstno(bankDepositdescr.getPltfmcstno());
+        t.setEntpnm(bankDepositdescr.getEntpnm());
+        t.setPgno(bankDepositdescr.getPgno());
+        t.setVersion(bankDepositdescr.getVersion());
+        t.setRtnTrnuid(bankDepositdescr.getRtnTrnuid());
+        t.setRtnStatus(bankDepositdescr.getRtnStatus());
+        t.setRtnCode(bankDepositdescr.getRtnCode());
+        t.setRtnSeverity(bankDepositdescr.getRtnSeverity());
+        t.setRtnMessage(bankDepositdescr.getRtnMessage());
+        t.setRtnRsbody(bankDepositdescr.getRtnRsbody());
+        t.setRtnRcrdtotnum(bankDepositdescr.getRtnRcrdtotnum());
+        t.setRtnCrnpgno(bankDepositdescr.getRtnCrnpgno());
+        t.setRtnPgrcrdnum(bankDepositdescr.getRtnPgrcrdnum());
+        t.setRtnTotpgnum(bankDepositdescr.getRtnTotpgnum());
+        t.setRtnContent(bankDepositdescr.getRtnContent());
+        t.setRtnLescstno(bankDepositdescr.getRtnLescstno());
+        t.setRtnTdrno(bankDepositdescr.getRtnTdrno());
+        t.setRtnCstno(bankDepositdescr.getRtnCstno());
+        t.setRtnPrjno(bankDepositdescr.getRtnPrjno());
+        t.setRtnPrjnm(bankDepositdescr.getRtnPrjnm());
+        t.setRtnSgtno(bankDepositdescr.getRtnSgtno());
+        t.setRtnSgtst(bankDepositdescr.getRtnSgtst());
+        t.setRtnMrgnst(bankDepositdescr.getRtnMrgnst());
+        t.setRtnTdracctno(bankDepositdescr.getRtnTdracctno());
+        t.setRtnTdracctnoccycd(bankDepositdescr.getRtnTdracctnoccycd());
+        t.setRtnTdracctnm(bankDepositdescr.getRtnTdracctnm());
+        t.setRtnTdracctnobnkno(bankDepositdescr.getRtnTdracctnobnkno());
+        t.setRtnTdracctnobnknm(bankDepositdescr.getRtnTdracctnobnknm());;
+        t.setRtnTdrnum(bankDepositdescr.getRtnTdrnum());
+        t.setRtnMrgnamt(bankDepositdescr.getRtnMrgnamt());
+        t.setRtnTdramt(bankDepositdescr.getRtnTdramt());
+        t.setRtnAgncsvcfee(bankDepositdescr.getRtnAgncsvcfee());
+        t.setRtnFrzamt(bankDepositdescr.getRtnFrzamt());
+        t.setRtnFineamt(bankDepositdescr.getRtnFineamt());
+        t.setRtnTdrdt(bankDepositdescr.getRtnTdrdt());
+        t.setRtnTdrtm(bankDepositdescr.getRtnTdrtm());
+        t.setRtnDuetp(bankDepositdescr.getRtnDuetp());
+        t.setRtnMbrshpno(bankDepositdescr.getRtnMbrshpno());
+        t.setRtnSvcfee(bankDepositdescr.getRtnSvcfee());
+        t.setRtnRemark(bankDepositdescr.getRtnRemark());
+        t.setReason(bankDepositdescr.getReason());
+        if(bankDepositdescrService.selectBankDepositdescrList(t).size() == 0){
+            bankDepositdescrService.insertBankDepositdescr(t);
+        }
+        return 1;
+    }
+
+    @InnerAuth
+    @GetMapping("/getDeposits")
+    public List<BankDepositdesc> getDeposits(@RequestParam("uid") Long uid,@RequestParam("account") String account){
+        BankDepositdesc bankDepositdesc = new BankDepositdesc();
+        bankDepositdesc.setPpid(uid);
+        bankDepositdesc.getRtnTdracctno();
+        return bankDepositdescService.selectBankDepositdescList(new BankDepositdesc());
+    }
+
+    // 退还保证金
+    @InnerAuth
+    @PostMapping("/refundDeposit")
+    public int refundDeposit(@RequestParam("depositdescids") String[] depositdescids) {
+        System.out.println(depositdescids.length);
+        if(depositdescids.length == 0){
+            depositdescids = new String[1];
+            depositdescids[0] = "1";
+        }
+        List<BankDepositdesc> list = bankDepositdescService.selectByDepositdescids(depositdescids);
+        if(list.isEmpty()) return 0;
+
+        String xml = "";
+
+        for (int i = 0; i < list.size(); i++) {
+            xml += "<CONTENT>\n" +
+                    "   <INDEX>" + (i + 1) + "</INDEX>\n" +
+                    "   <TDRNO>" + list.get(i).getRtnTdrno() + "</TDRNO>\n" +
+                    "   <REMARK>批量退还保证金" + DateUtils.getTime() + "</REMARK>\n" +
+                    "</CONTENT>";
+        }
+
+        BankRefundbat bankRefundbat = new BankRefundbat();
+        bankRefundbat.setPpid(Long.valueOf(list.get(0).getPpid()));
+        bankRefundbat.setRqbody(xml);
+
+        bankRefundbatController.addBankRefundbat(bankRefundbat);
+        return list.size();
+    }
+
+
     /**
      * 获取查询保证金入账数量详细信息 by 采购公告id
      * depositid ： 当作ppid 用
      */
-    @RequiresPermissions("bank:deposit:query")
     @GetMapping(value = "/{depositid}")
     public AjaxResult getInfo(@PathVariable("depositid") String depositid) {
         Map<String, Object> map = bankTenderpubController.getInfos(depositid);
@@ -193,78 +502,4 @@ public class BankDepositController extends BaseController {
             return AjaxResult.success(rtn);
         } else return AjaxResult.error(rtn);
     }
-
-    /**
-     * 修改查询保证金入账数量
-     */
-    // @RequiresPermissions("bank:deposit:edit")
-    @Log(title = "查询保证金入账数量", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody BankDeposit bankDeposit) {
-        List<BankDeposit> list = bankDepositService.selectBankDepositList(bankDeposit);
-        if (list.isEmpty()) return AjaxResult.error("");
-        BankDeposit bt = list.get(0);
-
-        String rtnxml = postBank(bt);
-
-        return toAjax(update(bt, rtnxml));
-    }
-
-
-    private int update(BankDeposit bankDeposit, String rtnxml) {
-
-        List<BankDeposit> list = bankDepositService.selectBankDepositList(bankDeposit);
-        if (list.isEmpty()) return 0;
-        BankDeposit bd = list.get(0);
-        bd.setRtnTrnuid(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINNUMTRNRS/TRNUID"));
-        bd.setRtnStatus("1");
-        bd.setRtnCode(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINNUMTRNRS/STATUS/CODE"));
-        bd.setRtnSeverity(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINNUMTRNRS/STATUS/SEVERITY"));
-        bd.setRtnMessage(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINNUMTRNRS/STATUS/MESSAGE"));
-        bd.setRtnRsbody("1");
-        bd.setRtnTdrnum(Long.valueOf(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYDEPOSITINNUMTRNRS/RSBODY/TDRNUM")));
-
-        return bankDepositService.updateBankDeposit(bd);
-    }
-
-    private String postBank(BankDeposit bankDeposit) {
-        String host = env.getProperty("BANK.HOST") + ":" + env.getProperty("BANK.PORT");
-        HttpResponse rep = Unirest.post(host).body("<FOX>\n" +
-                "    <SIGNONMSGSRQV1>\n" +
-                "        <SONRQ>\n" +
-                "            <DTCLIENT>" + DateUtils.getTime() + "</DTCLIENT>\n" +
-                "            <CID>" + env.getProperty("BANK.CID") + "</CID>\n" +
-                "            <USERID>" + env.getProperty("BANK.USERID") + "</USERID>\n" +
-                "            <USERPASS>" + env.getProperty("BANK.USERPASS") + "</USERPASS>\n" +
-                "            <GENUSERKEY>" + env.getProperty("BANK.GENUSERKEY") + "</GENUSERKEY>\n" +
-                "            <APPID>BZJN</APPID>\n" +
-                "            <APPVER>1</APPVER>\n" +
-                "        </SONRQ>\n" +
-                "    </SIGNONMSGSRQV1>\n" +
-                "    <SECURITIES_MSGSRQV1>\n" +
-                "        <QUERYDEPOSITINNUMTRNRQ>\n" +
-                "            <TRNUID>" + bankDeposit.getTrnuid() + "</TRNUID>\n" +
-                "            <RQBODY>\n" +
-                "                <SGTID>" + bankDeposit.getSgtid() + "</SGTID>\n" +
-                "                <SGTNO>" + bankDeposit.getSgtno() + "</SGTNO>\n" +
-                "                <PRJNO>" + bankDeposit.getPrjno() + "</PRJNO>\n" +
-                "                <PLTFMCSTNO>" + bankDeposit.getPltfmcstno() + "</PLTFMCSTNO>\n" +
-                "            </RQBODY>\n" +
-                "        </QUERYDEPOSITINNUMTRNRQ>\n" +
-                "    </SECURITIES_MSGSRQV1>\n" +
-                "</FOX>").asString();
-
-        return rep.getBody().toString();
-    }
-
-
-    /**
-     * 删除查询保证金入账数量
-     */
-    // @RequiresPermissions("bank:deposit:remove")
-    @Log(title = "查询保证金入账数量", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{depositids}")
-    public AjaxResult remove(@PathVariable String[] depositids) {
-        return toAjax(bankDepositService.deleteBankDepositByDepositids(depositids));
-    }
 }

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

@@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.uuid.UUID;
+import com.ruoyi.common.security.annotation.InnerAuth;
 import com.ruoyi.mast.bank.domain.BankRefundbat;
 import com.ruoyi.mast.bank.utils.JsonUtils;
 import kong.unirest.core.HttpResponse;
@@ -47,9 +48,6 @@ public class BankDepositdescController extends BaseController {
     @Autowired
     private IBankDepositdescService bankDepositdescService;
 
-    @Autowired
-    private BankRefundbatController bankRefundbatController;
-
     @Autowired
     private Environment env;
 
@@ -270,9 +268,7 @@ public class BankDepositdescController extends BaseController {
         bankRefundbat.setPpid(Long.valueOf(list.get(0).getPpid()));
         bankRefundbat.setRqbody(xml);
 
-        bankRefundbatController.addBankRefundbat(bankRefundbat);
-
-
+//        bankRefundbatController.addBankRefundbat(bankRefundbat);
         return toAjax(1);
     }
 }

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

@@ -0,0 +1,105 @@
+package com.ruoyi.mast.bank.controller;
+
+import java.util.List;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.mast.bank.domain.BankDepositdescr;
+import com.ruoyi.mast.bank.service.IBankDepositdescrService;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+
+/**
+ * 查询保证金入账明细rController
+ * 
+ * @author ruoyi
+ * @date 2024-09-14
+ */
+@RestController
+@RequestMapping("/depositdescr")
+public class BankDepositdescrController extends BaseController
+{
+    @Autowired
+    private IBankDepositdescrService bankDepositdescrService;
+
+    /**
+     * 查询查询保证金入账明细r列表
+     */
+    // @RequiresPermissions("bank:depositdescr:list")
+    @GetMapping("/list")
+    public TableDataInfo list(BankDepositdescr bankDepositdescr)
+    {
+        startPage();
+        List<BankDepositdescr> list = bankDepositdescrService.selectBankDepositdescrList(bankDepositdescr);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出查询保证金入账明细r列表
+     */
+    // @RequiresPermissions("bank:depositdescr:export")
+    @Log(title = "查询保证金入账明细r", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BankDepositdescr bankDepositdescr)
+    {
+        List<BankDepositdescr> list = bankDepositdescrService.selectBankDepositdescrList(bankDepositdescr);
+        ExcelUtil<BankDepositdescr> util = new ExcelUtil<BankDepositdescr>(BankDepositdescr.class);
+        util.exportExcel(response, list, "查询保证金入账明细r数据");
+    }
+
+    /**
+     * 获取查询保证金入账明细r详细信息
+     */
+    // @RequiresPermissions("bank:depositdescr:query")
+    @GetMapping(value = "/{depositdescid}")
+    public AjaxResult getInfo(@PathVariable("depositdescid") String depositdescid)
+    {
+        return success(bankDepositdescrService.selectBankDepositdescrByDepositdescid(depositdescid));
+    }
+
+    /**
+     * 新增查询保证金入账明细r
+     */
+    // @RequiresPermissions("bank:depositdescr:add")
+    @Log(title = "查询保证金入账明细r", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BankDepositdescr bankDepositdescr)
+    {
+        return toAjax(bankDepositdescrService.insertBankDepositdescr(bankDepositdescr));
+    }
+
+    /**
+     * 修改查询保证金入账明细r
+     */
+    // @RequiresPermissions("bank:depositdescr:edit")
+    @Log(title = "查询保证金入账明细r", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BankDepositdescr bankDepositdescr)
+    {
+        return toAjax(bankDepositdescrService.updateBankDepositdescr(bankDepositdescr));
+    }
+
+    /**
+     * 删除查询保证金入账明细r
+     */
+    // @RequiresPermissions("bank:depositdescr:remove")
+    @Log(title = "查询保证金入账明细r", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{depositdescids}")
+    public AjaxResult remove(@PathVariable String[] depositdescids)
+    {
+        return toAjax(bankDepositdescrService.deleteBankDepositdescrByDepositdescids(depositdescids));
+    }
+}

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

@@ -1,14 +1,14 @@
 package com.ruoyi.mast.bank.controller;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
-import java.io.IOException;
 import java.util.Random;
 import javax.servlet.http.HttpServletResponse;
 
 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.RemotePlanService;
 import kong.unirest.core.HttpResponse;
@@ -25,7 +25,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.mast.bank.domain.BankUncleardeposit;
 import com.ruoyi.mast.bank.service.IBankUncleardepositService;
 import com.ruoyi.common.core.web.controller.BaseController;
@@ -45,6 +44,9 @@ public class BankUncleardepositController extends BaseController {
     @Autowired
     private IBankUncleardepositService bankUncleardepositService;
 
+    @Autowired
+    private BankUncleardepositrfndController bankUncleardepositrfndController;
+
     @Autowired
     private RemotePlanService remotePlanService;
 
@@ -78,9 +80,21 @@ public class BankUncleardepositController extends BaseController {
      * 获取查询不明保证金明细详细信息
      */
     // @RequiresPermissions("bank:uncleardeposit:query")
+    @Log(title = "退回不明保证金", businessType = BusinessType.UPDATE)
     @GetMapping(value = "/{uncleardepositid}")
     public AjaxResult getInfo(@PathVariable("uncleardepositid") String uncleardepositid) {
-        return success(bankUncleardepositService.selectBankUncleardepositByUncleardepositid(uncleardepositid));
+        BankUncleardeposit bankUncleardeposit = bankUncleardepositService.selectBankUncleardepositByUncleardepositid(uncleardepositid);
+        if (bankUncleardeposit == null) return error("数据已被删除");
+
+        BankUncleardepositrfnd bt = new BankUncleardepositrfnd();
+        bt.setSerialno(bankUncleardeposit.getRtnSerialno());
+        bt.setTradedate(bankUncleardeposit.getRtnTradedate());
+        bt.setDestbailamt(bankUncleardeposit.getRtnSelfbal());
+
+        AjaxResult msg = bankUncleardepositrfndController.addBankUncleardepositrfnd(bt);
+
+        if ((msg != null) && msg.containsValue("成功")) return success(msg);
+        else return error(msg.get("msg").toString());
     }
 
     /**
@@ -103,8 +117,8 @@ public class BankUncleardepositController extends BaseController {
         bankUncleardeposit.setPage("1");
         bankUncleardeposit.setAcctno(env.getProperty("BANK.ACCTNO"));
         bankUncleardeposit.setCcycd("01");
-        bankUncleardeposit.setBegdt(bankUncleardeposit.getBegdt().replace("-",""));
-        bankUncleardeposit.setEnddt(bankUncleardeposit.getEnddt().replace("-",""));
+        bankUncleardeposit.setBegdt(bankUncleardeposit.getBegdt().replace("-", ""));
+        bankUncleardeposit.setEnddt(bankUncleardeposit.getEnddt().replace("-", ""));
 
         String rtnxml = postBank(bankUncleardeposit);
 
@@ -114,8 +128,7 @@ public class BankUncleardepositController extends BaseController {
             bankUncleardepositService.insertBankUncleardeposit(bankUncleardeposit);
             update(bankUncleardeposit, rtnxml);
             return AjaxResult.success(rtn);
-        }
-        else return AjaxResult.error(rtn);
+        } else return AjaxResult.error(rtn);
     }
 
 
@@ -141,33 +154,56 @@ public class BankUncleardepositController extends BaseController {
         List<BankUncleardeposit> list = bankUncleardepositService.selectBankUncleardepositList(bankUncleardeposit);
         if (list.isEmpty()) return 0;
         BankUncleardeposit bt = list.get(0);
+        String delid = bt.getUncleardepositid();
+
         bt.setRtnTrnuid(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/TRNUID"));
         bt.setRtnStatus(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/STATUS"));
         bt.setRtnCode(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/STATUS/CODE"));
         bt.setRtnSeverity(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/STATUS/SEVERITY"));
         bt.setRtnMessage(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/STATUS/MESSAGE"));
-        bt.setRtnRsbody(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY"));
+//        bt.setRtnRsbody(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY"));
 
         bt.setRtnRcrdtotnum(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY/RCRDTOTNUM"));
         bt.setRtnCrnpgno(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY/CRNPGNO"));
         bt.setRtnPgrcrdnum(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY/PGRCRDNUM"));
         bt.setRtnTotpgnum(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY/TOTPGNUM"));
-        bt.setRtnContent(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY/CONTENT"));
-        bt.setRtnTradedate(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY/CONTENT/TRADEDATE"));
-        bt.setRtnSerialno(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY/CONTENT/SERIALNO"));
-        bt.setRtnAssetno(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY/CONTENT/ASSETNO"));
-        bt.setRtnAssetname(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY/CONTENT/ASSETNAME"));
-        bt.setRtnOppassetno(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY/CONTENT/OPPASSETNO"));
-        bt.setRtnOppassetname(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY/CONTENT/OPPASSETNAME"));
-        bt.setRtnOppbankno(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY/CONTENT/OPPBANKNO"));
-        bt.setRtnOppbankname(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY/CONTENT/OPPBANKNAME"));
-        bt.setRtnAmt(new BigDecimal(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY/CONTENT/AMT")));
-        bt.setRtnSelfbal(new BigDecimal(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY/CONTENT/SELFBAL")));
-        bt.setRtnSummary(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY/CONTENT/SUMMARY"));
-        bt.setRtnAdjustreason(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY/CONTENT/ADJUSTREASON"));
-
-
-        return bankUncleardepositService.updateBankUncleardeposit(bt);
+
+        String rsbody = JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/QUERYUNCLEARDEPOSITTRNRS/RSBODY");
+        bt.setRtnRsbody(rsbody);
+        bankUncleardepositService.updateBankUncleardeposit(bt);
+
+        ArrayList<String> contentlist = JsonUtils.findContent(rsbody);
+
+        for (int i = 0; i < contentlist.size(); i++) {
+//            bt.setRtnContent(JsonUtils.findJson(contentlist.get(i), "CONTENT"));
+            bt.setRtnTradedate(JsonUtils.findJson(contentlist.get(i), "TRADEDATE"));
+            bt.setRtnSerialno(JsonUtils.findJson(contentlist.get(i), "SERIALNO"));
+            bt.setRtnAssetno(JsonUtils.findJson(contentlist.get(i), "ASSETNO"));
+            bt.setRtnAssetname(JsonUtils.findJson(contentlist.get(i), "ASSETNAME"));
+            bt.setRtnOppassetno(JsonUtils.findJson(contentlist.get(i), "OPPASSETNO"));
+            bt.setRtnOppassetname(JsonUtils.findJson(contentlist.get(i), "OPPASSETNAME"));
+            bt.setRtnOppbankno(JsonUtils.findJson(contentlist.get(i), "OPPBANKNO"));
+            bt.setRtnOppbankname(JsonUtils.findJson(contentlist.get(i), "OPPBANKNAME"));
+            bt.setRtnAmt(JsonUtils.checkBigDecimal(JsonUtils.findJson(contentlist.get(i), "AMT")));
+            bt.setRtnSelfbal(JsonUtils.checkBigDecimal(JsonUtils.findJson(contentlist.get(i), "SELFBAL")));
+            bt.setRtnSummary(JsonUtils.findJson(contentlist.get(i), "SUMMARY"));
+            bt.setRtnAdjustreason(JsonUtils.findJson(contentlist.get(i), "ADJUSTREASON"));
+
+            BankUncleardeposit query = new BankUncleardeposit();
+            query.setRtnSerialno(JsonUtils.findJson(contentlist.get(i), "SERIALNO"));
+            List<BankUncleardeposit> rlist = bankUncleardepositService.selectBankUncleardepositList(query);
+            String[] ids = rlist.stream().map(BankUncleardeposit::getUncleardepositid).toArray(String[]::new);
+            if (ids.length > 0) bankUncleardepositService.deleteBankUncleardepositByUncleardepositids(ids);
+
+            bt.setUncleardepositid(UUID.randomUUID().toString(true));
+            bankUncleardepositService.insertBankUncleardeposit(bt);
+
+            if (i == (contentlist.size() - 1))
+                bankUncleardepositService.deleteBankUncleardepositByUncleardepositid(delid);
+        }
+
+        if (contentlist.size() < 1) return 0;
+        else return 1;
     }
 
     private String postBank(BankUncleardeposit bankUncleardeposit) {

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

@@ -95,25 +95,26 @@ public class BankUncleardepositrfndController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody BankUncleardepositrfnd bankUncleardepositrfnd)
     {
-        BankUncleardepositrfnd bt = new BankUncleardepositrfnd();
+        return addBankUncleardepositrfnd(bankUncleardepositrfnd);
+    }
+
+    public AjaxResult addBankUncleardepositrfnd(BankUncleardepositrfnd bankUncleardepositrfnd)
+    {
+
         // 流水号
         String TRNUID = "BMBZJB" + System.currentTimeMillis() + (new Random().nextInt(1000) + 1);
 
-        bt.setUncleardepositrfndid(UUID.randomUUID().toString(true));
-        bt.setTrnuid(TRNUID);
-        bt.setPpid(Long.valueOf(115));
-
-        bt.setSerialno("H00100202206210010977011130000");
-        bt.setTradedate("20240621");
-        bt.setDestbailamt(new BigDecimal("115"));
+        bankUncleardepositrfnd.setUncleardepositrfndid(UUID.randomUUID().toString(true));
+        bankUncleardepositrfnd.setTrnuid(TRNUID);
+//        bankUncleardepositrfnd.setPpid(Long.valueOf(115));
 
-        String rtnxml = postBank(bt);
+        String rtnxml = postBank(bankUncleardepositrfnd);
 
         String rtn = JsonUtils.getStatus(rtnxml);
 
         if (rtn.contains("成功")) {
-            bankUncleardepositrfndService.insertBankUncleardepositrfnd(bt);
-            update(bt, rtnxml);
+            bankUncleardepositrfndService.insertBankUncleardepositrfnd(bankUncleardepositrfnd);
+            update(bankUncleardepositrfnd, rtnxml);
             return AjaxResult.success(rtn);
         }
         else return AjaxResult.error(rtn);
@@ -158,10 +159,10 @@ public class BankUncleardepositrfndController extends BaseController
         bt.setRtnCurrency(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/UNCLEARDEPOSITRFNDTRNRS/RSBODY/CURRENCY"));
         bt.setRtnAcctname(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/UNCLEARDEPOSITRFNDTRNRS/RSBODY/ACCTNAME"));
         bt.setRtnBankname(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/UNCLEARDEPOSITRFNDTRNRS/RSBODY/BANKNAME"));
-        bt.setRtnRefundamt(new BigDecimal(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/UNCLEARDEPOSITRFNDTRNRS/RSBODY/REFUNDAMT")));
+        bt.setRtnRefundamt(JsonUtils.checkBigDecimal(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/UNCLEARDEPOSITRFNDTRNRS/RSBODY/REFUNDAMT")));
         bt.setRtnRemark(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/UNCLEARDEPOSITRFNDTRNRS/RSBODY/REMARK"));
 
-        bt.setRtnXferprcsts(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/UNCLEARDEPOSITRFNDTRNRS/RSBODY/XFERPRCSTS"));
+//        bt.setRtnXferprcsts(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/UNCLEARDEPOSITRFNDTRNRS/RSBODY/XFERPRCSTS"));
         bt.setRtnXferprccode(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/UNCLEARDEPOSITRFNDTRNRS/RSBODY/XFERPRCSTS/XFERPRCCODE"));
         bt.setRtnDtxferprc(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/UNCLEARDEPOSITRFNDTRNRS/RSBODY/XFERPRCSTS/DTXFERPRC"));
         bt.setRtnMessage(JsonUtils.findXML(rtnxml, "FOX/SECURITIES_MSGSRSV1/UNCLEARDEPOSITRFNDTRNRS/RSBODY/XFERPRCSTS/MESSAGE"));

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

@@ -0,0 +1,710 @@
+package com.ruoyi.mast.bank.domain;
+
+import java.math.BigDecimal;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+
+/**
+ * 查询保证金入账明细r对象 bank_depositdescr
+ * 
+ * @author ruoyi
+ * @date 2024-09-14
+ */
+public class BankDepositdescr extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 查询保证金入账明细id */
+    private String depositdescid;
+
+    /** 采购计划id */
+    @Excel(name = "采购计划id")
+    private Long ppid;
+
+    /** 客户端交易的唯一流水号建议值为yyyymmdd+序号 */
+    @Excel(name = "客户端交易的唯一流水号建议值为yyyymmdd+序号")
+    private String trnuid;
+
+    /** 报文节点 */
+    @Excel(name = "报文节点")
+    private String rqbody;
+
+    /** 标段id */
+    @Excel(name = "标段id")
+    private String sgtid;
+
+    /** 标段编号 */
+    @Excel(name = "标段编号")
+    private String sgtno;
+
+    /** 项目编号 */
+    @Excel(name = "项目编号")
+    private String prjno;
+
+    /** 核心客户号 */
+    @Excel(name = "核心客户号")
+    private String pltfmcstno;
+
+    /** 企业名称 */
+    @Excel(name = "企业名称")
+    private String entpnm;
+
+    /** 页码不输默认查询第一页 */
+    @Excel(name = "页码不输默认查询第一页")
+    private String pgno;
+
+    /** 版本号（2.0新增响应字段remark） */
+    @Excel(name = "版本号", readConverterExp = "2=.0新增响应字段remark")
+    private String version;
+
+    /** 客户端交易的唯一标志 */
+    @Excel(name = "客户端交易的唯一标志")
+    private String rtnTrnuid;
+
+    /** 交易处理状态 */
+    @Excel(name = "交易处理状态")
+    private String rtnStatus;
+
+    /** 处理结果码 */
+    @Excel(name = "处理结果码")
+    private String rtnCode;
+
+    /** 处理结果等级(info/warn/error) */
+    @Excel(name = "处理结果等级(info/warn/error)")
+    private String rtnSeverity;
+
+    /** 处理信息描述 */
+    @Excel(name = "处理信息描述")
+    private String rtnMessage;
+
+    /** 报文节点 */
+    @Excel(name = "报文节点")
+    private String rtnRsbody;
+
+    /** 记录总数 */
+    @Excel(name = "记录总数")
+    private String rtnRcrdtotnum;
+
+    /** 当前页码 */
+    @Excel(name = "当前页码")
+    private String rtnCrnpgno;
+
+    /** 每页记录数 */
+    @Excel(name = "每页记录数")
+    private String rtnPgrcrdnum;
+
+    /** 总页数 */
+    @Excel(name = "总页数")
+    private String rtnTotpgnum;
+
+    /** 明细报文标识 */
+    @Excel(name = "明细报文标识")
+    private String rtnContent;
+
+    /** 租户号（默认：000） */
+    @Excel(name = "租户号", readConverterExp = "默=认：000")
+    private String rtnLescstno;
+
+    /** 投标编号（调用退款接口时使用） */
+    @Excel(name = "投标编号", readConverterExp = "调=用退款接口时使用")
+    private String rtnTdrno;
+
+    /** 客户编号（默认：10+核心客户号） */
+    @Excel(name = "客户编号", readConverterExp = "默=认：10+核心客户号")
+    private String rtnCstno;
+
+    /** 项目编号 */
+    @Excel(name = "项目编号")
+    private String rtnPrjno;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String rtnPrjnm;
+
+    /** 标段编号 */
+    @Excel(name = "标段编号")
+    private String rtnSgtno;
+
+    /** 标段名称 */
+    @Excel(name = "标段名称")
+    private String rtnSgtnm;
+
+    /** 投标状态0-未中标1-已中标 */
+    @Excel(name = "投标状态0-未中标1-已中标")
+    private String rtnSgtst;
+
+    /** 保证金状态 1-竞标 */
+    @Excel(name = "保证金状态 1-竞标")
+    private String rtnMrgnst;
+
+    /** 投标账号 */
+    @Excel(name = "投标账号")
+    private String rtnTdracctno;
+
+    /** 投标账号币种01-人民币 */
+    @Excel(name = "投标账号币种01-人民币")
+    private String rtnTdracctnoccycd;
+
+    /** 投标账户名称 */
+    @Excel(name = "投标账户名称")
+    private String rtnTdracctnm;
+
+    /** 投标账号行号 */
+    @Excel(name = "投标账号行号")
+    private String rtnTdracctnobnkno;
+
+    /** 投标账号行名 */
+    @Excel(name = "投标账号行名")
+    private String rtnTdracctnobnknm;
+
+    /** 投标数量 */
+    @Excel(name = "投标数量")
+    private String rtnTdrnum;
+
+    /** 保证金金额 double */
+    @Excel(name = "保证金金额 double")
+    private BigDecimal rtnMrgnamt;
+
+    /** 中标金额 double */
+    @Excel(name = "中标金额 double")
+    private BigDecimal rtnTdramt;
+
+    /** 代理服务费 double */
+    @Excel(name = "代理服务费 double")
+    private BigDecimal rtnAgncsvcfee;
+
+    /** 冻结金额 double */
+    @Excel(name = "冻结金额 double")
+    private BigDecimal rtnFrzamt;
+
+    /** 罚没金额 double */
+    @Excel(name = "罚没金额 double")
+    private BigDecimal rtnFineamt;
+
+    /** 投标日期yyyymmdd */
+    @Excel(name = "投标日期yyyymmdd")
+    private String rtnTdrdt;
+
+    /** 投标时间hhmmss */
+    @Excel(name = "投标时间hhmmss")
+    private String rtnTdrtm;
+
+    /** 缴纳类型0-一般保证金 1- 长期保证金 2-现金3-保函 */
+    @Excel(name = "缴纳类型0-一般保证金 1- 长期保证金 2-现金3-保函")
+    private String rtnDuetp;
+
+    /** 会员编号 */
+    @Excel(name = "会员编号")
+    private String rtnMbrshpno;
+
+    /** 服务费 double */
+    @Excel(name = "服务费 double")
+    private BigDecimal rtnSvcfee;
+
+    /** 交易附言 */
+    @Excel(name = "交易附言")
+    private String rtnRemark;
+
+    /** 原因 */
+    @Excel(name = "原因")
+    private String reason;
+
+    public void setDepositdescid(String depositdescid) 
+    {
+        this.depositdescid = depositdescid;
+    }
+
+    public String getDepositdescid() 
+    {
+        return depositdescid;
+    }
+    public void setPpid(Long ppid) 
+    {
+        this.ppid = ppid;
+    }
+
+    public Long getPpid() 
+    {
+        return ppid;
+    }
+    public void setTrnuid(String trnuid) 
+    {
+        this.trnuid = trnuid;
+    }
+
+    public String getTrnuid() 
+    {
+        return trnuid;
+    }
+    public void setRqbody(String rqbody) 
+    {
+        this.rqbody = rqbody;
+    }
+
+    public String getRqbody() 
+    {
+        return rqbody;
+    }
+    public void setSgtid(String sgtid) 
+    {
+        this.sgtid = sgtid;
+    }
+
+    public String getSgtid() 
+    {
+        return sgtid;
+    }
+    public void setSgtno(String sgtno) 
+    {
+        this.sgtno = sgtno;
+    }
+
+    public String getSgtno() 
+    {
+        return sgtno;
+    }
+    public void setPrjno(String prjno) 
+    {
+        this.prjno = prjno;
+    }
+
+    public String getPrjno() 
+    {
+        return prjno;
+    }
+    public void setPltfmcstno(String pltfmcstno) 
+    {
+        this.pltfmcstno = pltfmcstno;
+    }
+
+    public String getPltfmcstno() 
+    {
+        return pltfmcstno;
+    }
+    public void setEntpnm(String entpnm) 
+    {
+        this.entpnm = entpnm;
+    }
+
+    public String getEntpnm() 
+    {
+        return entpnm;
+    }
+    public void setPgno(String pgno) 
+    {
+        this.pgno = pgno;
+    }
+
+    public String getPgno() 
+    {
+        return pgno;
+    }
+    public void setVersion(String version) 
+    {
+        this.version = version;
+    }
+
+    public String getVersion() 
+    {
+        return version;
+    }
+    public void setRtnTrnuid(String rtnTrnuid) 
+    {
+        this.rtnTrnuid = rtnTrnuid;
+    }
+
+    public String getRtnTrnuid() 
+    {
+        return rtnTrnuid;
+    }
+    public void setRtnStatus(String rtnStatus) 
+    {
+        this.rtnStatus = rtnStatus;
+    }
+
+    public String getRtnStatus() 
+    {
+        return rtnStatus;
+    }
+    public void setRtnCode(String rtnCode) 
+    {
+        this.rtnCode = rtnCode;
+    }
+
+    public String getRtnCode() 
+    {
+        return rtnCode;
+    }
+    public void setRtnSeverity(String rtnSeverity) 
+    {
+        this.rtnSeverity = rtnSeverity;
+    }
+
+    public String getRtnSeverity() 
+    {
+        return rtnSeverity;
+    }
+    public void setRtnMessage(String rtnMessage) 
+    {
+        this.rtnMessage = rtnMessage;
+    }
+
+    public String getRtnMessage() 
+    {
+        return rtnMessage;
+    }
+    public void setRtnRsbody(String rtnRsbody) 
+    {
+        this.rtnRsbody = rtnRsbody;
+    }
+
+    public String getRtnRsbody() 
+    {
+        return rtnRsbody;
+    }
+    public void setRtnRcrdtotnum(String rtnRcrdtotnum) 
+    {
+        this.rtnRcrdtotnum = rtnRcrdtotnum;
+    }
+
+    public String getRtnRcrdtotnum() 
+    {
+        return rtnRcrdtotnum;
+    }
+    public void setRtnCrnpgno(String rtnCrnpgno) 
+    {
+        this.rtnCrnpgno = rtnCrnpgno;
+    }
+
+    public String getRtnCrnpgno() 
+    {
+        return rtnCrnpgno;
+    }
+    public void setRtnPgrcrdnum(String rtnPgrcrdnum) 
+    {
+        this.rtnPgrcrdnum = rtnPgrcrdnum;
+    }
+
+    public String getRtnPgrcrdnum() 
+    {
+        return rtnPgrcrdnum;
+    }
+    public void setRtnTotpgnum(String rtnTotpgnum) 
+    {
+        this.rtnTotpgnum = rtnTotpgnum;
+    }
+
+    public String getRtnTotpgnum() 
+    {
+        return rtnTotpgnum;
+    }
+    public void setRtnContent(String rtnContent) 
+    {
+        this.rtnContent = rtnContent;
+    }
+
+    public String getRtnContent() 
+    {
+        return rtnContent;
+    }
+    public void setRtnLescstno(String rtnLescstno) 
+    {
+        this.rtnLescstno = rtnLescstno;
+    }
+
+    public String getRtnLescstno() 
+    {
+        return rtnLescstno;
+    }
+    public void setRtnTdrno(String rtnTdrno) 
+    {
+        this.rtnTdrno = rtnTdrno;
+    }
+
+    public String getRtnTdrno() 
+    {
+        return rtnTdrno;
+    }
+    public void setRtnCstno(String rtnCstno) 
+    {
+        this.rtnCstno = rtnCstno;
+    }
+
+    public String getRtnCstno() 
+    {
+        return rtnCstno;
+    }
+    public void setRtnPrjno(String rtnPrjno) 
+    {
+        this.rtnPrjno = rtnPrjno;
+    }
+
+    public String getRtnPrjno() 
+    {
+        return rtnPrjno;
+    }
+    public void setRtnPrjnm(String rtnPrjnm) 
+    {
+        this.rtnPrjnm = rtnPrjnm;
+    }
+
+    public String getRtnPrjnm() 
+    {
+        return rtnPrjnm;
+    }
+    public void setRtnSgtno(String rtnSgtno) 
+    {
+        this.rtnSgtno = rtnSgtno;
+    }
+
+    public String getRtnSgtno() 
+    {
+        return rtnSgtno;
+    }
+    public void setRtnSgtnm(String rtnSgtnm) 
+    {
+        this.rtnSgtnm = rtnSgtnm;
+    }
+
+    public String getRtnSgtnm() 
+    {
+        return rtnSgtnm;
+    }
+    public void setRtnSgtst(String rtnSgtst) 
+    {
+        this.rtnSgtst = rtnSgtst;
+    }
+
+    public String getRtnSgtst() 
+    {
+        return rtnSgtst;
+    }
+    public void setRtnMrgnst(String rtnMrgnst) 
+    {
+        this.rtnMrgnst = rtnMrgnst;
+    }
+
+    public String getRtnMrgnst() 
+    {
+        return rtnMrgnst;
+    }
+    public void setRtnTdracctno(String rtnTdracctno) 
+    {
+        this.rtnTdracctno = rtnTdracctno;
+    }
+
+    public String getRtnTdracctno() 
+    {
+        return rtnTdracctno;
+    }
+    public void setRtnTdracctnoccycd(String rtnTdracctnoccycd) 
+    {
+        this.rtnTdracctnoccycd = rtnTdracctnoccycd;
+    }
+
+    public String getRtnTdracctnoccycd() 
+    {
+        return rtnTdracctnoccycd;
+    }
+    public void setRtnTdracctnm(String rtnTdracctnm) 
+    {
+        this.rtnTdracctnm = rtnTdracctnm;
+    }
+
+    public String getRtnTdracctnm() 
+    {
+        return rtnTdracctnm;
+    }
+    public void setRtnTdracctnobnkno(String rtnTdracctnobnkno) 
+    {
+        this.rtnTdracctnobnkno = rtnTdracctnobnkno;
+    }
+
+    public String getRtnTdracctnobnkno() 
+    {
+        return rtnTdracctnobnkno;
+    }
+    public void setRtnTdracctnobnknm(String rtnTdracctnobnknm) 
+    {
+        this.rtnTdracctnobnknm = rtnTdracctnobnknm;
+    }
+
+    public String getRtnTdracctnobnknm() 
+    {
+        return rtnTdracctnobnknm;
+    }
+    public void setRtnTdrnum(String rtnTdrnum) 
+    {
+        this.rtnTdrnum = rtnTdrnum;
+    }
+
+    public String getRtnTdrnum() 
+    {
+        return rtnTdrnum;
+    }
+    public void setRtnMrgnamt(BigDecimal rtnMrgnamt) 
+    {
+        this.rtnMrgnamt = rtnMrgnamt;
+    }
+
+    public BigDecimal getRtnMrgnamt() 
+    {
+        return rtnMrgnamt;
+    }
+    public void setRtnTdramt(BigDecimal rtnTdramt) 
+    {
+        this.rtnTdramt = rtnTdramt;
+    }
+
+    public BigDecimal getRtnTdramt() 
+    {
+        return rtnTdramt;
+    }
+    public void setRtnAgncsvcfee(BigDecimal rtnAgncsvcfee) 
+    {
+        this.rtnAgncsvcfee = rtnAgncsvcfee;
+    }
+
+    public BigDecimal getRtnAgncsvcfee() 
+    {
+        return rtnAgncsvcfee;
+    }
+    public void setRtnFrzamt(BigDecimal rtnFrzamt) 
+    {
+        this.rtnFrzamt = rtnFrzamt;
+    }
+
+    public BigDecimal getRtnFrzamt() 
+    {
+        return rtnFrzamt;
+    }
+    public void setRtnFineamt(BigDecimal rtnFineamt) 
+    {
+        this.rtnFineamt = rtnFineamt;
+    }
+
+    public BigDecimal getRtnFineamt() 
+    {
+        return rtnFineamt;
+    }
+    public void setRtnTdrdt(String rtnTdrdt) 
+    {
+        this.rtnTdrdt = rtnTdrdt;
+    }
+
+    public String getRtnTdrdt() 
+    {
+        return rtnTdrdt;
+    }
+    public void setRtnTdrtm(String rtnTdrtm) 
+    {
+        this.rtnTdrtm = rtnTdrtm;
+    }
+
+    public String getRtnTdrtm() 
+    {
+        return rtnTdrtm;
+    }
+    public void setRtnDuetp(String rtnDuetp) 
+    {
+        this.rtnDuetp = rtnDuetp;
+    }
+
+    public String getRtnDuetp() 
+    {
+        return rtnDuetp;
+    }
+    public void setRtnMbrshpno(String rtnMbrshpno) 
+    {
+        this.rtnMbrshpno = rtnMbrshpno;
+    }
+
+    public String getRtnMbrshpno() 
+    {
+        return rtnMbrshpno;
+    }
+    public void setRtnSvcfee(BigDecimal rtnSvcfee) 
+    {
+        this.rtnSvcfee = rtnSvcfee;
+    }
+
+    public BigDecimal getRtnSvcfee() 
+    {
+        return rtnSvcfee;
+    }
+    public void setRtnRemark(String rtnRemark) 
+    {
+        this.rtnRemark = rtnRemark;
+    }
+
+    public String getRtnRemark() 
+    {
+        return rtnRemark;
+    }
+    public void setReason(String reason) 
+    {
+        this.reason = reason;
+    }
+
+    public String getReason() 
+    {
+        return reason;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("depositdescid", getDepositdescid())
+            .append("ppid", getPpid())
+            .append("trnuid", getTrnuid())
+            .append("rqbody", getRqbody())
+            .append("sgtid", getSgtid())
+            .append("sgtno", getSgtno())
+            .append("prjno", getPrjno())
+            .append("pltfmcstno", getPltfmcstno())
+            .append("entpnm", getEntpnm())
+            .append("pgno", getPgno())
+            .append("version", getVersion())
+            .append("rtnTrnuid", getRtnTrnuid())
+            .append("rtnStatus", getRtnStatus())
+            .append("rtnCode", getRtnCode())
+            .append("rtnSeverity", getRtnSeverity())
+            .append("rtnMessage", getRtnMessage())
+            .append("rtnRsbody", getRtnRsbody())
+            .append("rtnRcrdtotnum", getRtnRcrdtotnum())
+            .append("rtnCrnpgno", getRtnCrnpgno())
+            .append("rtnPgrcrdnum", getRtnPgrcrdnum())
+            .append("rtnTotpgnum", getRtnTotpgnum())
+            .append("rtnContent", getRtnContent())
+            .append("rtnLescstno", getRtnLescstno())
+            .append("rtnTdrno", getRtnTdrno())
+            .append("rtnCstno", getRtnCstno())
+            .append("rtnPrjno", getRtnPrjno())
+            .append("rtnPrjnm", getRtnPrjnm())
+            .append("rtnSgtno", getRtnSgtno())
+            .append("rtnSgtnm", getRtnSgtnm())
+            .append("rtnSgtst", getRtnSgtst())
+            .append("rtnMrgnst", getRtnMrgnst())
+            .append("rtnTdracctno", getRtnTdracctno())
+            .append("rtnTdracctnoccycd", getRtnTdracctnoccycd())
+            .append("rtnTdracctnm", getRtnTdracctnm())
+            .append("rtnTdracctnobnkno", getRtnTdracctnobnkno())
+            .append("rtnTdracctnobnknm", getRtnTdracctnobnknm())
+            .append("rtnTdrnum", getRtnTdrnum())
+            .append("rtnMrgnamt", getRtnMrgnamt())
+            .append("rtnTdramt", getRtnTdramt())
+            .append("rtnAgncsvcfee", getRtnAgncsvcfee())
+            .append("rtnFrzamt", getRtnFrzamt())
+            .append("rtnFineamt", getRtnFineamt())
+            .append("rtnTdrdt", getRtnTdrdt())
+            .append("rtnTdrtm", getRtnTdrtm())
+            .append("rtnDuetp", getRtnDuetp())
+            .append("rtnMbrshpno", getRtnMbrshpno())
+            .append("rtnSvcfee", getRtnSvcfee())
+            .append("rtnRemark", getRtnRemark())
+            .append("reason", getReason())
+            .toString();
+    }
+}

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

@@ -66,4 +66,13 @@ public interface BankDepositdescMapper
      */
     public List<BankDepositdesc> selectByDepositdescids(String[] depositdescids);
 
+    /**
+     * 查询查询保证金入账明细列表
+     *
+     * @param bankDepositdesc 查询保证金入账明细
+     * @return 查询保证金入账明细集合
+     */
+    public List<BankDepositdesc> selectBankDepositdescList2(BankDepositdesc bankDepositdesc);
+
+    public int updateBankDepositdesc2(BankDepositdesc bankDepositdesc);
 }

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

@@ -0,0 +1,61 @@
+package com.ruoyi.mast.bank.mapper;
+
+import java.util.List;
+import com.ruoyi.mast.bank.domain.BankDepositdescr;
+
+/**
+ * 查询保证金入账明细rMapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-09-14
+ */
+public interface BankDepositdescrMapper 
+{
+    /**
+     * 查询查询保证金入账明细r
+     * 
+     * @param depositdescid 查询保证金入账明细r主键
+     * @return 查询保证金入账明细r
+     */
+    public BankDepositdescr selectBankDepositdescrByDepositdescid(String depositdescid);
+
+    /**
+     * 查询查询保证金入账明细r列表
+     * 
+     * @param bankDepositdescr 查询保证金入账明细r
+     * @return 查询保证金入账明细r集合
+     */
+    public List<BankDepositdescr> selectBankDepositdescrList(BankDepositdescr bankDepositdescr);
+
+    /**
+     * 新增查询保证金入账明细r
+     * 
+     * @param bankDepositdescr 查询保证金入账明细r
+     * @return 结果
+     */
+    public int insertBankDepositdescr(BankDepositdescr bankDepositdescr);
+
+    /**
+     * 修改查询保证金入账明细r
+     * 
+     * @param bankDepositdescr 查询保证金入账明细r
+     * @return 结果
+     */
+    public int updateBankDepositdescr(BankDepositdescr bankDepositdescr);
+
+    /**
+     * 删除查询保证金入账明细r
+     * 
+     * @param depositdescid 查询保证金入账明细r主键
+     * @return 结果
+     */
+    public int deleteBankDepositdescrByDepositdescid(String depositdescid);
+
+    /**
+     * 批量删除查询保证金入账明细r
+     * 
+     * @param depositdescids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteBankDepositdescrByDepositdescids(String[] depositdescids);
+}

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

@@ -65,4 +65,8 @@ public interface IBankDepositdescService
      * @return
      */
     public List<BankDepositdesc> selectByDepositdescids(String[] depositdescids);
+
+    public List<BankDepositdesc> selectBankDepositdescList2(BankDepositdesc bankDepositdesc);
+
+    public int updateBankDepositdesc2(BankDepositdesc bankDepositdesc);
 }

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

@@ -0,0 +1,61 @@
+package com.ruoyi.mast.bank.service;
+
+import java.util.List;
+import com.ruoyi.mast.bank.domain.BankDepositdescr;
+
+/**
+ * 查询保证金入账明细rService接口
+ * 
+ * @author ruoyi
+ * @date 2024-09-14
+ */
+public interface IBankDepositdescrService 
+{
+    /**
+     * 查询查询保证金入账明细r
+     * 
+     * @param depositdescid 查询保证金入账明细r主键
+     * @return 查询保证金入账明细r
+     */
+    public BankDepositdescr selectBankDepositdescrByDepositdescid(String depositdescid);
+
+    /**
+     * 查询查询保证金入账明细r列表
+     * 
+     * @param bankDepositdescr 查询保证金入账明细r
+     * @return 查询保证金入账明细r集合
+     */
+    public List<BankDepositdescr> selectBankDepositdescrList(BankDepositdescr bankDepositdescr);
+
+    /**
+     * 新增查询保证金入账明细r
+     * 
+     * @param bankDepositdescr 查询保证金入账明细r
+     * @return 结果
+     */
+    public int insertBankDepositdescr(BankDepositdescr bankDepositdescr);
+
+    /**
+     * 修改查询保证金入账明细r
+     * 
+     * @param bankDepositdescr 查询保证金入账明细r
+     * @return 结果
+     */
+    public int updateBankDepositdescr(BankDepositdescr bankDepositdescr);
+
+    /**
+     * 批量删除查询保证金入账明细r
+     * 
+     * @param depositdescids 需要删除的查询保证金入账明细r主键集合
+     * @return 结果
+     */
+    public int deleteBankDepositdescrByDepositdescids(String[] depositdescids);
+
+    /**
+     * 删除查询保证金入账明细r信息
+     * 
+     * @param depositdescid 查询保证金入账明细r主键
+     * @return 结果
+     */
+    public int deleteBankDepositdescrByDepositdescid(String depositdescid);
+}

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

@@ -99,4 +99,14 @@ public class BankDepositdescServiceImpl implements IBankDepositdescService
     public List<BankDepositdesc> selectByDepositdescids(String[] depositdescids){
         return bankDepositdescMapper.selectByDepositdescids(depositdescids);
     }
+
+    @Override
+    public List<BankDepositdesc> selectBankDepositdescList2(BankDepositdesc bankDepositdesc) {
+        return bankDepositdescMapper.selectBankDepositdescList2(bankDepositdesc);
+    }
+
+    @Override
+    public int updateBankDepositdesc2(BankDepositdesc bankDepositdesc) {
+        return bankDepositdescMapper.updateBankDepositdesc2(bankDepositdesc);
+    }
 }

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

@@ -0,0 +1,93 @@
+package com.ruoyi.mast.bank.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.mast.bank.mapper.BankDepositdescrMapper;
+import com.ruoyi.mast.bank.domain.BankDepositdescr;
+import com.ruoyi.mast.bank.service.IBankDepositdescrService;
+
+/**
+ * 查询保证金入账明细rService业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-09-14
+ */
+@Service
+public class BankDepositdescrServiceImpl implements IBankDepositdescrService 
+{
+    @Autowired
+    private BankDepositdescrMapper bankDepositdescrMapper;
+
+    /**
+     * 查询查询保证金入账明细r
+     * 
+     * @param depositdescid 查询保证金入账明细r主键
+     * @return 查询保证金入账明细r
+     */
+    @Override
+    public BankDepositdescr selectBankDepositdescrByDepositdescid(String depositdescid)
+    {
+        return bankDepositdescrMapper.selectBankDepositdescrByDepositdescid(depositdescid);
+    }
+
+    /**
+     * 查询查询保证金入账明细r列表
+     * 
+     * @param bankDepositdescr 查询保证金入账明细r
+     * @return 查询保证金入账明细r
+     */
+    @Override
+    public List<BankDepositdescr> selectBankDepositdescrList(BankDepositdescr bankDepositdescr)
+    {
+        return bankDepositdescrMapper.selectBankDepositdescrList(bankDepositdescr);
+    }
+
+    /**
+     * 新增查询保证金入账明细r
+     * 
+     * @param bankDepositdescr 查询保证金入账明细r
+     * @return 结果
+     */
+    @Override
+    public int insertBankDepositdescr(BankDepositdescr bankDepositdescr)
+    {
+        return bankDepositdescrMapper.insertBankDepositdescr(bankDepositdescr);
+    }
+
+    /**
+     * 修改查询保证金入账明细r
+     * 
+     * @param bankDepositdescr 查询保证金入账明细r
+     * @return 结果
+     */
+    @Override
+    public int updateBankDepositdescr(BankDepositdescr bankDepositdescr)
+    {
+        return bankDepositdescrMapper.updateBankDepositdescr(bankDepositdescr);
+    }
+
+    /**
+     * 批量删除查询保证金入账明细r
+     * 
+     * @param depositdescids 需要删除的查询保证金入账明细r主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBankDepositdescrByDepositdescids(String[] depositdescids)
+    {
+        return bankDepositdescrMapper.deleteBankDepositdescrByDepositdescids(depositdescids);
+    }
+
+    /**
+     * 删除查询保证金入账明细r信息
+     * 
+     * @param depositdescid 查询保证金入账明细r主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBankDepositdescrByDepositdescid(String depositdescid)
+    {
+        return bankDepositdescrMapper.deleteBankDepositdescrByDepositdescid(depositdescid);
+    }
+}

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/utils/JsonUtils.java

@@ -142,15 +142,16 @@ public class JsonUtils {
         if (!"0".equals(C) && !"".equals(C)) return JsonUtils.findXML(xml, "FOX/SIGNONMSGSRSV1/SONRS/STATUS/MESSAGE");
 
         String CODE = JsonUtils.findXML(xml, "FOX/SECURITIES_MSGSRSV1/*/STATUS/CODE");
-        if (!"0".equals(CODE) && !"".equals(CODE))
-            return JsonUtils.findXML(xml, "FOX/SECURITIES_MSGSRSV1/*/STATUS/MESSAGE");
-        if ("0".equals(CODE) && "0".equals(C)) return "处理成功";
 
         String XFERPRCCODE = JsonUtils.findXML(xml, "FOX/SECURITIES_MSGSRSV1/*/RSBODY/XFERPRCSTS/XFERPRCCODE");
         if ("0".equals(CODE) && "PAYOUT".equals(XFERPRCCODE)) return "交易成功";
-        if ("0".equals(CODE) && !"PAYOUT".equals(XFERPRCCODE))
+        if ("0".equals(CODE) && !"PAYOUT".equals(XFERPRCCODE)&& !"".equals(XFERPRCCODE))
             return JsonUtils.findXML(xml, "FOX/SECURITIES_MSGSRSV1/*/RSBODY/XFERPRCSTS/MESSAGE");
 
+        if (!"0".equals(CODE) && !"".equals(CODE))
+            return JsonUtils.findXML(xml, "FOX/SECURITIES_MSGSRSV1/*/STATUS/MESSAGE");
+        if ("0".equals(CODE) && "0".equals(C)) return "处理成功";
+
         return XFERPRCCODE + ":" + JsonUtils.findXML(xml, "FOX/SECURITIES_MSGSRSV1/*/RSBODY/XFERPRCSTS/MESSAGE");
     }
 

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

@@ -293,4 +293,66 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{depositdescid}
         </foreach>
     </delete>
+
+    <select id="selectBankDepositdescList2" parameterType="BankDepositdesc" resultMap="BankDepositdescResult">
+        <include refid="selectBankDepositdescVo"/>
+        <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>
+             and rtn_agncsvcfee &lt; 1
+        </where>
+    </select>
+
+    <update id="updateBankDepositdesc2" parameterType="BankDepositdesc">
+        update bank_depositdesc
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="rtnAgncsvcfee != null">rtn_agncsvcfee = #{rtnAgncsvcfee},</if>
+        </trim>
+        where depositdescid = #{depositdescid}
+    </update>
 </mapper>

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

@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.mast.bank.mapper.BankDepositdescrMapper">
+    
+    <resultMap type="BankDepositdescr" id="BankDepositdescrResult">
+        <result property="depositdescid"    column="depositdescid"    />
+        <result property="ppid"    column="ppid"    />
+        <result property="trnuid"    column="trnuid"    />
+        <result property="rqbody"    column="rqbody"    />
+        <result property="sgtid"    column="sgtid"    />
+        <result property="sgtno"    column="sgtno"    />
+        <result property="prjno"    column="prjno"    />
+        <result property="pltfmcstno"    column="pltfmcstno"    />
+        <result property="entpnm"    column="entpnm"    />
+        <result property="pgno"    column="pgno"    />
+        <result property="version"    column="version"    />
+        <result property="rtnTrnuid"    column="rtn_trnuid"    />
+        <result property="rtnStatus"    column="rtn_status"    />
+        <result property="rtnCode"    column="rtn_code"    />
+        <result property="rtnSeverity"    column="rtn_severity"    />
+        <result property="rtnMessage"    column="rtn_message"    />
+        <result property="rtnRsbody"    column="rtn_rsbody"    />
+        <result property="rtnRcrdtotnum"    column="rtn_rcrdtotnum"    />
+        <result property="rtnCrnpgno"    column="rtn_crnpgno"    />
+        <result property="rtnPgrcrdnum"    column="rtn_pgrcrdnum"    />
+        <result property="rtnTotpgnum"    column="rtn_totpgnum"    />
+        <result property="rtnContent"    column="rtn_content"    />
+        <result property="rtnLescstno"    column="rtn_lescstno"    />
+        <result property="rtnTdrno"    column="rtn_tdrno"    />
+        <result property="rtnCstno"    column="rtn_cstno"    />
+        <result property="rtnPrjno"    column="rtn_prjno"    />
+        <result property="rtnPrjnm"    column="rtn_prjnm"    />
+        <result property="rtnSgtno"    column="rtn_sgtno"    />
+        <result property="rtnSgtnm"    column="rtn_sgtnm"    />
+        <result property="rtnSgtst"    column="rtn_sgtst"    />
+        <result property="rtnMrgnst"    column="rtn_mrgnst"    />
+        <result property="rtnTdracctno"    column="rtn_tdracctno"    />
+        <result property="rtnTdracctnoccycd"    column="rtn_tdracctnoccycd"    />
+        <result property="rtnTdracctnm"    column="rtn_tdracctnm"    />
+        <result property="rtnTdracctnobnkno"    column="rtn_tdracctnobnkno"    />
+        <result property="rtnTdracctnobnknm"    column="rtn_tdracctnobnknm"    />
+        <result property="rtnTdrnum"    column="rtn_tdrnum"    />
+        <result property="rtnMrgnamt"    column="rtn_mrgnamt"    />
+        <result property="rtnTdramt"    column="rtn_tdramt"    />
+        <result property="rtnAgncsvcfee"    column="rtn_agncsvcfee"    />
+        <result property="rtnFrzamt"    column="rtn_frzamt"    />
+        <result property="rtnFineamt"    column="rtn_fineamt"    />
+        <result property="rtnTdrdt"    column="rtn_tdrdt"    />
+        <result property="rtnTdrtm"    column="rtn_tdrtm"    />
+        <result property="rtnDuetp"    column="rtn_duetp"    />
+        <result property="rtnMbrshpno"    column="rtn_mbrshpno"    />
+        <result property="rtnSvcfee"    column="rtn_svcfee"    />
+        <result property="rtnRemark"    column="rtn_remark"    />
+        <result property="reason"    column="reason"    />
+    </resultMap>
+
+    <sql id="selectBankDepositdescrVo">
+        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"/>
+        <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>
+        </where>
+    </select>
+    
+    <select id="selectBankDepositdescrByDepositdescid" parameterType="String" resultMap="BankDepositdescrResult">
+        <include refid="selectBankDepositdescrVo"/>
+        where depositdescid = #{depositdescid}
+    </select>
+        
+    <insert id="insertBankDepositdescr" parameterType="BankDepositdescr">
+        insert into bank_depositdescr
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="depositdescid != null">depositdescid,</if>
+            <if test="ppid != null">ppid,</if>
+            <if test="trnuid != null and trnuid != ''">trnuid,</if>
+            <if test="rqbody != null">rqbody,</if>
+            <if test="sgtid != null">sgtid,</if>
+            <if test="sgtno != null">sgtno,</if>
+            <if test="prjno != null">prjno,</if>
+            <if test="pltfmcstno != null">pltfmcstno,</if>
+            <if test="entpnm != null">entpnm,</if>
+            <if test="pgno != null">pgno,</if>
+            <if test="version != null">version,</if>
+            <if test="rtnTrnuid != null">rtn_trnuid,</if>
+            <if test="rtnStatus != null">rtn_status,</if>
+            <if test="rtnCode != null">rtn_code,</if>
+            <if test="rtnSeverity != null">rtn_severity,</if>
+            <if test="rtnMessage != null">rtn_message,</if>
+            <if test="rtnRsbody != null">rtn_rsbody,</if>
+            <if test="rtnRcrdtotnum != null">rtn_rcrdtotnum,</if>
+            <if test="rtnCrnpgno != null">rtn_crnpgno,</if>
+            <if test="rtnPgrcrdnum != null">rtn_pgrcrdnum,</if>
+            <if test="rtnTotpgnum != null">rtn_totpgnum,</if>
+            <if test="rtnContent != null">rtn_content,</if>
+            <if test="rtnLescstno != null">rtn_lescstno,</if>
+            <if test="rtnTdrno != null">rtn_tdrno,</if>
+            <if test="rtnCstno != null">rtn_cstno,</if>
+            <if test="rtnPrjno != null">rtn_prjno,</if>
+            <if test="rtnPrjnm != null">rtn_prjnm,</if>
+            <if test="rtnSgtno != null">rtn_sgtno,</if>
+            <if test="rtnSgtnm != null">rtn_sgtnm,</if>
+            <if test="rtnSgtst != null">rtn_sgtst,</if>
+            <if test="rtnMrgnst != null">rtn_mrgnst,</if>
+            <if test="rtnTdracctno != null">rtn_tdracctno,</if>
+            <if test="rtnTdracctnoccycd != null">rtn_tdracctnoccycd,</if>
+            <if test="rtnTdracctnm != null">rtn_tdracctnm,</if>
+            <if test="rtnTdracctnobnkno != null">rtn_tdracctnobnkno,</if>
+            <if test="rtnTdracctnobnknm != null">rtn_tdracctnobnknm,</if>
+            <if test="rtnTdrnum != null">rtn_tdrnum,</if>
+            <if test="rtnMrgnamt != null">rtn_mrgnamt,</if>
+            <if test="rtnTdramt != null">rtn_tdramt,</if>
+            <if test="rtnAgncsvcfee != null">rtn_agncsvcfee,</if>
+            <if test="rtnFrzamt != null">rtn_frzamt,</if>
+            <if test="rtnFineamt != null">rtn_fineamt,</if>
+            <if test="rtnTdrdt != null">rtn_tdrdt,</if>
+            <if test="rtnTdrtm != null">rtn_tdrtm,</if>
+            <if test="rtnDuetp != null">rtn_duetp,</if>
+            <if test="rtnMbrshpno != null">rtn_mbrshpno,</if>
+            <if test="rtnSvcfee != null">rtn_svcfee,</if>
+            <if test="rtnRemark != null">rtn_remark,</if>
+            <if test="reason != null">reason,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="depositdescid != null">#{depositdescid},</if>
+            <if test="ppid != null">#{ppid},</if>
+            <if test="trnuid != null and trnuid != ''">#{trnuid},</if>
+            <if test="rqbody != null">#{rqbody},</if>
+            <if test="sgtid != null">#{sgtid},</if>
+            <if test="sgtno != null">#{sgtno},</if>
+            <if test="prjno != null">#{prjno},</if>
+            <if test="pltfmcstno != null">#{pltfmcstno},</if>
+            <if test="entpnm != null">#{entpnm},</if>
+            <if test="pgno != null">#{pgno},</if>
+            <if test="version != null">#{version},</if>
+            <if test="rtnTrnuid != null">#{rtnTrnuid},</if>
+            <if test="rtnStatus != null">#{rtnStatus},</if>
+            <if test="rtnCode != null">#{rtnCode},</if>
+            <if test="rtnSeverity != null">#{rtnSeverity},</if>
+            <if test="rtnMessage != null">#{rtnMessage},</if>
+            <if test="rtnRsbody != null">#{rtnRsbody},</if>
+            <if test="rtnRcrdtotnum != null">#{rtnRcrdtotnum},</if>
+            <if test="rtnCrnpgno != null">#{rtnCrnpgno},</if>
+            <if test="rtnPgrcrdnum != null">#{rtnPgrcrdnum},</if>
+            <if test="rtnTotpgnum != null">#{rtnTotpgnum},</if>
+            <if test="rtnContent != null">#{rtnContent},</if>
+            <if test="rtnLescstno != null">#{rtnLescstno},</if>
+            <if test="rtnTdrno != null">#{rtnTdrno},</if>
+            <if test="rtnCstno != null">#{rtnCstno},</if>
+            <if test="rtnPrjno != null">#{rtnPrjno},</if>
+            <if test="rtnPrjnm != null">#{rtnPrjnm},</if>
+            <if test="rtnSgtno != null">#{rtnSgtno},</if>
+            <if test="rtnSgtnm != null">#{rtnSgtnm},</if>
+            <if test="rtnSgtst != null">#{rtnSgtst},</if>
+            <if test="rtnMrgnst != null">#{rtnMrgnst},</if>
+            <if test="rtnTdracctno != null">#{rtnTdracctno},</if>
+            <if test="rtnTdracctnoccycd != null">#{rtnTdracctnoccycd},</if>
+            <if test="rtnTdracctnm != null">#{rtnTdracctnm},</if>
+            <if test="rtnTdracctnobnkno != null">#{rtnTdracctnobnkno},</if>
+            <if test="rtnTdracctnobnknm != null">#{rtnTdracctnobnknm},</if>
+            <if test="rtnTdrnum != null">#{rtnTdrnum},</if>
+            <if test="rtnMrgnamt != null">#{rtnMrgnamt},</if>
+            <if test="rtnTdramt != null">#{rtnTdramt},</if>
+            <if test="rtnAgncsvcfee != null">#{rtnAgncsvcfee},</if>
+            <if test="rtnFrzamt != null">#{rtnFrzamt},</if>
+            <if test="rtnFineamt != null">#{rtnFineamt},</if>
+            <if test="rtnTdrdt != null">#{rtnTdrdt},</if>
+            <if test="rtnTdrtm != null">#{rtnTdrtm},</if>
+            <if test="rtnDuetp != null">#{rtnDuetp},</if>
+            <if test="rtnMbrshpno != null">#{rtnMbrshpno},</if>
+            <if test="rtnSvcfee != null">#{rtnSvcfee},</if>
+            <if test="rtnRemark != null">#{rtnRemark},</if>
+            <if test="reason != null">#{reason},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBankDepositdescr" parameterType="BankDepositdescr">
+        update bank_depositdescr
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="ppid != null">ppid = #{ppid},</if>
+            <if test="trnuid != null and trnuid != ''">trnuid = #{trnuid},</if>
+            <if test="rqbody != null">rqbody = #{rqbody},</if>
+            <if test="sgtid != null">sgtid = #{sgtid},</if>
+            <if test="sgtno != null">sgtno = #{sgtno},</if>
+            <if test="prjno != null">prjno = #{prjno},</if>
+            <if test="pltfmcstno != null">pltfmcstno = #{pltfmcstno},</if>
+            <if test="entpnm != null">entpnm = #{entpnm},</if>
+            <if test="pgno != null">pgno = #{pgno},</if>
+            <if test="version != null">version = #{version},</if>
+            <if test="rtnTrnuid != null">rtn_trnuid = #{rtnTrnuid},</if>
+            <if test="rtnStatus != null">rtn_status = #{rtnStatus},</if>
+            <if test="rtnCode != null">rtn_code = #{rtnCode},</if>
+            <if test="rtnSeverity != null">rtn_severity = #{rtnSeverity},</if>
+            <if test="rtnMessage != null">rtn_message = #{rtnMessage},</if>
+            <if test="rtnRsbody != null">rtn_rsbody = #{rtnRsbody},</if>
+            <if test="rtnRcrdtotnum != null">rtn_rcrdtotnum = #{rtnRcrdtotnum},</if>
+            <if test="rtnCrnpgno != null">rtn_crnpgno = #{rtnCrnpgno},</if>
+            <if test="rtnPgrcrdnum != null">rtn_pgrcrdnum = #{rtnPgrcrdnum},</if>
+            <if test="rtnTotpgnum != null">rtn_totpgnum = #{rtnTotpgnum},</if>
+            <if test="rtnContent != null">rtn_content = #{rtnContent},</if>
+            <if test="rtnLescstno != null">rtn_lescstno = #{rtnLescstno},</if>
+            <if test="rtnTdrno != null">rtn_tdrno = #{rtnTdrno},</if>
+            <if test="rtnCstno != null">rtn_cstno = #{rtnCstno},</if>
+            <if test="rtnPrjno != null">rtn_prjno = #{rtnPrjno},</if>
+            <if test="rtnPrjnm != null">rtn_prjnm = #{rtnPrjnm},</if>
+            <if test="rtnSgtno != null">rtn_sgtno = #{rtnSgtno},</if>
+            <if test="rtnSgtnm != null">rtn_sgtnm = #{rtnSgtnm},</if>
+            <if test="rtnSgtst != null">rtn_sgtst = #{rtnSgtst},</if>
+            <if test="rtnMrgnst != null">rtn_mrgnst = #{rtnMrgnst},</if>
+            <if test="rtnTdracctno != null">rtn_tdracctno = #{rtnTdracctno},</if>
+            <if test="rtnTdracctnoccycd != null">rtn_tdracctnoccycd = #{rtnTdracctnoccycd},</if>
+            <if test="rtnTdracctnm != null">rtn_tdracctnm = #{rtnTdracctnm},</if>
+            <if test="rtnTdracctnobnkno != null">rtn_tdracctnobnkno = #{rtnTdracctnobnkno},</if>
+            <if test="rtnTdracctnobnknm != null">rtn_tdracctnobnknm = #{rtnTdracctnobnknm},</if>
+            <if test="rtnTdrnum != null">rtn_tdrnum = #{rtnTdrnum},</if>
+            <if test="rtnMrgnamt != null">rtn_mrgnamt = #{rtnMrgnamt},</if>
+            <if test="rtnTdramt != null">rtn_tdramt = #{rtnTdramt},</if>
+            <if test="rtnAgncsvcfee != null">rtn_agncsvcfee = #{rtnAgncsvcfee},</if>
+            <if test="rtnFrzamt != null">rtn_frzamt = #{rtnFrzamt},</if>
+            <if test="rtnFineamt != null">rtn_fineamt = #{rtnFineamt},</if>
+            <if test="rtnTdrdt != null">rtn_tdrdt = #{rtnTdrdt},</if>
+            <if test="rtnTdrtm != null">rtn_tdrtm = #{rtnTdrtm},</if>
+            <if test="rtnDuetp != null">rtn_duetp = #{rtnDuetp},</if>
+            <if test="rtnMbrshpno != null">rtn_mbrshpno = #{rtnMbrshpno},</if>
+            <if test="rtnSvcfee != null">rtn_svcfee = #{rtnSvcfee},</if>
+            <if test="rtnRemark != null">rtn_remark = #{rtnRemark},</if>
+            <if test="reason != null">reason = #{reason},</if>
+        </trim>
+        where depositdescid = #{depositdescid}
+    </update>
+
+    <delete id="deleteBankDepositdescrByDepositdescid" parameterType="String">
+        delete from bank_depositdescr where depositdescid = #{depositdescid}
+    </delete>
+
+    <delete id="deleteBankDepositdescrByDepositdescids" parameterType="String">
+        delete from bank_depositdescr where depositdescid in 
+        <foreach item="depositdescid" collection="array" open="(" separator="," close=")">
+            #{depositdescid}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-modules/hh-procure/src/main/java/com/hh/procure/domain/PpmProcurementPlan.java

@@ -1,5 +1,6 @@
 package com.hh.procure.domain;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -93,7 +94,7 @@ public class PpmProcurementPlan extends BaseEntity
 
     /** 保证金 */
     @Excel(name = "保证金")
-    private Long earnestMoney;
+    private BigDecimal earnestMoney;
 
     /** 招标开始时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -333,15 +334,15 @@ public class PpmProcurementPlan extends BaseEntity
     {
         return allowTenderAmount;
     }
-    public void setEarnestMoney(Long earnestMoney)
-    {
-        this.earnestMoney = earnestMoney;
-    }
 
-    public Long getEarnestMoney()
-    {
+    public BigDecimal getEarnestMoney() {
         return earnestMoney;
     }
+
+    public void setEarnestMoney(BigDecimal earnestMoney) {
+        this.earnestMoney = earnestMoney;
+    }
+
     public void setEnrollStarttime(Date enrollStarttime)
     {
         this.enrollStarttime = enrollStarttime;

ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/RyTask.java

@@ -58,4 +58,20 @@ public class RyTask
     public void sendSmsExpert(){
         remoteBidTenderService.sendSmsExpert(SecurityConstants.INNER);
     }
+
+    public void getDeposit(){
+        remoteBidTenderService.getDeposit(SecurityConstants.INNER);
+    }
+
+    public void changeEarnestStatus(){
+        remoteBidTenderService.changeEarnestStatus(SecurityConstants.INNER);
+    }
+
+    public void refund(){
+        remoteBidTenderService.refund(SecurityConstants.INNER);
+    }
+
+    public void refundWinner(){
+        remoteBidTenderService.refundWinner(SecurityConstants.INNER);
+    }
 }

ruoyi-ui/src/views/bank/deposit/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="采购计划" prop="ppid">
+      <el-form-item label="采购公告" prop="ppid">
         <el-input
           v-model="queryParams.ppid"
           placeholder="请输入采购计划id"
@@ -9,7 +9,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="流水号" prop="trnuid">
+      <el-form-item label="流水号" prop="trnuid" v-if="false">
         <el-input
           v-model="queryParams.trnuid"
           placeholder="请输入客户端交易的唯一流水号建议值为YYYYMMDD+序号"
@@ -17,7 +17,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="标段ID" prop="sgtid">
+      <el-form-item label="标段ID" prop="sgtid" v-if="false">
         <el-input
           v-model="queryParams.sgtid"
           placeholder="请输入标段ID"
@@ -25,7 +25,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="标段编号" prop="sgtno">
+      <el-form-item label="标段编号" prop="sgtno" v-if="false">
         <el-input
           v-model="queryParams.sgtno"
           placeholder="请输入标段编号"
@@ -33,7 +33,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="项目编号" prop="prjno">
+      <el-form-item label="项目编号" prop="prjno" v-if="false">
         <el-input
           v-model="queryParams.prjno"
           placeholder="请输入项目编号"
@@ -41,7 +41,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="核心客户号" prop="pltfmcstno">
+      <el-form-item label="核心客户号" prop="pltfmcstno" v-if="false">
         <el-input
           v-model="queryParams.pltfmcstno"
           placeholder="请输入核心客户号"
@@ -49,7 +49,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="企业名称" prop="entpnm">
+      <el-form-item label="企业名称" prop="entpnm" v-if="false">
         <el-input
           v-model="queryParams.entpnm"
           placeholder="请输入企业名称"
@@ -70,7 +70,7 @@
           plain
           icon="el-icon-plus"
           size="mini"
-          @click="handleAdd"
+          @click="handleAdd" v-if="false"
           v-hasPermi="['bank:deposit:add']"
         >新增</el-button>
       </el-col>
@@ -81,7 +81,7 @@
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
-          @click="handleUpdate"
+          @click="handleUpdate" v-if="false"
           v-hasPermi="['bank:deposit:edit']"
         >修改</el-button>
       </el-col>
@@ -92,7 +92,7 @@
           icon="el-icon-delete"
           size="mini"
           :disabled="multiple"
-          @click="handleDelete"
+          @click="handleDelete" v-if="false"
           v-hasPermi="['bank:deposit:remove']"
         >删除</el-button>
       </el-col>
@@ -111,21 +111,27 @@
 
     <el-table v-loading="loading" :data="depositList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="保证金入账数量id" align="center" prop="depositid" />
-      <el-table-column label="采购计划id" align="center" prop="ppid" />
-      <el-table-column label="客户端交易的唯一流水号建议值为YYYYMMDD+序号" align="center" prop="trnuid" />
-      <el-table-column label="报文节点" align="center" prop="rqbody" />
-      <el-table-column label="标段ID" align="center" prop="sgtid" />
-      <el-table-column label="标段编号" align="center" prop="sgtno" />
+      <el-table-column label="保证金入账数量id" align="center" prop="depositid" v-if="false"/>
+      <el-table-column label="采购公告" align="center" prop="ppid" />
+      <el-table-column label="银行流水" align="center" prop="trnuid" />
+      <el-table-column label="报文节点" align="center" prop="rqbody" v-if="false"/>
+      <el-table-column label="标段ID" align="center" prop="sgtid" v-if="false"/>
+      <el-table-column label="标段编号" align="center" prop="sgtno" v-if="false"/>
       <el-table-column label="项目编号" align="center" prop="prjno" />
-      <el-table-column label="核心客户号" align="center" prop="pltfmcstno" />
-      <el-table-column label="企业名称" align="center" prop="entpnm" />
-      <el-table-column label="客户端交易的唯一标志" align="center" prop="rtnTrnuid" />
-      <el-table-column label="交易处理状态" align="center" prop="rtnStatus" />
-      <el-table-column label="处理结果码" align="center" prop="rtnCode" />
-      <el-table-column label="处理结果等级(INFO/WARN/ERROR)" align="center" prop="rtnSeverity" />
+      <el-table-column label="核心客户号" align="center" prop="pltfmcstno" v-if="false"/>
+      <el-table-column label="企业名称" align="center" prop="entpnm" v-if="false"/>
+      <el-table-column label="客户端交易的唯一标志" align="center" prop="rtnTrnuid" v-if="false"/>
+      <el-table-column label="交易处理状态" align="center" prop="rtnStatus"  v-if="false"/>
+      <el-table-column label="处理结果码" align="center" prop="rtnCode"  v-if="false"/>
+		<el-table-column label="处理结果等级" align="center" prop="rtnSeverity" >
+			<template slot-scope="scope">
+				<el-tag type="info" v-if="scope.row.rtnSeverity.toLowerCase() === 'info'">info</el-tag>
+				<el-tag type="warning" v-if="scope.row.rtnSeverity.toLowerCase() === 'warn'">warn</el-tag>
+				<el-tag type="danger" v-if="scope.row.rtnSeverity.toLowerCase() === 'error'">error</el-tag>
+			</template>
+		</el-table-column>
       <el-table-column label="处理信息描述" align="center" prop="rtnMessage" />
-      <el-table-column label="报文节点" align="center" prop="rtnRsbody" />
+      <el-table-column label="报文节点" align="center" prop="rtnRsbody"  v-if="false"/>
       <el-table-column label="投标数量" align="center" prop="rtnTdrnum" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -133,7 +139,7 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
+            @click="handleUpdate(scope.row)"  v-if="false"
             v-hasPermi="['bank:deposit:edit']"
           >修改</el-button>
           <el-button
@@ -158,48 +164,6 @@
     <!-- 添加或修改查询保证金入账数量对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="采购计划id" prop="ppid">
-          <el-input v-model="form.ppid" placeholder="请输入采购计划id" />
-        </el-form-item>
-        <el-form-item label="客户端交易的唯一流水号建议值为YYYYMMDD+序号" prop="trnuid">
-          <el-input v-model="form.trnuid" placeholder="请输入客户端交易的唯一流水号建议值为YYYYMMDD+序号" />
-        </el-form-item>
-        <el-form-item label="报文节点" prop="rqbody">
-          <el-input v-model="form.rqbody" placeholder="请输入报文节点" />
-        </el-form-item>
-        <el-form-item label="标段ID" prop="sgtid">
-          <el-input v-model="form.sgtid" placeholder="请输入标段ID" />
-        </el-form-item>
-        <el-form-item label="标段编号" prop="sgtno">
-          <el-input v-model="form.sgtno" placeholder="请输入标段编号" />
-        </el-form-item>
-        <el-form-item label="项目编号" prop="prjno">
-          <el-input v-model="form.prjno" placeholder="请输入项目编号" />
-        </el-form-item>
-        <el-form-item label="核心客户号" prop="pltfmcstno">
-          <el-input v-model="form.pltfmcstno" placeholder="请输入核心客户号" />
-        </el-form-item>
-        <el-form-item label="企业名称" prop="entpnm">
-          <el-input v-model="form.entpnm" placeholder="请输入企业名称" />
-        </el-form-item>
-        <el-form-item label="客户端交易的唯一标志" prop="rtnTrnuid">
-          <el-input v-model="form.rtnTrnuid" placeholder="请输入客户端交易的唯一标志" />
-        </el-form-item>
-        <el-form-item label="处理结果码" prop="rtnCode">
-          <el-input v-model="form.rtnCode" placeholder="请输入处理结果码" />
-        </el-form-item>
-        <el-form-item label="处理结果等级(INFO/WARN/ERROR)" prop="rtnSeverity">
-          <el-input v-model="form.rtnSeverity" placeholder="请输入处理结果等级(INFO/WARN/ERROR)" />
-        </el-form-item>
-        <el-form-item label="处理信息描述" prop="rtnMessage">
-          <el-input v-model="form.rtnMessage" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="报文节点" prop="rtnRsbody">
-          <el-input v-model="form.rtnRsbody" placeholder="请输入报文节点" />
-        </el-form-item>
-        <el-form-item label="投标数量" prop="rtnTdrnum">
-          <el-input v-model="form.rtnTdrnum" placeholder="请输入投标数量" />
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>

ruoyi-ui/src/views/bank/depositdesc/index.vue

@@ -10,7 +10,7 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="流水号" prop="trnuid">
+			<el-form-item label="银行流水" prop="trnuid">
 				<el-input
 					v-model="queryParams.trnuid"
 					placeholder="请输入客户端交易的唯一流水号建议值为yyyymmdd+序号"
@@ -18,22 +18,6 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="标段ID" prop="sgtid">
-				<el-input
-					v-model="queryParams.sgtid"
-					placeholder="请输入标段id"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="投标编号" prop="rtnTdrno">
-				<el-input
-					v-model="queryParams.rtnTdrno"
-					placeholder="请输入投标编号"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
 			<el-form-item label="投标账户名称" prop="rtnTdracctnm" label-width="100">
 				<el-input
 					v-model="queryParams.rtnTdracctnm"
@@ -61,59 +45,23 @@
 				>批量退还保证金
 				</el-button>
 			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="danger"
-					plain
-					icon="el-icon-plus"
-					size="mini"
-					@click="handleAdd"
-					v-hasPermi="['bank:depositdesc:add']"
-				>非原路退还保证金
-				</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="success"
-					plain
-					icon="el-icon-edit"
-					size="mini"
-					:disabled="single"
-					@click="handleUpdate"
-					v-hasPermi="['bank:depositdesc:edit']"
-					v-if="false"
-				>修改
-				</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="warning"
-					plain
-					icon="el-icon-download"
-					size="mini"
-					@click="handleExport"
-					v-hasPermi="['bank:depositdesc:export']"
-					v-if="false"
-				>
-				</el-button>
-			</el-col>
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
 
 		<el-table v-loading="loading" :data="depositdescList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center"/>
 			<el-table-column label="查询保证金入账明细id" align="center" prop="depositdescid" v-if="false"/>
-			<el-table-column label="采购公告" align="center" prop="ppid"/>
+			<el-table-column label="采购公告" align="center" prop="ppid" width="200"/>
 			<el-table-column label="银行流水" align="center" prop="trnuid" v-if="false"/>
 			<el-table-column label="报文节点" align="center" prop="rqbody" v-if="false"/>
-			<el-table-column label="标段ID" align="center" prop="sgtid" width="150"/>
+			<el-table-column label="标段ID" align="center" prop="sgtid" v-if="false"/>
 			<el-table-column label="标段编号" align="center" prop="sgtno" v-if="false"/>
 			<el-table-column label="项目编号" align="center" prop="prjno" v-if="false"/>
 			<el-table-column label="核心客户号" align="center" prop="pltfmcstno" v-if="false"/>
 			<el-table-column label="企业名称" align="center" prop="entpnm" v-if="false"/>
 			<el-table-column label="页码不输默认查询第一页" align="center" prop="pgno" v-if="false"/>
 			<el-table-column label="版本号" align="center" prop="version" v-if="false"/>
-			<el-table-column label="银行流水" align="center" prop="rtnTrnuid" width="150"/>
+			<el-table-column label="银行流水" align="center" prop="rtnTrnuid" width="120"/>
 			<el-table-column label="交易处理状态" align="center" prop="rtnStatus" v-if="false"/>
 			<el-table-column label="处理结果码" align="center" prop="rtnCode" v-if="false"/>
 			<el-table-column label="结果等级" align="center" prop="rtnSeverity">
@@ -131,17 +79,17 @@
 			<el-table-column label="总页数" align="center" prop="rtnTotpgnum" v-if="false"/>
 			<el-table-column label="明细报文标识" align="center" prop="rtnContent" v-if="false"/>
 			<el-table-column label="租户号" align="center" prop="rtnLescstno" v-if="false"/>
-			<el-table-column label="投标编号" align="center" prop="rtnTdrno"/>
-			<el-table-column label="客户编号" align="center" prop="rtnCstno"/>
-			<el-table-column label="项目编号" align="center" prop="rtnPrjno"/>
-			<el-table-column label="项目名称" align="center" prop="rtnPrjnm"/>
-			<el-table-column label="标段编号" align="center" prop="rtnSgtno"/>
-			<el-table-column label="标段名称" align="center" prop="rtnSgtnm"/>
+			<el-table-column label="投标编号" align="center" prop="rtnTdrno" v-if="false"/>
+			<el-table-column label="客户编号" align="center" prop="rtnCstno" v-if="false"/>
+			<el-table-column label="项目编号" align="center" prop="rtnPrjno" v-if="false"/>
+			<el-table-column label="项目名称" align="center" prop="rtnPrjnm" width="200"/>
+			<el-table-column label="标段编号" align="center" prop="rtnSgtno" v-if="false"/>
+			<el-table-column label="标段名称" align="center" prop="rtnSgtnm" width="200"/>
 			<el-table-column label="投标状态0-未中标1-已中标" align="center" prop="rtnSgtst" v-if="false"/>
 			<el-table-column label="保证金状态 1-竞标" align="center" prop="rtnMrgnst" v-if="false"/>
 			<el-table-column label="投标账号" align="center" prop="rtnTdracctno"/>
 			<el-table-column label="投标账号币种01-人民币" align="center" prop="rtnTdracctnoccycd" v-if="false"/>
-			<el-table-column label="投标账户名称" align="center" prop="rtnTdracctnm"/>
+			<el-table-column label="投标账户名称" align="center" prop="rtnTdracctnm" width="200"/>
 			<el-table-column label="投标账号行号" align="center" prop="rtnTdracctnobnkno"/>
 			<el-table-column label="投标账号行名" align="center" prop="rtnTdracctnobnknm"/>
 			<el-table-column label="投标数量" align="center" prop="rtnTdrnum"/>
@@ -150,7 +98,7 @@
 			<el-table-column label="代理服务费" align="center" prop="rtnAgncsvcfee" v-if="false"/>
 			<el-table-column label="冻结金额" align="center" prop="rtnFrzamt" v-if="false"/>
 			<el-table-column label="罚没金额" align="center" prop="rtnFineamt" v-if="false"/>
-			<el-table-column label="投标日期" align="center" prop="rtnTdrdt">
+			<el-table-column label="投标日期" align="center" prop="rtnTdrdt" width="100">
 				<template slot-scope="scope">
 					{{ formatDate(scope.row.rtnTdrdt, scope.row.rtnTdrtm) }}
 				</template>

ruoyi-ui/src/views/bank/refund/index.vue

@@ -1,741 +1,620 @@
 <template>
-	<div class="app-container">
-		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-				 label-width="68px">
-			<el-form-item label="采购计划" prop="ppid">
-				<el-input
-					v-model="queryParams.ppid"
-					placeholder="请输入采购计划id"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="流水号" prop="trnuid">
-				<el-input
-					v-model="queryParams.trnuid"
-					placeholder="请输入客户端交易的唯一流水号建议值为yyyymmdd+序号"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="企业名称" prop="entpnm">
-				<el-input
-					v-model="queryParams.entpnm"
-					placeholder="请输入企业名称"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="处理结果等级" prop="rtnSeverity" label-width="70">
-				<el-input
-					v-model="queryParams.rtnSeverity"
-					placeholder="请输入处理结果等级(info/warn/error)"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="租户号" prop="rtnLsecstno">
-				<el-input
-					v-model="queryParams.rtnLsecstno"
-					placeholder="请输入租户号"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="客户号" prop="rtnCstno">
-				<el-input
-					v-model="queryParams.rtnCstno"
-					placeholder="请输入客户号"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="标段id" prop="rtnSgtid">
-				<el-input
-					v-model="queryParams.rtnSgtid"
-					placeholder="请输入标段id"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="标段编号" prop="rtnSgtno">
-				<el-input
-					v-model="queryParams.rtnSgtno"
-					placeholder="请输入标段编号"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="标段名称" prop="rtnSgtnm">
-				<el-input
-					v-model="queryParams.rtnSgtnm"
-					placeholder="请输入标段名称"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="投标编号" prop="rtnTdrno">
-				<el-input
-					v-model="queryParams.rtnTdrno"
-					placeholder="请输入投标编号"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="项目编号" prop="rtnPrjno">
-				<el-input
-					v-model="queryParams.rtnPrjno"
-					placeholder="请输入项目编号"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="项目名称" prop="rtnPrjnm">
-				<el-input
-					v-model="queryParams.rtnPrjnm"
-					placeholder="请输入项目名称"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="退款状态" prop="rtnRfndst">
-				<el-input
-					v-model="queryParams.rtnRfndst"
-					placeholder="请输入退款状态5-退款成功7-退款失败3-退款处理中"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="退回类型" prop="rtnBcktp">
-				<el-input
-					v-model="queryParams.rtnBcktp"
-					placeholder="请输入退回类型0-一般保证金1-长期保证金2-现金3-保函"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="退款方式" prop="rtnTfroutmd">
-				<el-input
-					v-model="queryParams.rtnTfroutmd"
-					placeholder="请输入退款方式0-本金退还 1-本息退还"
-					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>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="采购公告" prop="ppid">
+        <el-input v-model="queryParams.ppid" placeholder="请输入采购公告" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="银行流水" prop="trnuid">
+        <el-input v-model="queryParams.trnuid" placeholder="采购公告" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="企业名称" prop="entpnm" v-if="false">
+        <el-input v-model="queryParams.entpnm" placeholder="请输入企业名称" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="处理结果等级" prop="rtnSeverity" v-if="false">
+        <el-input v-model="queryParams.rtnSeverity" placeholder="请输入处理结果等级(info/warn/error)" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="租户号" prop="rtnLsecstno" v-if="false">
+        <el-input v-model="queryParams.rtnLsecstno" placeholder="请输入租户号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="客户号" prop="rtnCstno" v-if="false">
+        <el-input v-model="queryParams.rtnCstno" placeholder="请输入客户号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="标段id" prop="rtnSgtid" v-if="false">
+        <el-input v-model="queryParams.rtnSgtid" placeholder="请输入标段id" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="标段编号" prop="rtnSgtno" v-if="false">
+        <el-input v-model="queryParams.rtnSgtno" placeholder="请输入标段编号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="标段名称" prop="rtnSgtnm">
+        <el-input v-model="queryParams.rtnSgtnm" placeholder="请输入标段名称" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="投标编号" prop="rtnTdrno" v-if="false">
+        <el-input v-model="queryParams.rtnTdrno" placeholder="请输入投标编号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="项目编号" prop="rtnPrjno" v-if="false">
+        <el-input v-model="queryParams.rtnPrjno" placeholder="请输入项目编号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="项目名称" prop="rtnPrjnm">
+        <el-input v-model="queryParams.rtnPrjnm" placeholder="请输入项目名称" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="退款状态" prop="rtnRfndst">
+        <el-select v-model="queryParams.rtnRfndst" placeholder="请选择">
+          <el-option label="退款成功" :value="5"></el-option>
+          <el-option label="退款失败" :value="7"></el-option>
+          <el-option label="退款处理中" :value="3"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="退回类型" prop="rtnBcktp">
+        <el-select v-model="queryParams.rtnBcktp" placeholder="请选择">
+          <el-option label="一般保证金" :value="0"></el-option>
+          <el-option label="长期保证金" :value="1"></el-option>
+          <el-option label="现金" :value="2"></el-option>
+          <el-option label="保函" :value="3"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="退款方式" prop="rtnTfroutmd" v-if="false">
+        <el-input v-model="queryParams.rtnTfroutmd" placeholder="请输入退款方式0-本金退还 1-本息退还" 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-row :gutter="10" class="mb8">
-			<el-col :span="1.5">
-				<el-button
-					type="primary"
-					plain
-					icon="el-icon-plus"
-					size="mini"
-					@click="handleAdd"
-					v-hasPermi="['bank:refund:add']"
-				>新增
-				</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="success"
-					plain
-					icon="el-icon-edit"
-					size="mini"
-					:disabled="single"
-					@click="handleUpdate"
-					v-hasPermi="['bank:refund:edit']"
-				>修改
-				</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="danger"
-					plain
-					icon="el-icon-delete"
-					size="mini"
-					:disabled="multiple"
-					@click="handleDelete"
-					v-hasPermi="['bank:refund:remove']"
-				>删除
-				</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="warning"
-					plain
-					icon="el-icon-download"
-					size="mini"
-					@click="handleExport"
-					v-hasPermi="['bank:refund:export']"
-				>导出
-				</el-button>
-			</el-col>
-			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-		</el-row>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['bank:refund:export']">导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
 
-		<el-table v-loading="loading" :data="refundList" @selection-change="handleSelectionChange">
-			<el-table-column type="selection" width="55" align="center"/>
-			<el-table-column label="查询保证金退款信息id" align="center" prop="refundid" v-if="false"/>
-			<el-table-column label="采购公告" align="center" prop="ppid"/>
-			<el-table-column label="银行流水" align="center" prop="trnuid" v-if="false"/>
-			<el-table-column label="报文节点" align="center" prop="rqbody" v-if="false"/>
-			<el-table-column label="标段id" align="center" prop="sgtid"/>
-			<el-table-column label="标段编号" align="center" prop="sgtno"/>
-			<el-table-column label="项目编号" align="center" prop="prjno"/>
-			<el-table-column label="企业名称" align="center" prop="entpnm"/>
-			<el-table-column label="开始日期" align="center" prop="begdt" v-if="false"/>
-			<el-table-column label="结束日期yyyymmdd" align="center" prop="enddt" v-if="false"/>
-			<el-table-column label="页码不输默认查询第一页" align="center" prop="pgno" v-if="false"/>
-			<el-table-column label="银行流水" align="center" prop="rtnTrnuid"/>
-			<el-table-column label="交易处理状态" align="center" prop="rtnStatus" v-if="false"/>
-			<el-table-column label="处理结果码" align="center" prop="rtnCode" v-if="false"/>
-			<el-table-column label="处理结果等级" align="center" prop="rtnSeverity">
-				<template slot-scope="scope">
-					<el-tag type="info" v-if="scope.row.rtnSeverity.toLowerCase() === 'info'">info</el-tag>
-					<el-tag type="warning" v-if="scope.row.rtnSeverity.toLowerCase() === 'warn'">warn</el-tag>
-					<el-tag type="danger" v-if="scope.row.rtnSeverity.toLowerCase() === 'error'">error</el-tag>
-				</template>
-			</el-table-column>
-			<el-table-column label="处理信息描述" align="center" prop="rtnMessage"/>
-			<el-table-column label="报文节点" align="center" prop="rtnRsbody" v-if="false"/>
-			<el-table-column label="记录总数" align="center" prop="rtnRcrdtotnum"/>
-			<el-table-column label="当前页码" align="center" prop="rtnCrnpgno"/>
-			<el-table-column label="每页记录数" align="center" prop="rtnPgrcrdnum"/>
-			<el-table-column label="总页数" align="center" prop="rtnTotpgnum"/>
-			<el-table-column label="明细报文标识" align="center" prop="rtnContent"/>
-			<el-table-column label="租户号" align="center" prop="rtnLsecstno"/>
-			<el-table-column label="客户号" align="center" prop="rtnCstno"/>
-			<el-table-column label="标段ID" align="center" prop="rtnSgtid"/>
-			<el-table-column label="标段编号" align="center" prop="rtnSgtno"/>
-			<el-table-column label="标段名称" align="center" prop="rtnSgtnm"/>
-			<el-table-column label="投标编号" align="center" prop="rtnTdrno"/>
-			<el-table-column label="项目编号" align="center" prop="rtnPrjno"/>
-			<el-table-column label="项目名称" align="center" prop="rtnPrjnm"/>
-			<el-table-column label="退款状态" align="center" prop="rtnRfndst">
-				<template slot-scope="scope">
-					<el-tag type="info" v-if="scope.row.rtnRfndst === '5'">退款成功</el-tag>
-					<el-tag type="warning" v-if="scope.row.rtnRfndst === '7'">退款失败</el-tag>
-					<el-tag type="danger" v-if="scope.row.rtnRfndst === '3'">退款处理中</el-tag>
-				</template>
-			</el-table-column>
-			<el-table-column label="投标账号" align="center" prop="rtnTdracctno"/>
-			<el-table-column label="投标账号币种01-人民币" align="center" prop="rtnTdracctnoccycd" v-if="false"/>
-			<el-table-column label="投标账户名称" align="center" prop="rtnTdracctnm"/>
-			<el-table-column label="投标账号行号" align="center" prop="rtnTdracctnobnkno"/>
-			<el-table-column label="投标账号行名" align="center" prop="rtnTdracctnobnknm"/>
-			<el-table-column label="投标数量" align="center" prop="rtnTdrnum"/>
-			<el-table-column label="保证金金额" align="center" prop="rtnMrgnamt"/>
-			<el-table-column label="服务费 double" align="center" prop="rtnSvcfee" v-if="false"/>
-			<el-table-column label="冻结金额 double" align="center" prop="rtnFrzamt" v-if="false"/>
-			<el-table-column label="罚没金额 double" align="center" prop="rtnFineamt" v-if="false"/>
-			<el-table-column label="退款日期" align="center" prop="rtnRfnddt">
-				<template slot-scope="scope">
-					{{ scope.row.rtnRfnddt + "-" + scope.row.rtnRfndtm }}
-				</template>
-			</el-table-column>
-			<el-table-column label="退款时间hhmmss" align="center" prop="rtnRfndtm" v-if="false"/>
-			<el-table-column label="交易流水号(标)" align="center" prop="rtnTxnseqnos"/>
-			<el-table-column label="退回类型" align="center" prop="rtnBcktp">
-				<template slot-scope="scope">
-					<el-tag type="info" v-if="scope.row.rtnBcktp === '0'">一般保证金</el-tag>
-					<el-tag type="warning" v-if="scope.row.rtnBcktp === '1'">长期保证金</el-tag>
-					<el-tag type="danger" v-if="scope.row.rtnBcktp === '2'">现金</el-tag>
-					<el-tag type="danger" v-if="scope.row.rtnBcktp === '3'">保函</el-tag>
-				</template>
-			</el-table-column>
-			<el-table-column label="退款方式" align="center" prop="rtnTfroutmd">
-				<template slot-scope="scope">
-					<el-tag type="info" v-if="scope.row.rtnTfroutmd === '0'">本金退还</el-tag>
-					<el-tag type="warning" v-if="scope.row.rtnTfroutmd === '1'">本息退还</el-tag>
-				</template>
-			</el-table-column>
-			<el-table-column label="退款时收款账号" align="center" prop="rtnTfroutacctno"/>
-			<el-table-column label="退款时收款币种01-人民币" align="center" prop="rtnTfroutccycd" v-if="false"/>
-			<el-table-column label="退款时收款账户名称" align="center" prop="rtnTfroutacctnm"/>
-			<el-table-column label="退款时收款行行号" align="center" prop="rtnTfroutbnkno"/>
-			<el-table-column label="退款时收款行行名" align="center" prop="rtnTfroutbnknm"/>
-			<el-table-column label="退款金额" align="center" prop="rtnRfndamt"/>
-			<el-table-column label="退款本金" align="center" prop="rtnRfndpnp"/>
-			<el-table-column label="应收手续费 double" align="center" prop="rtnRcvblpcdfee" v-if="false"/>
-			<el-table-column label="实收手续费 double" align="center" prop="rtnActrcvpcdfee" v-if="false"/>
-			<el-table-column label="应付利息 double" align="center" prop="rtnPyblint" v-if="false"/>
-			<el-table-column label="实付利息 double" align="center" prop="rtnActpymtint" v-if="false"/>
-			<el-table-column label="退款处理意见" align="center" prop="rtnRfnddealopnn"/>
-			<el-table-column label="退款处理信息" align="center" prop="rtnRfnddealinf"/>
-			<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="handleUpdate(scope.row)"
-						v-hasPermi="['bank:refund:edit']"
-					>修改
-					</el-button>
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-delete"
-						@click="handleDelete(scope.row)"
-						v-hasPermi="['bank:refund:remove']"
-					>删除
-					</el-button>
-				</template>
-			</el-table-column>
-		</el-table>
+    <el-table v-loading="loading" :data="refundList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="查询保证金退款信息id" align="center" prop="refundid" v-if="false" />
+      <el-table-column label="采购公告" align="center" prop="ppid" width="180"/>
+      <el-table-column label="银行流水" align="center" prop="trnuid" v-if="false" />
+      <el-table-column label="报文节点" align="center" prop="rqbody" v-if="false" />
+      <el-table-column label="标段id" align="center" prop="sgtid" v-if="false"/>
+      <el-table-column label="标段编号" align="center" prop="sgtno" v-if="false"/>
+      <el-table-column label="项目编号" align="center" prop="prjno" v-if="false"/>
+      <el-table-column label="企业名称" align="center" prop="entpnm" v-if="false"/>
+      <el-table-column label="开始日期" align="center" prop="begdt" v-if="false" />
+      <el-table-column label="结束日期yyyymmdd" align="center" prop="enddt" v-if="false" />
+      <el-table-column label="页码不输默认查询第一页" align="center" prop="pgno" v-if="false" />
+      <el-table-column label="银行流水" align="center" prop="rtnTrnuid" v-if="false"/>
+      <el-table-column label="交易处理状态" align="center" prop="rtnStatus" v-if="false" />
+      <el-table-column label="处理结果码" align="center" prop="rtnCode" v-if="false" />
+      <el-table-column label="处理结果等级" align="center" prop="rtnSeverity" v-if="false">
+        <template slot-scope="scope">
+          <el-tag type="info" v-if="scope.row.rtnSeverity.toLowerCase() === 'info'">info</el-tag>
+          <el-tag type="warning" v-if="scope.row.rtnSeverity.toLowerCase() === 'warn'">warn</el-tag>
+          <el-tag type="danger" v-if="scope.row.rtnSeverity.toLowerCase() === 'error'">error</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="处理信息描述" align="center" prop="rtnMessage" width="100" />
+      <el-table-column label="报文节点" align="center" prop="rtnRsbody" v-if="false" />
+      <el-table-column label="记录总数" align="center" prop="rtnRcrdtotnum" v-if="false"/>
+      <el-table-column label="当前页码" align="center" prop="rtnCrnpgno" v-if="false"/>
+      <el-table-column label="每页记录数" align="center" prop="rtnPgrcrdnum" v-if="false"/>
+      <el-table-column label="总页数" align="center" prop="rtnTotpgnum" v-if="false"/>
+      <el-table-column label="明细报文标识" align="center" prop="rtnContent" v-if="false"/>
+      <el-table-column label="租户号" align="center" prop="rtnLsecstno" v-if="false"/>
+      <el-table-column label="客户号" align="center" prop="rtnCstno" v-if="false"/>
+      <el-table-column label="标段ID" align="center" prop="rtnSgtid" v-if="false"/>
+      <el-table-column label="标段编号" align="center" prop="rtnSgtno" width="100"/>
+      <el-table-column label="标段名称" align="center" prop="rtnSgtnm" width="120"/>
+      <el-table-column label="投标编号" align="center" prop="rtnTdrno" width="150"/>
+      <el-table-column label="项目编号" align="center" prop="rtnPrjno" width="100"/>
+      <el-table-column label="项目名称" align="center" prop="rtnPrjnm" width="150"/>
+      <el-table-column label="退款状态" align="center" prop="rtnRfndst" width="100">
+        <template slot-scope="scope">
+          <el-tag type="info" v-if="scope.row.rtnRfndst === '5'">退款成功</el-tag>
+          <el-tag type="warning" v-if="scope.row.rtnRfndst === '7'">退款失败</el-tag>
+          <el-tag type="danger" v-if="scope.row.rtnRfndst === '3'">退款处理中</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="投标账号" align="center" prop="rtnTdracctno" width="100"/>
+      <el-table-column label="投标账号币种01-人民币" align="center" prop="rtnTdracctnoccycd" v-if="false" />
+      <el-table-column label="投标账户名称" align="center" prop="rtnTdracctnm" width="180"/>
+      <el-table-column label="投标账号行号" align="center" prop="rtnTdracctnobnkno" width="120"/>
+      <el-table-column label="投标账号行名" align="center" prop="rtnTdracctnobnknm" width="150"/>
+      <el-table-column label="投标数量" align="center" prop="rtnTdrnum" width="80"/>
+      <el-table-column label="保证金金额" align="center" prop="rtnMrgnamt" width="100"/>
+      <el-table-column label="服务费 double" align="center" prop="rtnSvcfee" v-if="false" />
+      <el-table-column label="冻结金额 double" align="center" prop="rtnFrzamt" v-if="false" />
+      <el-table-column label="罚没金额 double" align="center" prop="rtnFineamt" v-if="false" />
+      <el-table-column label="退款日期" align="center" prop="rtnRfnddt" width="100">
+        <template slot-scope="scope">
+			{{ formatDate(scope.row.rtnRfnddt, scope.row.rtnRfndtm) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="退款时间hhmmss" align="center" prop="rtnRfndtm" v-if="false" />
+      <el-table-column label="交易流水号(标)" align="center" prop="rtnTxnseqnos" width="120"/>
+      <el-table-column label="退回类型" align="center" prop="rtnBcktp">
+        <template slot-scope="scope">
+          <el-tag type="info" v-if="scope.row.rtnBcktp === '0'">一般保证金</el-tag>
+          <el-tag type="warning" v-if="scope.row.rtnBcktp === '1'">长期保证金</el-tag>
+          <el-tag type="danger" v-if="scope.row.rtnBcktp === '2'">现金</el-tag>
+          <el-tag type="danger" v-if="scope.row.rtnBcktp === '3'">保函</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="退款方式" align="center" prop="rtnTfroutmd">
+        <template slot-scope="scope">
+          <el-tag type="info" v-if="scope.row.rtnTfroutmd === '0'">本金退还</el-tag>
+          <el-tag type="warning" v-if="scope.row.rtnTfroutmd === '1'">本息退还</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="退款时收款账号" align="center" prop="rtnTfroutacctno" width="120"/>
+      <el-table-column label="退款时收款币种01-人民币" align="center" prop="rtnTfroutccycd" v-if="false" />
+      <el-table-column label="退款时收款账户名称" align="center" prop="rtnTfroutacctnm" width="160"/>
+      <el-table-column label="退款时收款行行号" align="center" prop="rtnTfroutbnkno" width="140"/>
+      <el-table-column label="退款时收款行行名" align="center" prop="rtnTfroutbnknm" width="160"/>
+      <el-table-column label="退款金额" align="center" prop="rtnRfndamt" />
+      <el-table-column label="退款本金" align="center" prop="rtnRfndpnp" />
+      <el-table-column label="应收手续费 double" align="center" prop="rtnRcvblpcdfee" v-if="false" />
+      <el-table-column label="实收手续费 double" align="center" prop="rtnActrcvpcdfee" v-if="false" />
+      <el-table-column label="应付利息 double" align="center" prop="rtnPyblint" v-if="false" />
+      <el-table-column label="实付利息 double" align="center" prop="rtnActpymtint" v-if="false" />
+      <el-table-column label="退款处理意见" align="center" prop="rtnRfnddealopnn" width="160"/>
+      <el-table-column label="退款处理信息" align="center" prop="rtnRfnddealinf" width="100"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="80">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-if="false"
+            v-hasPermi="['bank:refund:edit']">修改
+          </el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['bank:refund:remove']">删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
 
-		<pagination
-			v-show="total>0"
-			:total="total"
-			:page.sync="queryParams.pageNum"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList"
-		/>
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
-		<!-- 添加或修改查询保证金退款信息对话框 -->
-		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
-				<el-form-item label="采购计划id" prop="ppid">
-					<el-input v-model="form.ppid" placeholder="请输入采购计划id"/>
-				</el-form-item>
-				<el-form-item label="客户端交易的唯一流水号建议值为yyyymmdd+序号" prop="trnuid">
-					<el-input v-model="form.trnuid" placeholder="请输入客户端交易的唯一流水号建议值为yyyymmdd+序号"/>
-				</el-form-item>
-				<el-form-item label="报文节点" prop="rqbody">
-					<el-input v-model="form.rqbody" placeholder="请输入报文节点"/>
-				</el-form-item>
-				<el-form-item label="标段id" prop="sgtid">
-					<el-input v-model="form.sgtid" placeholder="请输入标段id"/>
-				</el-form-item>
-				<el-form-item label="标段编号" prop="sgtno">
-					<el-input v-model="form.sgtno" placeholder="请输入标段编号"/>
-				</el-form-item>
-				<el-form-item label="项目编号" prop="prjno">
-					<el-input v-model="form.prjno" placeholder="请输入项目编号"/>
-				</el-form-item>
-				<el-form-item label="企业名称" prop="entpnm">
-					<el-input v-model="form.entpnm" placeholder="请输入企业名称"/>
-				</el-form-item>
-				<el-form-item label="开始日期yyyymmdd" prop="begdt">
-					<el-input v-model="form.begdt" placeholder="请输入开始日期yyyymmdd"/>
-				</el-form-item>
-				<el-form-item label="结束日期yyyymmdd" prop="enddt">
-					<el-input v-model="form.enddt" placeholder="请输入结束日期yyyymmdd"/>
-				</el-form-item>
-				<el-form-item label="页码不输默认查询第一页" prop="pgno">
-					<el-input v-model="form.pgno" placeholder="请输入页码不输默认查询第一页"/>
-				</el-form-item>
-				<el-form-item label="客户端交易的唯一标志" prop="rtnTrnuid">
-					<el-input v-model="form.rtnTrnuid" placeholder="请输入客户端交易的唯一标志"/>
-				</el-form-item>
-				<el-form-item label="处理结果码" prop="rtnCode">
-					<el-input v-model="form.rtnCode" placeholder="请输入处理结果码"/>
-				</el-form-item>
-				<el-form-item label="处理结果等级(info/warn/error)" prop="rtnSeverity">
-					<el-input v-model="form.rtnSeverity" placeholder="请输入处理结果等级(info/warn/error)"/>
-				</el-form-item>
-				<el-form-item label="处理信息描述" prop="rtnMessage">
-					<el-input v-model="form.rtnMessage" type="textarea" placeholder="请输入内容"/>
-				</el-form-item>
-				<el-form-item label="报文节点" prop="rtnRsbody">
-					<el-input v-model="form.rtnRsbody" placeholder="请输入报文节点"/>
-				</el-form-item>
-				<el-form-item label="记录总数" prop="rtnRcrdtotnum">
-					<el-input v-model="form.rtnRcrdtotnum" placeholder="请输入记录总数"/>
-				</el-form-item>
-				<el-form-item label="当前页码" prop="rtnCrnpgno">
-					<el-input v-model="form.rtnCrnpgno" placeholder="请输入当前页码"/>
-				</el-form-item>
-				<el-form-item label="每页记录数" prop="rtnPgrcrdnum">
-					<el-input v-model="form.rtnPgrcrdnum" placeholder="请输入每页记录数"/>
-				</el-form-item>
-				<el-form-item label="总页数" prop="rtnTotpgnum">
-					<el-input v-model="form.rtnTotpgnum" placeholder="请输入总页数"/>
-				</el-form-item>
-				<el-form-item label="明细报文标识">
-					<editor v-model="form.rtnContent" :min-height="192"/>
-				</el-form-item>
-				<el-form-item label="租户号" prop="rtnLsecstno">
-					<el-input v-model="form.rtnLsecstno" placeholder="请输入租户号"/>
-				</el-form-item>
-				<el-form-item label="客户号" prop="rtnCstno">
-					<el-input v-model="form.rtnCstno" placeholder="请输入客户号"/>
-				</el-form-item>
-				<el-form-item label="标段id" prop="rtnSgtid">
-					<el-input v-model="form.rtnSgtid" placeholder="请输入标段id"/>
-				</el-form-item>
-				<el-form-item label="标段编号" prop="rtnSgtno">
-					<el-input v-model="form.rtnSgtno" placeholder="请输入标段编号"/>
-				</el-form-item>
-				<el-form-item label="标段名称" prop="rtnSgtnm">
-					<el-input v-model="form.rtnSgtnm" placeholder="请输入标段名称"/>
-				</el-form-item>
-				<el-form-item label="投标编号" prop="rtnTdrno">
-					<el-input v-model="form.rtnTdrno" placeholder="请输入投标编号"/>
-				</el-form-item>
-				<el-form-item label="项目编号" prop="rtnPrjno">
-					<el-input v-model="form.rtnPrjno" placeholder="请输入项目编号"/>
-				</el-form-item>
-				<el-form-item label="项目名称" prop="rtnPrjnm">
-					<el-input v-model="form.rtnPrjnm" placeholder="请输入项目名称"/>
-				</el-form-item>
-				<el-form-item label="退款状态5-退款成功7-退款失败3-退款处理中" prop="rtnRfndst">
-					<el-input v-model="form.rtnRfndst" placeholder="请输入退款状态5-退款成功7-退款失败3-退款处理中"/>
-				</el-form-item>
-				<el-form-item label="投标账号" prop="rtnTdracctno">
-					<el-input v-model="form.rtnTdracctno" placeholder="请输入投标账号"/>
-				</el-form-item>
-				<el-form-item label="投标账号币种01-人民币" prop="rtnTdracctnoccycd">
-					<el-input v-model="form.rtnTdracctnoccycd" placeholder="请输入投标账号币种01-人民币"/>
-				</el-form-item>
-				<el-form-item label="投标账户名称" prop="rtnTdracctnm">
-					<el-input v-model="form.rtnTdracctnm" placeholder="请输入投标账户名称"/>
-				</el-form-item>
-				<el-form-item label="投标账号行号" prop="rtnTdracctnobnkno">
-					<el-input v-model="form.rtnTdracctnobnkno" placeholder="请输入投标账号行号"/>
-				</el-form-item>
-				<el-form-item label="投标账号行名" prop="rtnTdracctnobnknm">
-					<el-input v-model="form.rtnTdracctnobnknm" placeholder="请输入投标账号行名"/>
-				</el-form-item>
-				<el-form-item label="投标数量" prop="rtnTdrnum">
-					<el-input v-model="form.rtnTdrnum" placeholder="请输入投标数量"/>
-				</el-form-item>
-				<el-form-item label="保证金金额 double" prop="rtnMrgnamt">
-					<el-input v-model="form.rtnMrgnamt" placeholder="请输入保证金金额 double"/>
-				</el-form-item>
-				<el-form-item label="服务费 double" prop="rtnSvcfee">
-					<el-input v-model="form.rtnSvcfee" placeholder="请输入服务费 double"/>
-				</el-form-item>
-				<el-form-item label="冻结金额 double" prop="rtnFrzamt">
-					<el-input v-model="form.rtnFrzamt" placeholder="请输入冻结金额 double"/>
-				</el-form-item>
-				<el-form-item label="罚没金额 double" prop="rtnFineamt">
-					<el-input v-model="form.rtnFineamt" placeholder="请输入罚没金额 double"/>
-				</el-form-item>
-				<el-form-item label="退款日期yyyymmdd" prop="rtnRfnddt">
-					<el-input v-model="form.rtnRfnddt" placeholder="请输入退款日期yyyymmdd"/>
-				</el-form-item>
-				<el-form-item label="退款时间hhmmss" prop="rtnRfndtm">
-					<el-input v-model="form.rtnRfndtm" placeholder="请输入退款时间hhmmss"/>
-				</el-form-item>
-				<el-form-item label="交易流水号(标)" prop="rtnTxnseqnos">
-					<el-input v-model="form.rtnTxnseqnos" placeholder="请输入交易流水号(标)"/>
-				</el-form-item>
-				<el-form-item label="退回类型0-一般保证金1-长期保证金2-现金3-保函" prop="rtnBcktp">
-					<el-input v-model="form.rtnBcktp" placeholder="请输入退回类型0-一般保证金1-长期保证金2-现金3-保函"/>
-				</el-form-item>
-				<el-form-item label="退款方式0-本金退还 1-本息退还" prop="rtnTfroutmd">
-					<el-input v-model="form.rtnTfroutmd" placeholder="请输入退款方式0-本金退还 1-本息退还"/>
-				</el-form-item>
-				<el-form-item label="退款时收款账号" prop="rtnTfroutacctno">
-					<el-input v-model="form.rtnTfroutacctno" placeholder="请输入退款时收款账号"/>
-				</el-form-item>
-				<el-form-item label="退款时收款币种01-人民币" prop="rtnTfroutccycd">
-					<el-input v-model="form.rtnTfroutccycd" placeholder="请输入退款时收款币种01-人民币"/>
-				</el-form-item>
-				<el-form-item label="退款时收款账户名称" prop="rtnTfroutacctnm">
-					<el-input v-model="form.rtnTfroutacctnm" placeholder="请输入退款时收款账户名称"/>
-				</el-form-item>
-				<el-form-item label="退款时收款行行号" prop="rtnTfroutbnkno">
-					<el-input v-model="form.rtnTfroutbnkno" placeholder="请输入退款时收款行行号"/>
-				</el-form-item>
-				<el-form-item label="退款时收款行行名" prop="rtnTfroutbnknm">
-					<el-input v-model="form.rtnTfroutbnknm" placeholder="请输入退款时收款行行名"/>
-				</el-form-item>
-				<el-form-item label="退款金额 double" prop="rtnRfndamt">
-					<el-input v-model="form.rtnRfndamt" placeholder="请输入退款金额 double"/>
-				</el-form-item>
-				<el-form-item label="退款本金 double" prop="rtnRfndpnp">
-					<el-input v-model="form.rtnRfndpnp" placeholder="请输入退款本金 double"/>
-				</el-form-item>
-				<el-form-item label="应收手续费 double" prop="rtnRcvblpcdfee">
-					<el-input v-model="form.rtnRcvblpcdfee" placeholder="请输入应收手续费 double"/>
-				</el-form-item>
-				<el-form-item label="实收手续费 double" prop="rtnActrcvpcdfee">
-					<el-input v-model="form.rtnActrcvpcdfee" placeholder="请输入实收手续费 double"/>
-				</el-form-item>
-				<el-form-item label="应付利息 double" prop="rtnPyblint">
-					<el-input v-model="form.rtnPyblint" placeholder="请输入应付利息 double"/>
-				</el-form-item>
-				<el-form-item label="实付利息 double" prop="rtnActpymtint">
-					<el-input v-model="form.rtnActpymtint" placeholder="请输入实付利息 double"/>
-				</el-form-item>
-				<el-form-item label="退款处理意见" prop="rtnRfnddealopnn">
-					<el-input v-model="form.rtnRfnddealopnn" placeholder="请输入退款处理意见"/>
-				</el-form-item>
-				<el-form-item label="退款处理信息" prop="rtnRfnddealinf">
-					<el-input v-model="form.rtnRfnddealinf" placeholder="请输入退款处理信息"/>
-				</el-form-item>
-			</el-form>
-			<div slot="footer" class="dialog-footer">
-				<el-button type="primary" @click="submitForm">确 定</el-button>
-				<el-button @click="cancel">取 消</el-button>
-			</div>
-		</el-dialog>
-	</div>
+    <!-- 添加或修改查询保证金退款信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="采购计划id" prop="ppid">
+          <el-input v-model="form.ppid" placeholder="请输入采购计划id" />
+        </el-form-item>
+        <el-form-item label="客户端交易的唯一流水号建议值为yyyymmdd+序号" prop="trnuid">
+          <el-input v-model="form.trnuid" placeholder="请输入客户端交易的唯一流水号建议值为yyyymmdd+序号" />
+        </el-form-item>
+        <el-form-item label="报文节点" prop="rqbody">
+          <el-input v-model="form.rqbody" placeholder="请输入报文节点" />
+        </el-form-item>
+        <el-form-item label="标段id" prop="sgtid">
+          <el-input v-model="form.sgtid" placeholder="请输入标段id" />
+        </el-form-item>
+        <el-form-item label="标段编号" prop="sgtno">
+          <el-input v-model="form.sgtno" placeholder="请输入标段编号" />
+        </el-form-item>
+        <el-form-item label="项目编号" prop="prjno">
+          <el-input v-model="form.prjno" placeholder="请输入项目编号" />
+        </el-form-item>
+        <el-form-item label="企业名称" prop="entpnm">
+          <el-input v-model="form.entpnm" placeholder="请输入企业名称" />
+        </el-form-item>
+        <el-form-item label="开始日期yyyymmdd" prop="begdt">
+          <el-input v-model="form.begdt" placeholder="请输入开始日期yyyymmdd" />
+        </el-form-item>
+        <el-form-item label="结束日期yyyymmdd" prop="enddt">
+          <el-input v-model="form.enddt" placeholder="请输入结束日期yyyymmdd" />
+        </el-form-item>
+        <el-form-item label="页码不输默认查询第一页" prop="pgno">
+          <el-input v-model="form.pgno" placeholder="请输入页码不输默认查询第一页" />
+        </el-form-item>
+        <el-form-item label="客户端交易的唯一标志" prop="rtnTrnuid">
+          <el-input v-model="form.rtnTrnuid" placeholder="请输入客户端交易的唯一标志" />
+        </el-form-item>
+        <el-form-item label="处理结果码" prop="rtnCode">
+          <el-input v-model="form.rtnCode" placeholder="请输入处理结果码" />
+        </el-form-item>
+        <el-form-item label="处理结果等级(info/warn/error)" prop="rtnSeverity">
+          <el-input v-model="form.rtnSeverity" placeholder="请输入处理结果等级(info/warn/error)" />
+        </el-form-item>
+        <el-form-item label="处理信息描述" prop="rtnMessage">
+          <el-input v-model="form.rtnMessage" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="报文节点" prop="rtnRsbody">
+          <el-input v-model="form.rtnRsbody" placeholder="请输入报文节点" />
+        </el-form-item>
+        <el-form-item label="记录总数" prop="rtnRcrdtotnum">
+          <el-input v-model="form.rtnRcrdtotnum" placeholder="请输入记录总数" />
+        </el-form-item>
+        <el-form-item label="当前页码" prop="rtnCrnpgno">
+          <el-input v-model="form.rtnCrnpgno" placeholder="请输入当前页码" />
+        </el-form-item>
+        <el-form-item label="每页记录数" prop="rtnPgrcrdnum">
+          <el-input v-model="form.rtnPgrcrdnum" placeholder="请输入每页记录数" />
+        </el-form-item>
+        <el-form-item label="总页数" prop="rtnTotpgnum">
+          <el-input v-model="form.rtnTotpgnum" placeholder="请输入总页数" />
+        </el-form-item>
+        <el-form-item label="明细报文标识">
+          <editor v-model="form.rtnContent" :min-height="192" />
+        </el-form-item>
+        <el-form-item label="租户号" prop="rtnLsecstno">
+          <el-input v-model="form.rtnLsecstno" placeholder="请输入租户号" />
+        </el-form-item>
+        <el-form-item label="客户号" prop="rtnCstno">
+          <el-input v-model="form.rtnCstno" placeholder="请输入客户号" />
+        </el-form-item>
+        <el-form-item label="标段id" prop="rtnSgtid">
+          <el-input v-model="form.rtnSgtid" placeholder="请输入标段id" />
+        </el-form-item>
+        <el-form-item label="标段编号" prop="rtnSgtno">
+          <el-input v-model="form.rtnSgtno" placeholder="请输入标段编号" />
+        </el-form-item>
+        <el-form-item label="标段名称" prop="rtnSgtnm">
+          <el-input v-model="form.rtnSgtnm" placeholder="请输入标段名称" />
+        </el-form-item>
+        <el-form-item label="投标编号" prop="rtnTdrno">
+          <el-input v-model="form.rtnTdrno" placeholder="请输入投标编号" />
+        </el-form-item>
+        <el-form-item label="项目编号" prop="rtnPrjno">
+          <el-input v-model="form.rtnPrjno" placeholder="请输入项目编号" />
+        </el-form-item>
+        <el-form-item label="项目名称" prop="rtnPrjnm">
+          <el-input v-model="form.rtnPrjnm" placeholder="请输入项目名称" />
+        </el-form-item>
+        <el-form-item label="退款状态5-退款成功7-退款失败3-退款处理中" prop="rtnRfndst">
+          <el-input v-model="form.rtnRfndst" placeholder="请输入退款状态5-退款成功7-退款失败3-退款处理中" />
+        </el-form-item>
+        <el-form-item label="投标账号" prop="rtnTdracctno">
+          <el-input v-model="form.rtnTdracctno" placeholder="请输入投标账号" />
+        </el-form-item>
+        <el-form-item label="投标账号币种01-人民币" prop="rtnTdracctnoccycd">
+          <el-input v-model="form.rtnTdracctnoccycd" placeholder="请输入投标账号币种01-人民币" />
+        </el-form-item>
+        <el-form-item label="投标账户名称" prop="rtnTdracctnm">
+          <el-input v-model="form.rtnTdracctnm" placeholder="请输入投标账户名称" />
+        </el-form-item>
+        <el-form-item label="投标账号行号" prop="rtnTdracctnobnkno">
+          <el-input v-model="form.rtnTdracctnobnkno" placeholder="请输入投标账号行号" />
+        </el-form-item>
+        <el-form-item label="投标账号行名" prop="rtnTdracctnobnknm">
+          <el-input v-model="form.rtnTdracctnobnknm" placeholder="请输入投标账号行名" />
+        </el-form-item>
+        <el-form-item label="投标数量" prop="rtnTdrnum">
+          <el-input v-model="form.rtnTdrnum" placeholder="请输入投标数量" />
+        </el-form-item>
+        <el-form-item label="保证金金额 double" prop="rtnMrgnamt">
+          <el-input v-model="form.rtnMrgnamt" placeholder="请输入保证金金额 double" />
+        </el-form-item>
+        <el-form-item label="服务费 double" prop="rtnSvcfee">
+          <el-input v-model="form.rtnSvcfee" placeholder="请输入服务费 double" />
+        </el-form-item>
+        <el-form-item label="冻结金额 double" prop="rtnFrzamt">
+          <el-input v-model="form.rtnFrzamt" placeholder="请输入冻结金额 double" />
+        </el-form-item>
+        <el-form-item label="罚没金额 double" prop="rtnFineamt">
+          <el-input v-model="form.rtnFineamt" placeholder="请输入罚没金额 double" />
+        </el-form-item>
+        <el-form-item label="退款日期yyyymmdd" prop="rtnRfnddt">
+          <el-input v-model="form.rtnRfnddt" placeholder="请输入退款日期yyyymmdd" />
+        </el-form-item>
+        <el-form-item label="退款时间hhmmss" prop="rtnRfndtm">
+          <el-input v-model="form.rtnRfndtm" placeholder="请输入退款时间hhmmss" />
+        </el-form-item>
+        <el-form-item label="交易流水号(标)" prop="rtnTxnseqnos">
+          <el-input v-model="form.rtnTxnseqnos" placeholder="请输入交易流水号(标)" />
+        </el-form-item>
+        <el-form-item label="退回类型0-一般保证金1-长期保证金2-现金3-保函" prop="rtnBcktp">
+          <el-input v-model="form.rtnBcktp" placeholder="请输入退回类型0-一般保证金1-长期保证金2-现金3-保函" />
+        </el-form-item>
+        <el-form-item label="退款方式0-本金退还 1-本息退还" prop="rtnTfroutmd">
+          <el-input v-model="form.rtnTfroutmd" placeholder="请输入退款方式0-本金退还 1-本息退还" />
+        </el-form-item>
+        <el-form-item label="退款时收款账号" prop="rtnTfroutacctno">
+          <el-input v-model="form.rtnTfroutacctno" placeholder="请输入退款时收款账号" />
+        </el-form-item>
+        <el-form-item label="退款时收款币种01-人民币" prop="rtnTfroutccycd">
+          <el-input v-model="form.rtnTfroutccycd" placeholder="请输入退款时收款币种01-人民币" />
+        </el-form-item>
+        <el-form-item label="退款时收款账户名称" prop="rtnTfroutacctnm">
+          <el-input v-model="form.rtnTfroutacctnm" placeholder="请输入退款时收款账户名称" />
+        </el-form-item>
+        <el-form-item label="退款时收款行行号" prop="rtnTfroutbnkno">
+          <el-input v-model="form.rtnTfroutbnkno" placeholder="请输入退款时收款行行号" />
+        </el-form-item>
+        <el-form-item label="退款时收款行行名" prop="rtnTfroutbnknm">
+          <el-input v-model="form.rtnTfroutbnknm" placeholder="请输入退款时收款行行名" />
+        </el-form-item>
+        <el-form-item label="退款金额 double" prop="rtnRfndamt">
+          <el-input v-model="form.rtnRfndamt" placeholder="请输入退款金额 double" />
+        </el-form-item>
+        <el-form-item label="退款本金 double" prop="rtnRfndpnp">
+          <el-input v-model="form.rtnRfndpnp" placeholder="请输入退款本金 double" />
+        </el-form-item>
+        <el-form-item label="应收手续费 double" prop="rtnRcvblpcdfee">
+          <el-input v-model="form.rtnRcvblpcdfee" placeholder="请输入应收手续费 double" />
+        </el-form-item>
+        <el-form-item label="实收手续费 double" prop="rtnActrcvpcdfee">
+          <el-input v-model="form.rtnActrcvpcdfee" placeholder="请输入实收手续费 double" />
+        </el-form-item>
+        <el-form-item label="应付利息 double" prop="rtnPyblint">
+          <el-input v-model="form.rtnPyblint" placeholder="请输入应付利息 double" />
+        </el-form-item>
+        <el-form-item label="实付利息 double" prop="rtnActpymtint">
+          <el-input v-model="form.rtnActpymtint" placeholder="请输入实付利息 double" />
+        </el-form-item>
+        <el-form-item label="退款处理意见" prop="rtnRfnddealopnn">
+          <el-input v-model="form.rtnRfnddealopnn" placeholder="请输入退款处理意见" />
+        </el-form-item>
+        <el-form-item label="退款处理信息" prop="rtnRfnddealinf">
+          <el-input v-model="form.rtnRfnddealinf" placeholder="请输入退款处理信息" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-import {listRefund, getRefund, delRefund, addRefund, updateRefund} from "@/api/bank/refund";
+import { listRefund, getRefund, delRefund, addRefund, updateRefund } from "@/api/bank/refund";
 
 export default {
-	name: "Refund",
-	data() {
-		return {
-			// 遮罩层
-			loading: true,
-			// 选中数组
-			ids: [],
-			// 非单个禁用
-			single: true,
-			// 非多个禁用
-			multiple: true,
-			// 显示搜索条件
-			showSearch: true,
-			// 总条数
-			total: 0,
-			// 查询保证金退款信息表格数据
-			refundList: [],
-			// 弹出层标题
-			title: "",
-			// 是否显示弹出层
-			open: false,
-			// 查询参数
-			queryParams: {
-				pageNum: 1,
-				pageSize: 10,
-				ppid: null,
-				trnuid: null,
-				rqbody: null,
-				sgtid: null,
-				sgtno: null,
-				prjno: null,
-				entpnm: null,
-				begdt: null,
-				enddt: null,
-				pgno: null,
-				rtnTrnuid: null,
-				rtnStatus: null,
-				rtnCode: null,
-				rtnSeverity: null,
-				rtnMessage: null,
-				rtnRsbody: null,
-				rtnRcrdtotnum: null,
-				rtnCrnpgno: null,
-				rtnPgrcrdnum: null,
-				rtnTotpgnum: null,
-				rtnContent: null,
-				rtnLsecstno: null,
-				rtnCstno: null,
-				rtnSgtid: null,
-				rtnSgtno: null,
-				rtnSgtnm: null,
-				rtnTdrno: null,
-				rtnPrjno: null,
-				rtnPrjnm: null,
-				rtnRfndst: null,
-				rtnTdracctno: null,
-				rtnTdracctnoccycd: null,
-				rtnTdracctnm: null,
-				rtnTdracctnobnkno: null,
-				rtnTdracctnobnknm: null,
-				rtnTdrnum: null,
-				rtnMrgnamt: null,
-				rtnSvcfee: null,
-				rtnFrzamt: null,
-				rtnFineamt: null,
-				rtnRfnddt: null,
-				rtnRfndtm: null,
-				rtnTxnseqnos: null,
-				rtnBcktp: null,
-				rtnTfroutmd: null,
-				rtnTfroutacctno: null,
-				rtnTfroutccycd: null,
-				rtnTfroutacctnm: null,
-				rtnTfroutbnkno: null,
-				rtnTfroutbnknm: null,
-				rtnRfndamt: null,
-				rtnRfndpnp: null,
-				rtnRcvblpcdfee: null,
-				rtnActrcvpcdfee: null,
-				rtnPyblint: null,
-				rtnActpymtint: null,
-				rtnRfnddealopnn: null,
-				rtnRfnddealinf: null
-			},
-			// 表单参数
-			form: {},
-			// 表单校验
-			rules: {
-				ppid: [
-					{required: true, message: "采购计划id不能为空", trigger: "blur"}
-				],
-				trnuid: [
-					{required: true, message: "客户端交易的唯一流水号建议值为yyyymmdd+序号不能为空", trigger: "blur"}
-				],
-			}
-		};
-	},
-	created() {
-		this.getList();
-	},
-	methods: {
-		/** 查询查询保证金退款信息列表 */
-		getList() {
-			this.loading = true;
-			listRefund(this.queryParams).then(response => {
-				this.refundList = response.rows;
-				this.total = response.total;
-				this.loading = false;
-			});
-		},
-		// 取消按钮
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		// 表单重置
-		reset() {
-			this.form = {
-				refundid: null,
-				ppid: null,
-				trnuid: null,
-				rqbody: null,
-				sgtid: null,
-				sgtno: null,
-				prjno: null,
-				entpnm: null,
-				begdt: null,
-				enddt: null,
-				pgno: null,
-				rtnTrnuid: null,
-				rtnStatus: null,
-				rtnCode: null,
-				rtnSeverity: null,
-				rtnMessage: null,
-				rtnRsbody: null,
-				rtnRcrdtotnum: null,
-				rtnCrnpgno: null,
-				rtnPgrcrdnum: null,
-				rtnTotpgnum: null,
-				rtnContent: null,
-				rtnLsecstno: null,
-				rtnCstno: null,
-				rtnSgtid: null,
-				rtnSgtno: null,
-				rtnSgtnm: null,
-				rtnTdrno: null,
-				rtnPrjno: null,
-				rtnPrjnm: null,
-				rtnRfndst: null,
-				rtnTdracctno: null,
-				rtnTdracctnoccycd: null,
-				rtnTdracctnm: null,
-				rtnTdracctnobnkno: null,
-				rtnTdracctnobnknm: null,
-				rtnTdrnum: null,
-				rtnMrgnamt: null,
-				rtnSvcfee: null,
-				rtnFrzamt: null,
-				rtnFineamt: null,
-				rtnRfnddt: null,
-				rtnRfndtm: null,
-				rtnTxnseqnos: null,
-				rtnBcktp: null,
-				rtnTfroutmd: null,
-				rtnTfroutacctno: null,
-				rtnTfroutccycd: null,
-				rtnTfroutacctnm: null,
-				rtnTfroutbnkno: null,
-				rtnTfroutbnknm: null,
-				rtnRfndamt: null,
-				rtnRfndpnp: null,
-				rtnRcvblpcdfee: null,
-				rtnActrcvpcdfee: null,
-				rtnPyblint: null,
-				rtnActpymtint: null,
-				rtnRfnddealopnn: null,
-				rtnRfnddealinf: null
-			};
-			this.resetForm("form");
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNum = 1;
-			this.getList();
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm("queryForm");
-			this.handleQuery();
-		},
-		// 多选框选中数据
-		handleSelectionChange(selection) {
-			this.ids = selection.map(item => item.refundid)
-			this.single = selection.length !== 1
-			this.multiple = !selection.length
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = "添加查询保证金退款信息";
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			const refundid = row.refundid || this.ids
-			getRefund(refundid).then(response => {
-				this.form = response.data;
-				this.open = true;
-				this.title = "修改查询保证金退款信息";
-			});
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs["form"].validate(valid => {
-				if (valid) {
-					if (this.form.refundid != null) {
-						updateRefund(this.form).then(response => {
-							this.$modal.msgSuccess("修改成功");
-							this.open = false;
-							this.getList();
-						});
-					} else {
-						addRefund(this.form).then(response => {
-							this.$modal.msgSuccess("新增成功");
-							this.open = false;
-							this.getList();
-						});
-					}
-				}
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const refundids = row.refundid || this.ids;
-			this.$modal.confirm('是否确认删除查询保证金退款信息编号为"' + refundids + '"的数据项？').then(function () {
-				return delRefund(refundids);
-			}).then(() => {
-				this.getList();
-				this.$modal.msgSuccess("删除成功");
-			}).catch(() => {
-			});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			this.download('bank/refund/export', {
-				...this.queryParams
-			}, `refund_${new Date().getTime()}.xlsx`)
-		},
-		formatDate(dateStr, timeStr) {
-			return dateStr.substring(0, 4) + "-" + dateStr.substring(4, 6) + "-" + dateStr.substring(6, 8) + " " + timeStr.substring(0, 2) + ":" + timeStr.substring(2, 4) + ":" + timeStr.substring(4, 6)
-		}
-	}
+  name: "Refund",
+  data () {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 查询保证金退款信息表格数据
+      refundList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        ppid: null,
+        trnuid: null,
+        rqbody: null,
+        sgtid: null,
+        sgtno: null,
+        prjno: null,
+        entpnm: null,
+        begdt: null,
+        enddt: null,
+        pgno: null,
+        rtnTrnuid: null,
+        rtnStatus: null,
+        rtnCode: null,
+        rtnSeverity: null,
+        rtnMessage: null,
+        rtnRsbody: null,
+        rtnRcrdtotnum: null,
+        rtnCrnpgno: null,
+        rtnPgrcrdnum: null,
+        rtnTotpgnum: null,
+        rtnContent: null,
+        rtnLsecstno: null,
+        rtnCstno: null,
+        rtnSgtid: null,
+        rtnSgtno: null,
+        rtnSgtnm: null,
+        rtnTdrno: null,
+        rtnPrjno: null,
+        rtnPrjnm: null,
+        rtnRfndst: null,
+        rtnTdracctno: null,
+        rtnTdracctnoccycd: null,
+        rtnTdracctnm: null,
+        rtnTdracctnobnkno: null,
+        rtnTdracctnobnknm: null,
+        rtnTdrnum: null,
+        rtnMrgnamt: null,
+        rtnSvcfee: null,
+        rtnFrzamt: null,
+        rtnFineamt: null,
+        rtnRfnddt: null,
+        rtnRfndtm: null,
+        rtnTxnseqnos: null,
+        rtnBcktp: null,
+        rtnTfroutmd: null,
+        rtnTfroutacctno: null,
+        rtnTfroutccycd: null,
+        rtnTfroutacctnm: null,
+        rtnTfroutbnkno: null,
+        rtnTfroutbnknm: null,
+        rtnRfndamt: null,
+        rtnRfndpnp: null,
+        rtnRcvblpcdfee: null,
+        rtnActrcvpcdfee: null,
+        rtnPyblint: null,
+        rtnActpymtint: null,
+        rtnRfnddealopnn: null,
+        rtnRfnddealinf: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        ppid: [
+          { required: true, message: "采购计划id不能为空", trigger: "blur" }
+        ],
+        trnuid: [
+          { required: true, message: "客户端交易的唯一流水号建议值为yyyymmdd+序号不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created () {
+    this.getList();
+  },
+  methods: {
+    /** 查询查询保证金退款信息列表 */
+    getList () {
+      this.loading = true;
+      listRefund(this.queryParams).then(response => {
+        this.refundList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel () {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset () {
+      this.form = {
+        refundid: null,
+        ppid: null,
+        trnuid: null,
+        rqbody: null,
+        sgtid: null,
+        sgtno: null,
+        prjno: null,
+        entpnm: null,
+        begdt: null,
+        enddt: null,
+        pgno: null,
+        rtnTrnuid: null,
+        rtnStatus: null,
+        rtnCode: null,
+        rtnSeverity: null,
+        rtnMessage: null,
+        rtnRsbody: null,
+        rtnRcrdtotnum: null,
+        rtnCrnpgno: null,
+        rtnPgrcrdnum: null,
+        rtnTotpgnum: null,
+        rtnContent: null,
+        rtnLsecstno: null,
+        rtnCstno: null,
+        rtnSgtid: null,
+        rtnSgtno: null,
+        rtnSgtnm: null,
+        rtnTdrno: null,
+        rtnPrjno: null,
+        rtnPrjnm: null,
+        rtnRfndst: null,
+        rtnTdracctno: null,
+        rtnTdracctnoccycd: null,
+        rtnTdracctnm: null,
+        rtnTdracctnobnkno: null,
+        rtnTdracctnobnknm: null,
+        rtnTdrnum: null,
+        rtnMrgnamt: null,
+        rtnSvcfee: null,
+        rtnFrzamt: null,
+        rtnFineamt: null,
+        rtnRfnddt: null,
+        rtnRfndtm: null,
+        rtnTxnseqnos: null,
+        rtnBcktp: null,
+        rtnTfroutmd: null,
+        rtnTfroutacctno: null,
+        rtnTfroutccycd: null,
+        rtnTfroutacctnm: null,
+        rtnTfroutbnkno: null,
+        rtnTfroutbnknm: null,
+        rtnRfndamt: null,
+        rtnRfndpnp: null,
+        rtnRcvblpcdfee: null,
+        rtnActrcvpcdfee: null,
+        rtnPyblint: null,
+        rtnActpymtint: null,
+        rtnRfnddealopnn: null,
+        rtnRfnddealinf: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery () {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery () {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange (selection) {
+      this.ids = selection.map(item => item.refundid)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd () {
+      this.reset();
+      this.open = true;
+      this.title = "添加查询保证金退款信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate (row) {
+      this.reset();
+      const refundid = row.refundid || this.ids
+      getRefund(refundid).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改查询保证金退款信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm () {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.refundid != null) {
+            updateRefund(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addRefund(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete (row) {
+      const refundids = row.refundid || this.ids;
+      this.$modal.confirm('是否确认删除查询保证金退款信息编号为"' + refundids + '"的数据项？').then(function () {
+        return delRefund(refundids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport () {
+      this.download('bank/refund/export', {
+        ...this.queryParams
+      }, `refund_${new Date().getTime()}.xlsx`)
+    },
+    formatDate (dateStr, timeStr) {
+      return dateStr.substring(0, 4) + "-" + dateStr.substring(4, 6) + "-" + dateStr.substring(6, 8) + " " + timeStr.substring(0, 2) + ":" + timeStr.substring(2, 4) + ":" + timeStr.substring(4, 6)
+    }
+  }
 };
 </script>

ruoyi-ui/src/views/bank/refundbat/index.vue

@@ -1,449 +1,290 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="采购计划" prop="ppid">
-        <el-input
-          v-model="queryParams.ppid"
-          placeholder="请输入采购计划id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="投标序号" prop="index">
-        <el-input
-          v-model="queryParams.index"
-          placeholder="请输入投标序号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="投标编号" prop="tdrno">
-        <el-input
-          v-model="queryParams.tdrno"
-          placeholder="请输入投标编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="转出方式" prop="tfroutmd">
-        <el-input
-          v-model="queryParams.tfroutmd"
-          placeholder="请输入转出方式0-本金退还 1-本息退还"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="流水号" prop="rtnTrnuid">
-        <el-input
-          v-model="queryParams.rtnTrnuid"
-          placeholder="请输入客户端交易的唯一标志"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="处理结果等级" prop="rtnSeverity" label-width="70">
-        <el-input
-          v-model="queryParams.rtnSeverity"
-          placeholder="请输入处理结果等级(info/warn/error)"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="投标序号" prop="rtnIndex">
-        <el-input
-          v-model="queryParams.rtnIndex"
-          placeholder="请输入投标序号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="投标编号" prop="rtnTdrno">
-        <el-input
-          v-model="queryParams.rtnTdrno"
-          placeholder="请输入投标编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="退款状态" prop="rtnRefundstat">
-        <el-input
-          v-model="queryParams.rtnRefundstat"
-          placeholder="请输入退款状态2-处理中，3-失败"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="退款返回信息" prop="rtnRefundmsg" label-width="70">
-        <el-input
-          v-model="queryParams.rtnRefundmsg"
-          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>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+				 label-width="68px">
+			<el-form-item label="采购公告" prop="ppid">
+				<el-input
+					v-model="queryParams.ppid"
+					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-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['bank:refundbat:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['bank:refundbat:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['bank:refundbat:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['bank:refundbat:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button
+					type="warning"
+					plain
+					icon="el-icon-download"
+					size="mini"
+					@click="handleExport"
+					v-hasPermi="['bank:refundbat:export']"
+				>导出
+				</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
 
-    <el-table v-loading="loading" :data="refundbatList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="${comment}" align="center" prop="refundbatid" v-if="false"/>
-      <el-table-column label="采购公告" align="center" prop="ppid" />
-      <el-table-column label="银行流水" align="center" prop="trnuid" />
-      <el-table-column label="报文节点" align="center" prop="rqbody" v-if="false"/>
-      <el-table-column label="投标id集合信息数组报文节点" align="center" prop="content" v-if="false"/>
-      <el-table-column label="投标序号" align="center" prop="index" />
-      <el-table-column label="投标编号" align="center" prop="tdrno" />
-      <el-table-column label="退款备注" align="center" prop="remark" />
-      <el-table-column label="转出方式0-本金退还 1-本息退还" align="center" prop="tfroutmd" v-if="false"/>
-      <el-table-column label="银行流水" align="center" prop="rtnTrnuid" />
-      <el-table-column label="交易处理状态" align="center" prop="rtnStatus" v-if="false"/>
-      <el-table-column label="处理结果码" align="center" prop="rtnCode" v-if="false"/>
-		<el-table-column label="处理结果等级" align="center" prop="rtnSeverity" >
-			<template slot-scope="scope">
-				<el-tag type="info" v-if="scope.row.rtnSeverity.toLowerCase() === 'info'">info</el-tag>
-				<el-tag type="warning" v-if="scope.row.rtnSeverity.toLowerCase() === 'warn'">warn</el-tag>
-				<el-tag type="danger" v-if="scope.row.rtnSeverity.toLowerCase() === 'error'">error</el-tag>
-			</template>
-		</el-table-column>
-      <el-table-column label="报文节点" align="center" prop="rtnRsbody" v-if="false"/>
-      <el-table-column label="投标id集合信息数组报文节点" align="center" prop="rtnContent" v-if="false"/>
-      <el-table-column label="投标序号" align="center" prop="rtnIndex" />
-      <el-table-column label="投标编号" align="center" prop="rtnTdrno" />
-		<el-table-column label="退款状态" align="center" prop="rtnRefundstat" >
-			<template slot-scope="scope">
-				<el-tag type="warning" v-if="scope.row.rtnRefundstat.toLowerCase() === '2'">处理中</el-tag>
-				<el-tag type="danger" v-if="scope.row.rtnRefundstat.toLowerCase() === '3'">失败</el-tag>
-			</template>
-		</el-table-column>
-      <el-table-column label="退款返回信息" align="center" prop="rtnRefundmsg" />
-      <el-table-column label="指令处理状态报文节点" align="center" prop="rtnXferprcsts" v-if="false"/>
-      <el-table-column label="指令状态编码" align="center" prop="rtnXferprccode" />
-      <el-table-column label="指令处理时间" align="center" prop="rtnDtxferprc" />
-      <el-table-column label="指令处理信息" align="center" prop="rtnMessage" />
-      <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="handleUpdate(scope.row)"
-            v-hasPermi="['bank:refundbat:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['bank:refundbat:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+		<el-table v-loading="loading" :data="refundbatList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center"/>
+			<el-table-column label="${comment}" align="center" prop="refundbatid" v-if="false"/>
+			<el-table-column label="采购公告" align="center" prop="ppid"/>
+			<el-table-column label="银行流水" align="center" prop="trnuid" v-if="false"/>
+			<el-table-column label="报文节点" align="center" prop="rqbody" v-if="false"/>
+			<el-table-column label="投标id集合信息数组报文节点" align="center" prop="content" v-if="false"/>
+			<el-table-column label="投标序号" align="center" prop="index"  v-if="false"/>
+			<el-table-column label="投标编号" align="center" prop="tdrno"  v-if="false"/>
+			<el-table-column label="退款备注" align="center" prop="remark"  v-if="false"/>
+			<el-table-column label="转出方式0-本金退还 1-本息退还" align="center" prop="tfroutmd" v-if="false"/>
+			<el-table-column label="银行流水" align="center" prop="rtnTrnuid"/>
+			<el-table-column label="交易处理状态" align="center" prop="rtnStatus" v-if="false"/>
+			<el-table-column label="处理结果码" align="center" prop="rtnCode" v-if="false"/>
+			<el-table-column label="处理结果等级" align="center" prop="rtnSeverity">
+				<template slot-scope="scope">
+					<el-tag type="info" v-if="scope.row.rtnSeverity.toLowerCase() === 'info'">info</el-tag>
+					<el-tag type="warning" v-if="scope.row.rtnSeverity.toLowerCase() === 'warn'">warn</el-tag>
+					<el-tag type="danger" v-if="scope.row.rtnSeverity.toLowerCase() === 'error'">error</el-tag>
+				</template>
+			</el-table-column>
+			<el-table-column label="报文节点" align="center" prop="rtnRsbody" v-if="false"/>
+			<el-table-column label="投标id集合信息数组报文节点" align="center" prop="rtnContent" v-if="false"/>
+			<el-table-column label="投标序号" align="center" prop="rtnIndex"/>
+			<el-table-column label="投标编号" align="center" prop="rtnTdrno"/>
+			<el-table-column label="退款状态" align="center" prop="rtnRefundstat">
+				<template slot-scope="scope">
+					<el-tag type="warning" v-if="scope.row.rtnRefundstat.toLowerCase() === '2'">处理中</el-tag>
+					<el-tag type="danger" v-if="scope.row.rtnRefundstat.toLowerCase() === '3'">失败</el-tag>
+				</template>
+			</el-table-column>
+			<el-table-column label="退款返回信息" align="center" prop="rtnRefundmsg"/>
+			<el-table-column label="指令处理状态报文节点" align="center" prop="rtnXferprcsts" v-if="false"/>
+			<el-table-column label="指令状态编码" align="center" prop="rtnXferprccode"/>
+			<el-table-column label="指令处理时间" align="center" prop="rtnDtxferprc"/>
+			<el-table-column label="指令处理信息" align="center" prop="rtnMessage"/>
+			<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="handleUpdate(scope.row)"
+						v-hasPermi="['bank:refundbat:edit']"
+					>修改
+					</el-button>
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-delete"
+						@click="handleDelete(scope.row)"
+						v-hasPermi="['bank:refundbat:remove']"
+					>删除
+					</el-button>
+				</template>
+			</el-table-column>
+		</el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+		<pagination
+			v-show="total>0"
+			:total="total"
+			:page.sync="queryParams.pageNum"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList"
+		/>
 
-    <!-- 添加或修改批量退还保证金对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="采购计划id" prop="ppid">
-          <el-input v-model="form.ppid" placeholder="请输入采购计划id" />
-        </el-form-item>
-        <el-form-item label="报文节点" prop="rqbody">
-          <el-input v-model="form.rqbody" placeholder="请输入报文节点" />
-        </el-form-item>
-        <el-form-item label="投标id集合信息数组报文节点">
-          <editor v-model="form.content" :min-height="192"/>
-        </el-form-item>
-        <el-form-item label="投标序号" prop="index">
-          <el-input v-model="form.index" placeholder="请输入投标序号" />
-        </el-form-item>
-        <el-form-item label="投标编号" prop="tdrno">
-          <el-input v-model="form.tdrno" placeholder="请输入投标编号" />
-        </el-form-item>
-        <el-form-item label="退款备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入退款备注" />
-        </el-form-item>
-        <el-form-item label="转出方式0-本金退还 1-本息退还" prop="tfroutmd">
-          <el-input v-model="form.tfroutmd" placeholder="请输入转出方式0-本金退还 1-本息退还" />
-        </el-form-item>
-        <el-form-item label="客户端交易的唯一标志" prop="rtnTrnuid">
-          <el-input v-model="form.rtnTrnuid" placeholder="请输入客户端交易的唯一标志" />
-        </el-form-item>
-        <el-form-item label="处理结果码" prop="rtnCode">
-          <el-input v-model="form.rtnCode" placeholder="请输入处理结果码" />
-        </el-form-item>
-        <el-form-item label="处理结果等级(info/warn/error)" prop="rtnSeverity">
-          <el-input v-model="form.rtnSeverity" placeholder="请输入处理结果等级(info/warn/error)" />
-        </el-form-item>
-        <el-form-item label="报文节点" prop="rtnRsbody">
-          <el-input v-model="form.rtnRsbody" placeholder="请输入报文节点" />
-        </el-form-item>
-        <el-form-item label="投标id集合信息数组报文节点">
-          <editor v-model="form.rtnContent" :min-height="192"/>
-        </el-form-item>
-        <el-form-item label="投标序号" prop="rtnIndex">
-          <el-input v-model="form.rtnIndex" placeholder="请输入投标序号" />
-        </el-form-item>
-        <el-form-item label="投标编号" prop="rtnTdrno">
-          <el-input v-model="form.rtnTdrno" placeholder="请输入投标编号" />
-        </el-form-item>
-        <el-form-item label="退款状态2-处理中，3-失败" prop="rtnRefundstat">
-          <el-input v-model="form.rtnRefundstat" placeholder="请输入退款状态2-处理中，3-失败" />
-        </el-form-item>
-        <el-form-item label="退款返回信息" prop="rtnRefundmsg">
-          <el-input v-model="form.rtnRefundmsg" placeholder="请输入退款返回信息" />
-        </el-form-item>
-        <el-form-item label="指令处理状态报文节点" prop="rtnXferprcsts">
-          <el-input v-model="form.rtnXferprcsts" placeholder="请输入指令处理状态报文节点" />
-        </el-form-item>
-        <el-form-item label="指令状态编码" prop="rtnXferprccode">
-          <el-input v-model="form.rtnXferprccode" placeholder="请输入指令状态编码" />
-        </el-form-item>
-        <el-form-item label="指令处理时间yyyymmdd hhmmss" prop="rtnDtxferprc">
-          <el-input v-model="form.rtnDtxferprc" placeholder="请输入指令处理时间yyyymmdd hhmmss" />
-        </el-form-item>
-        <el-form-item label="指令处理信息" prop="rtnMessage">
-          <el-input v-model="form.rtnMessage" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
+		<!-- 添加或修改批量退还保证金对话框 -->
+		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitForm">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+	</div>
 </template>
 
 <script>
-import { listRefundbat, getRefundbat, delRefundbat, addRefundbat, updateRefundbat } from "@/api/bank/refundbat";
+import {listRefundbat, getRefundbat, delRefundbat, addRefundbat, updateRefundbat} from "@/api/bank/refundbat";
 
 export default {
-  name: "Refundbat",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 批量退还保证金表格数据
-      refundbatList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        ppid: null,
-        rqbody: null,
-        content: null,
-        index: null,
-        tdrno: null,
-        tfroutmd: null,
-        rtnTrnuid: null,
-        rtnStatus: null,
-        rtnCode: null,
-        rtnSeverity: null,
-        rtnRsbody: null,
-        rtnContent: null,
-        rtnIndex: null,
-        rtnTdrno: null,
-        rtnRefundstat: null,
-        rtnRefundmsg: null,
-        rtnXferprcsts: null,
-        rtnXferprccode: null,
-        rtnDtxferprc: null,
-        rtnMessage: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        ppid: [
-          { required: true, message: "采购计划id不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询批量退还保证金列表 */
-    getList() {
-      this.loading = true;
-      listRefundbat(this.queryParams).then(response => {
-        this.refundbatList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        refundbatid: null,
-        ppid: null,
-        trnuid: null,
-        rqbody: null,
-        content: null,
-        index: null,
-        tdrno: null,
-        remark: null,
-        tfroutmd: null,
-        rtnTrnuid: null,
-        rtnStatus: null,
-        rtnCode: null,
-        rtnSeverity: null,
-        rtnRsbody: null,
-        rtnContent: null,
-        rtnIndex: null,
-        rtnTdrno: null,
-        rtnRefundstat: null,
-        rtnRefundmsg: null,
-        rtnXferprcsts: null,
-        rtnXferprccode: null,
-        rtnDtxferprc: null,
-        rtnMessage: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.refundbatid)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加批量退还保证金";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const refundbatid = row.refundbatid || this.ids
-      getRefundbat(refundbatid).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改批量退还保证金";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.refundbatid != null) {
-            updateRefundbat(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addRefundbat(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const refundbatids = row.refundbatid || this.ids;
-      this.$modal.confirm('是否确认删除批量退还保证金编号为"' + refundbatids + '"的数据项？').then(function() {
-        return delRefundbat(refundbatids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('bank/refundbat/export', {
-        ...this.queryParams
-      }, `refundbat_${new Date().getTime()}.xlsx`)
-    }
-  }
+	name: "Refundbat",
+	data() {
+		return {
+			// 遮罩层
+			loading: true,
+			// 选中数组
+			ids: [],
+			// 非单个禁用
+			single: true,
+			// 非多个禁用
+			multiple: true,
+			// 显示搜索条件
+			showSearch: true,
+			// 总条数
+			total: 0,
+			// 批量退还保证金表格数据
+			refundbatList: [],
+			// 弹出层标题
+			title: "",
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNum: 1,
+				pageSize: 10,
+				ppid: null,
+				rqbody: null,
+				content: null,
+				index: null,
+				tdrno: null,
+				tfroutmd: null,
+				rtnTrnuid: null,
+				rtnStatus: null,
+				rtnCode: null,
+				rtnSeverity: null,
+				rtnRsbody: null,
+				rtnContent: null,
+				rtnIndex: null,
+				rtnTdrno: null,
+				rtnRefundstat: null,
+				rtnRefundmsg: null,
+				rtnXferprcsts: null,
+				rtnXferprccode: null,
+				rtnDtxferprc: null,
+				rtnMessage: null
+			},
+			// 表单参数
+			form: {},
+			// 表单校验
+			rules: {
+				ppid: [
+					{required: true, message: "采购计划id不能为空", trigger: "blur"}
+				],
+			}
+		};
+	},
+	created() {
+		this.getList();
+	},
+	methods: {
+		/** 查询批量退还保证金列表 */
+		getList() {
+			this.loading = true;
+			listRefundbat(this.queryParams).then(response => {
+				this.refundbatList = response.rows;
+				this.total = response.total;
+				this.loading = false;
+			});
+		},
+		// 取消按钮
+		cancel() {
+			this.open = false;
+			this.reset();
+		},
+		// 表单重置
+		reset() {
+			this.form = {
+				refundbatid: null,
+				ppid: null,
+				trnuid: null,
+				rqbody: null,
+				content: null,
+				index: null,
+				tdrno: null,
+				remark: null,
+				tfroutmd: null,
+				rtnTrnuid: null,
+				rtnStatus: null,
+				rtnCode: null,
+				rtnSeverity: null,
+				rtnRsbody: null,
+				rtnContent: null,
+				rtnIndex: null,
+				rtnTdrno: null,
+				rtnRefundstat: null,
+				rtnRefundmsg: null,
+				rtnXferprcsts: null,
+				rtnXferprccode: null,
+				rtnDtxferprc: null,
+				rtnMessage: null
+			};
+			this.resetForm("form");
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNum = 1;
+			this.getList();
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm("queryForm");
+			this.handleQuery();
+		},
+		// 多选框选中数据
+		handleSelectionChange(selection) {
+			this.ids = selection.map(item => item.refundbatid)
+			this.single = selection.length !== 1
+			this.multiple = !selection.length
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset();
+			this.open = true;
+			this.title = "添加批量退还保证金";
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset();
+			const refundbatid = row.refundbatid || this.ids
+			getRefundbat(refundbatid).then(response => {
+				this.form = response.data;
+				this.open = true;
+				this.title = "修改批量退还保证金";
+			});
+		},
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs["form"].validate(valid => {
+				if (valid) {
+					if (this.form.refundbatid != null) {
+						updateRefundbat(this.form).then(response => {
+							this.$modal.msgSuccess("修改成功");
+							this.open = false;
+							this.getList();
+						});
+					} else {
+						addRefundbat(this.form).then(response => {
+							this.$modal.msgSuccess("新增成功");
+							this.open = false;
+							this.getList();
+						});
+					}
+				}
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const refundbatids = row.refundbatid || this.ids;
+			this.$modal.confirm('是否确认删除批量退还保证金编号为"' + refundbatids + '"的数据项？').then(function () {
+				return delRefundbat(refundbatids);
+			}).then(() => {
+				this.getList();
+				this.$modal.msgSuccess("删除成功");
+			}).catch(() => {
+			});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			this.download('bank/refundbat/export', {
+				...this.queryParams
+			}, `refundbat_${new Date().getTime()}.xlsx`)
+		}
+	}
 };
 </script>

ruoyi-ui/src/views/bank/tenderquery/index.vue

@@ -2,63 +2,18 @@
 	<div class="app-container">
 		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
 				 label-width="68px">
-			<el-form-item label="采购计划" prop="ppid">
+			<el-form-item label="采购公告" prop="ppid">
 				<el-input v-model="queryParams.ppid" placeholder="请输入采购计划id" clearable
 						  @keyup.enter.native="handleQuery"/>
 			</el-form-item>
-			<el-form-item label="交易流水" prop="trnuid">
-				<el-input v-model="queryParams.trnuid" placeholder="请输入客户端交易的唯一流水号建议值为yyyymmdd+序号"
-						  clearable
-						  @keyup.enter.native="handleQuery"/>
-			</el-form-item>
-
-			<el-form-item label="标段id" prop="sgtid" v-if="false">
-				<el-input v-model="queryParams.sgtid" placeholder="请输入标段id" clearable
-						  @keyup.enter.native="handleQuery"/>
-			</el-form-item>
-
-			<el-form-item label="产品编号" prop="rtnPdno">
-				<el-input v-model="queryParams.rtnPdno" placeholder="请输入产品编号" clearable
-						  @keyup.enter.native="handleQuery"/>
-			</el-form-item>
-
-			<el-form-item label="项目编号" prop="rtnPrjno">
-				<el-input v-model="queryParams.rtnPrjno" placeholder="请输入项目编号" clearable
-						  @keyup.enter.native="handleQuery"/>
-			</el-form-item>
-			<el-form-item label="标段id" prop="rtnSgtid">
-				<el-input v-model="queryParams.rtnSgtid" placeholder="请输入标段id" clearable
-						  @keyup.enter.native="handleQuery"/>
-			</el-form-item>
-			<el-form-item label="标段编号" prop="rtnSgtno">
-				<el-input v-model="queryParams.rtnSgtno" placeholder="请输入标段编号" clearable
-						  @keyup.enter.native="handleQuery"/>
-			</el-form-item>
 			<el-form-item label="标段名称" prop="rtnSgtnm">
 				<el-input v-model="queryParams.rtnSgtnm" placeholder="请输入标段名称" clearable
 						  @keyup.enter.native="handleQuery"/>
 			</el-form-item>
-
 			<el-form-item label="标段账号" prop="rtnSgtacctno">
 				<el-input v-model="queryParams.rtnSgtacctno" placeholder="请输入标段账号" clearable
 						  @keyup.enter.native="handleQuery"/>
 			</el-form-item>
-
-			<el-form-item label="核心客户" prop="rtnPltfmcstno">
-				<el-input v-model="queryParams.rtnPltfmcstno" placeholder="请输入核心客户号" clearable
-						  @keyup.enter.native="handleQuery"/>
-			</el-form-item>
-			<el-form-item label="标段状态" prop="rtnSgtst">
-				<el-input v-model="queryParams.rtnSgtst" placeholder="请输入标段状态0-已发标1-已截标2-已开标3-已流标"
-						  clearable
-						  @keyup.enter.native="handleQuery"/>
-			</el-form-item>
-
-			<el-form-item label="客户名称" prop="rtnCstnms">
-				<el-input v-model="queryParams.rtnCstnms" 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>
@@ -67,18 +22,18 @@
 
 		<el-row :gutter="10" class="mb8">
 			<el-col :span="1.5">
-				<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+				<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-if="false"
 						   v-hasPermi="['bank:tenderquery:add']">新增
 				</el-button>
 			</el-col>
 			<el-col :span="1.5">
-				<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+				<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"  v-if="false"
 						   v-hasPermi="['bank:tenderquery:edit']">修改
 				</el-button>
 			</el-col>
 			<el-col :span="1.5">
 				<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
-						   @click="handleDelete"
+						   @click="handleDelete"  v-if="false"
 						   v-hasPermi="['bank:tenderquery:remove']">删除
 				</el-button>
 			</el-col>
@@ -94,7 +49,7 @@
 			<el-table-column type="selection" width="55" align="center"/>
 			<el-table-column label="标段信息查询id" align="center" prop="tenderqueryid" v-if="false"/>
 			<el-table-column label="采购公告" align="center" prop="ppid"/>
-			<el-table-column label="交易流水" align="center" prop="trnuid"  width="100"/>
+			<el-table-column label="交易流水" align="center" prop="trnuid"  width="100"  v-if="false"/>
 			<el-table-column label="报文节点" align="center" prop="rqbody" v-if="false"/>
 			<el-table-column label="标段id" align="center" prop="sgtid" v-if="false"/>
 			<el-table-column label="账号，当标段id为空时,必输" align="center" prop="acctno" v-if="false"/>
@@ -102,9 +57,9 @@
 			<el-table-column label="标段编号，当标段id为空时, 必输" align="center" prop="sgtno" v-if="false"/>
 			<el-table-column label="平台客户编号，当标段id为空时, 必输" align="center" prop="pltfmcstno" v-if="false"/>
 			<el-table-column label="客户端交易的唯一标志" align="center" prop="rtnTrnuid" v-if="false"/>
-			<el-table-column label="交易处理状态" align="center" prop="rtnStatus"  width="100"/>
-			<el-table-column label="处理结果码" align="center" prop="rtnCode"  width="100"/>
-			<el-table-column label="处理结果等级" align="center" prop="rtnSeverity"  width="100">
+			<el-table-column label="交易处理状态" align="center" prop="rtnStatus"  width="100"  v-if="false"/>
+			<el-table-column label="处理结果码" align="center" prop="rtnCode"  width="100"  v-if="false"/>
+			<el-table-column label="处理结果等级" align="center" prop="rtnSeverity"  width="100"  v-if="false">
 				<template slot-scope="scope">
 					<el-tag type="info" v-if="scope.row.rtnSeverity.toLowerCase() === 'info'">info</el-tag>
 					<el-tag type="warning" v-if="scope.row.rtnSeverity.toLowerCase() === 'warn'">warn</el-tag>
@@ -113,12 +68,12 @@
 			</el-table-column>
 			<el-table-column label="处理信息描述" align="center" prop="rtnMessage"  width="100"/>
 			<el-table-column label="报文节点" align="center" prop="rtnRsbody" v-if="false"/>
-			<el-table-column label="产品编号" align="center" prop="rtnPdno"/>
+			<el-table-column label="产品编号" align="center" prop="rtnPdno"  v-if="false"/>
 			<el-table-column label="币种代码01-人民币" align="center" prop="rtnCcycd" v-if="false"/>
-			<el-table-column label="项目编号" align="center" prop="rtnPrjno"/>
-			<el-table-column label="标段ID" align="center" prop="rtnSgtid"  width="150"/>
-			<el-table-column label="标段编号" align="center" prop="rtnSgtno"/>
-			<el-table-column label="标段名称" align="center" prop="rtnSgtnm"/>
+			<el-table-column label="项目编号" align="center" prop="rtnPrjno" width="100"/>
+			<el-table-column label="标段ID" align="center" prop="rtnSgtid"  width="180"/>
+			<el-table-column label="标段编号" align="center" prop="rtnSgtno" width="120"/>
+			<el-table-column label="标段名称" align="center" prop="rtnSgtnm" width="200"/>
 			<el-table-column label="标段账户生成类型0-自动生成 1-自定义账号" align="center" prop="rtnSgtacctgentp"
 							 v-if="false"/>
 			<el-table-column label="标段账号" align="center" prop="rtnSgtacctno"/>
@@ -150,21 +105,21 @@
 				</template>
 			</el-table-column>
 			<el-table-column label="保证金金额" align="center" prop="rtnMrgnamt"  width="100"/>
-			<el-table-column label="发标日期" align="center" prop="rtnStrtsgtdt" width="180"/>
-			<el-table-column label="保证金缴纳截止日期" align="center" prop="rtnMrgnduestopdt" width="180">
+			<el-table-column label="发标日期" align="center" prop="rtnStrtsgtdt" width="100"/>
+			<el-table-column label="保证金缴纳截止日期" align="center" prop="rtnMrgnduestopdt" width="100">
 				<template slot-scope="scope">
 					{{ formatDate(scope.row.rtnMrgnduestopdt, scope.row.rtnMrgnduestoptm) }}
 				</template>
 			</el-table-column>
 			<el-table-column label="保证金缴纳截止时间" align="center" prop="rtnMrgnduestoptm" width="180" v-if="false"/>
-			<el-table-column label="开标日期" align="center" prop="rtnOpntdrdt" width="180">
+			<el-table-column label="开标日期" align="center" prop="rtnOpntdrdt" width="100">
 				<template slot-scope="scope">
 					{{ formatDate(scope.row.rtnOpntdrdt, scope.row.rtnOpntdrtm) }}
 				</template>
 			</el-table-column>
 			<el-table-column label="开标时间" align="center" prop="rtnOpntdrtm" width="180" v-if="false"/>
-			<el-table-column label="到期日期" align="center" prop="rtnExpdt" width="180"/>
-			<el-table-column label="核心客户号" align="center" prop="rtnPltfmcstno"  width="100"/>
+			<el-table-column label="到期日期" align="center" prop="rtnExpdt" width="100"/>
+			<el-table-column label="核心客户号" align="center" prop="rtnPltfmcstno"  v-if="false"/>
 			<el-table-column label="标段状态" align="center" prop="rtnSgtst">
 				<template slot-scope="scope">
 					<el-tag type="info" v-if="scope.row.rtnSgtst * 1 === 0">已发标</el-tag>
@@ -179,11 +134,11 @@
 					<el-tag type="warning" v-if="scope.row.rtnSgtst * 1 === 1">已查</el-tag>
 				</template>
 			</el-table-column>
-			<el-table-column label="客户名称" align="center" prop="rtnCstnms"/>
-			<el-table-column label="账户名称" align="center" prop="rtnAcctnm"/>
-			<el-table-column label="操作" align="center" class-name="small-padding fixed-width"  width="200">
+			<el-table-column label="客户名称" align="center" prop="rtnCstnms"  v-if="false"/>
+			<el-table-column label="账户名称" align="center" prop="rtnAcctnm" v-if="false"/>
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width"  fixed="right" width="120">
 				<template slot-scope="scope">
-					<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+					<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"  v-if="false"
 							   v-hasPermi="['bank:tenderquery:edit']">修改
 					</el-button>
 					<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
@@ -200,132 +155,6 @@
 		<!-- 添加或修改标段信息查询对话框 -->
 		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
 			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
-				<el-form-item label="采购计划id" prop="ppid">
-					<el-input v-model="form.ppid" placeholder="请输入采购计划id"/>
-				</el-form-item>
-				<el-form-item label="客户端交易的唯一流水号建议值为yyyymmdd+序号" prop="trnuid">
-					<el-input v-model="form.trnuid" placeholder="请输入客户端交易的唯一流水号建议值为yyyymmdd+序号"/>
-				</el-form-item>
-				<el-form-item label="报文节点" prop="rqbody">
-					<el-input v-model="form.rqbody" placeholder="请输入报文节点"/>
-				</el-form-item>
-				<el-form-item label="标段id" prop="sgtid">
-					<el-input v-model="form.sgtid" placeholder="请输入标段id"/>
-				</el-form-item>
-				<el-form-item label="账号，当标段id为空时,必输" prop="acctno">
-					<el-input v-model="form.acctno" placeholder="请输入账号，当标段id为空时,必输"/>
-				</el-form-item>
-				<el-form-item label="项目编号，当标段id为空时, 必输" prop="prjno">
-					<el-input v-model="form.prjno" placeholder="请输入项目编号，当标段id为空时, 必输"/>
-				</el-form-item>
-				<el-form-item label="标段编号，当标段id为空时, 必输" prop="sgtno">
-					<el-input v-model="form.sgtno" placeholder="请输入标段编号，当标段id为空时, 必输"/>
-				</el-form-item>
-				<el-form-item label="平台客户编号，当标段id为空时, 必输" prop="pltfmcstno">
-					<el-input v-model="form.pltfmcstno" placeholder="请输入平台客户编号，当标段id为空时, 必输"/>
-				</el-form-item>
-				<el-form-item label="客户端交易的唯一标志" prop="rtnTrnuid">
-					<el-input v-model="form.rtnTrnuid" placeholder="请输入客户端交易的唯一标志"/>
-				</el-form-item>
-				<el-form-item label="处理结果码" prop="rtnCode">
-					<el-input v-model="form.rtnCode" placeholder="请输入处理结果码"/>
-				</el-form-item>
-				<el-form-item label="处理结果等级(info/warn/error)" prop="rtnSeverity">
-					<el-input v-model="form.rtnSeverity" placeholder="请输入处理结果等级(info/warn/error)"/>
-				</el-form-item>
-				<el-form-item label="处理信息描述" prop="rtnMessage">
-					<el-input v-model="form.rtnMessage" type="textarea" placeholder="请输入内容"/>
-				</el-form-item>
-				<el-form-item label="报文节点" prop="rtnRsbody">
-					<el-input v-model="form.rtnRsbody" placeholder="请输入报文节点"/>
-				</el-form-item>
-				<el-form-item label="产品编号" prop="rtnPdno">
-					<el-input v-model="form.rtnPdno" placeholder="请输入产品编号"/>
-				</el-form-item>
-				<el-form-item label="币种代码01-人民币" prop="rtnCcycd">
-					<el-input v-model="form.rtnCcycd" placeholder="请输入币种代码01-人民币"/>
-				</el-form-item>
-				<el-form-item label="项目编号" prop="rtnPrjno">
-					<el-input v-model="form.rtnPrjno" placeholder="请输入项目编号"/>
-				</el-form-item>
-				<el-form-item label="标段id" prop="rtnSgtid">
-					<el-input v-model="form.rtnSgtid" placeholder="请输入标段id"/>
-				</el-form-item>
-				<el-form-item label="标段编号" prop="rtnSgtno">
-					<el-input v-model="form.rtnSgtno" placeholder="请输入标段编号"/>
-				</el-form-item>
-				<el-form-item label="标段名称" prop="rtnSgtnm">
-					<el-input v-model="form.rtnSgtnm" placeholder="请输入标段名称"/>
-				</el-form-item>
-				<el-form-item label="标段账户生成类型0-自动生成 1-自定义账号" prop="rtnSgtacctgentp">
-					<el-input v-model="form.rtnSgtacctgentp"
-							  placeholder="请输入标段账户生成类型0-自动生成 1-自定义账号"/>
-				</el-form-item>
-				<el-form-item label="标段账号" prop="rtnSgtacctno">
-					<el-input v-model="form.rtnSgtacctno" placeholder="请输入标段账号"/>
-				</el-form-item>
-				<el-form-item label="标段类型0-标段模式 2-公共标段模式" prop="rtnSgttp">
-					<el-input v-model="form.rtnSgttp" placeholder="请输入标段类型0-标段模式 2-公共标段模式"/>
-				</el-form-item>
-				<el-form-item label="计息标志0-不计息 1-计息" prop="rtnIntacrlflg">
-					<el-input v-model="form.rtnIntacrlflg" placeholder="请输入计息标志0-不计息 1-计息"/>
-				</el-form-item>
-				<el-form-item label="保密类型0-公开 1-保密" prop="rtnSecrettp">
-					<el-input v-model="form.rtnSecrettp" placeholder="请输入保密类型0-公开 1-保密"/>
-				</el-form-item>
-				<el-form-item label="投标账号白名单校验标志0-不校验 1-校验" prop="rtnTdracctnovrfyflg">
-					<el-input v-model="form.rtnTdracctnovrfyflg"
-							  placeholder="请输入投标账号白名单校验标志0-不校验 1-校验"/>
-				</el-form-item>
-				<el-form-item label="允许截止后投标标志0-不允许 1-允许" prop="rtnAlwafddlntdrflg">
-					<el-input v-model="form.rtnAlwafddlntdrflg" placeholder="请输入允许截止后投标标志0-不允许 1-允许"/>
-				</el-form-item>
-				<el-form-item label="银行退款确认标志0-不需要 1-需要" prop="rtnBnkrfndcfrmflg">
-					<el-input v-model="form.rtnBnkrfndcfrmflg" placeholder="请输入银行退款确认标志0-不需要 1-需要"/>
-				</el-form-item>
-				<el-form-item label="保证金金额 double" prop="rtnMrgnamt">
-					<el-input v-model="form.rtnMrgnamt" placeholder="请输入保证金金额 double"/>
-				</el-form-item>
-				<el-form-item label="保证金缴纳截止日期" prop="rtnMrgnduestopdt">
-					<el-date-picker clearable v-model="form.rtnMrgnduestopdt" type="date" value-format="yyyy-MM-dd"
-									placeholder="请选择保证金缴纳截止日期">
-					</el-date-picker>
-				</el-form-item>
-				<el-form-item label="保证金缴纳截止时间" prop="rtnMrgnduestoptm">
-					<el-date-picker clearable v-model="form.rtnMrgnduestoptm" type="date" value-format="yyyy-MM-dd"
-									placeholder="请选择保证金缴纳截止时间">
-					</el-date-picker>
-				</el-form-item>
-				<el-form-item label="开标日期yyyymmdd" prop="rtnOpntdrdt">
-					<el-date-picker clearable v-model="form.rtnOpntdrdt" type="date" value-format="yyyy-MM-dd"
-									placeholder="请选择开标日期yyyymmdd">
-					</el-date-picker>
-				</el-form-item>
-				<el-form-item label="开标时间hhmmss" prop="rtnOpntdrtm">
-					<el-date-picker clearable v-model="form.rtnOpntdrtm" type="date" value-format="yyyy-MM-dd"
-									placeholder="请选择开标时间hhmmss">
-					</el-date-picker>
-				</el-form-item>
-				<el-form-item label="到期日期yyyymmdd" prop="rtnExpdt">
-					<el-date-picker clearable v-model="form.rtnExpdt" type="date" value-format="yyyy-MM-dd"
-									placeholder="请选择到期日期yyyymmdd">
-					</el-date-picker>
-				</el-form-item>
-				<el-form-item label="核心客户号" prop="rtnPltfmcstno">
-					<el-input v-model="form.rtnPltfmcstno" placeholder="请输入核心客户号"/>
-				</el-form-item>
-				<el-form-item label="标段状态0-已发标1-已截标2-已开标3-已流标" prop="rtnSgtst">
-					<el-input v-model="form.rtnSgtst" placeholder="请输入标段状态0-已发标1-已截标2-已开标3-已流标"/>
-				</el-form-item>
-				<el-form-item label="标段查询状态0-未查1-已查" prop="rtnSgtqryst">
-					<el-input v-model="form.rtnSgtqryst" placeholder="请输入标段查询状态0-未查1-已查"/>
-				</el-form-item>
-				<el-form-item label="客户名称" prop="rtnCstnms">
-					<el-input v-model="form.rtnCstnms" placeholder="请输入客户名称"/>
-				</el-form-item>
-				<el-form-item label="账户名称" prop="rtnAcctnm">
-					<el-input v-model="form.rtnAcctnm" placeholder="请输入账户名称"/>
-				</el-form-item>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="submitForm">确 定</el-button>

ruoyi-ui/src/views/bank/uncleardeposit/index.vue

@@ -2,74 +2,10 @@
 	<div class="app-container">
 		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
 				 label-width="68px">
-			<el-form-item label="采购公告" prop="ppid">
-				<el-input
-					v-model="queryParams.ppid"
-					placeholder="请输入采购计划id"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="流水号" prop="trnuid">
+			<el-form-item label="流水号" prop="rtnSerialno">
 				<el-input
 					v-model="queryParams.trnuid"
-					placeholder="请输入客户端交易的唯一流水号建议值为yyyymmdd+序号"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="中心账号" prop="acctno">
-				<el-input
-					v-model="queryParams.acctno"
-					placeholder="请输入中心账号"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="处理结果码" prop="rtnCode" v-if="false">
-				<el-input
-					v-model="queryParams.rtnCode"
-					placeholder="请输入处理结果码"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="记录总数" prop="rtnRcrdtotnum" v-if="false">
-				<el-input
-					v-model="queryParams.rtnRcrdtotnum"
-					placeholder="请输入记录总数"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="当前页码" prop="rtnCrnpgno" v-if="false">
-				<el-input
-					v-model="queryParams.rtnCrnpgno"
-					placeholder="请输入当前页码"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="每页记录数" prop="rtnPgrcrdnum" v-if="false">
-				<el-input
-					v-model="queryParams.rtnPgrcrdnum"
-					placeholder="请输入每页记录数"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="总页数" prop="rtnTotpgnum" v-if="false">
-				<el-input
-					v-model="queryParams.rtnTotpgnum"
-					placeholder="请输入总页数"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="中心账户名" prop="rtnAssetname">
-				<el-input
-					v-model="queryParams.rtnAssetname"
-					placeholder="请输入中心账户名"
+					placeholder="请输入流水号"
 					clearable
 					@keyup.enter.native="handleQuery"
 				/>
@@ -82,7 +18,7 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="入账账户名" prop="rtnOppassetname">
+			<el-form-item label="入账账户名" prop="rtnOppassetname" label-width="120">
 				<el-input
 					v-model="queryParams.rtnOppassetname"
 					placeholder="请输入入账账户名"
@@ -90,7 +26,7 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="入账账号行号" prop="rtnOppbankno">
+			<el-form-item label="入账账号行号" prop="rtnOppbankno" label-width="120">
 				<el-input
 					v-model="queryParams.rtnOppbankno"
 					placeholder="请输入入账账号行号"
@@ -116,18 +52,6 @@
 				>查询不明保证金
 				</el-button>
 			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="success"
-					plain
-					icon="el-icon-edit"
-					size="mini"
-					:disabled="single"
-					@click="handleUpdate"
-					v-hasPermi="['bank:uncleardeposit:edit']"
-				>同步银行数据
-				</el-button>
-			</el-col>
 			<el-col :span="1.5" v-if="false">
 				<el-button
 					type="danger"
@@ -151,35 +75,36 @@
 				>数据导出
 				</el-button>
 			</el-col>
+			<span style="color:red;">单次查询最多返回100结果，建议缩小日期范围查询</span>
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
 
 		<el-table v-loading="loading" :data="uncleardepositList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center"/>
-			<el-table-column label="查询不明保证金明细" align="center" prop="uncleardepositid"/>
-			<el-table-column label="采购计划id" align="center" prop="ppid"/>
-			<el-table-column label="客户端交易的唯一流水号建议值为yyyymmdd+序号" align="center" prop="trnuid"/>
-			<!-- <el-table-column label="报文节点page查询页码，必输若需跳转到下一页只需修改页码，其他字段不变" align="center"
-							 prop="rqbody"/> -->
-			<el-table-column label="中心账号" align="center" prop="acctno"/>
-			<el-table-column label="中心币种01-人民币" align="center" prop="ccycd"/>
-			<el-table-column label="开始日期格式：yyyymmdd" align="center" prop="begdt"/>
-			<el-table-column label="结束日期格式：yyyymmdd" align="center" prop="enddt"/>
-			<el-table-column label="客户端交易的唯一标志" align="center" prop="rtnTrnuid"/>
-			<el-table-column label="交易处理状态" align="center" prop="rtnStatus"/>
-			<el-table-column label="处理结果码" align="center" prop="rtnCode"/>
-			<el-table-column label="处理结果等级(info/warn/error)" align="center" prop="rtnSeverity"/>
-			<el-table-column label="处理信息描述" align="center" prop="rtnMessage"/>
-			<!-- <el-table-column label="报文节点more是否有下一页，y有，n无" align="center" prop="rtnRsbody"/> -->
-			<el-table-column label="记录总数" align="center" prop="rtnRcrdtotnum"/>
-			<el-table-column label="当前页码" align="center" prop="rtnCrnpgno"/>
-			<el-table-column label="每页记录数" align="center" prop="rtnPgrcrdnum"/>
-			<el-table-column label="总页数" align="center" prop="rtnTotpgnum"/>
-			<el-table-column label="客户基础信息内容循环体报文节点每批最多支持100个" align="center" prop="rtnContent"/>
-			<el-table-column label="交易日期yyyymmdd用于不明保证金退款日期" align="center" prop="rtnTradedate"/>
-			<el-table-column label="流水号用于不明保证金退款流水号" align="center" prop="rtnSerialno"/>
-			<el-table-column label="中心账号" align="center" prop="rtnAssetno"/>
-			<el-table-column label="中心账户名" align="center" prop="rtnAssetname"/>
+			<el-table-column label="查询不明保证金明细" align="center" prop="uncleardepositid" v-if="false"/>
+			<el-table-column label="采购公告" align="center" prop="ppid" v-if="false"/>
+			<el-table-column label="银行流水" align="center" prop="trnuid" v-if="false"/>
+			<el-table-column label="报文节点page查询页码，必输若需跳转到下一页只需修改页码，其他字段不变" align="center"
+							 prop="rqbody" v-if="false"/>
+			<el-table-column label="中心账号" align="center" prop="acctno" v-if="false"/>
+			<el-table-column label="中心币种01-人民币" align="center" prop="ccycd" v-if="false"/>
+			<el-table-column label="开始日期格式：yyyymmdd" align="center" prop="begdt" v-if="false"/>
+			<el-table-column label="结束日期格式：yyyymmdd" align="center" prop="enddt" v-if="false"/>
+			<el-table-column label="银行流水" align="center" prop="rtnTrnuid" v-if="false"/>
+			<el-table-column label="交易处理状态" align="center" prop="rtnStatus" v-if="false"/>
+			<el-table-column label="处理结果码" align="center" prop="rtnCode" v-if="false"/>
+			<el-table-column label="处理结果等级(info/warn/error)" align="center" prop="rtnSeverity" v-if="false"/>
+			<el-table-column label="处理信息描述" align="center" prop="rtnMessage" v-if="false"/>
+			<el-table-column label="报文节点more是否有下一页，y有，n无" align="center" prop="rtnRsbody" v-if="false"/>
+			<el-table-column label="记录总数" align="center" prop="rtnRcrdtotnum" v-if="false"/>
+			<el-table-column label="当前页码" align="center" prop="rtnCrnpgno" v-if="false"/>
+			<el-table-column label="每页记录数" align="center" prop="rtnPgrcrdnum" v-if="false"/>
+			<el-table-column label="总页数" align="center" prop="rtnTotpgnum" v-if="false"/>
+			<el-table-column label="客户基础信息内容循环体报文节点每批最多支持100个" align="center" prop="rtnContent" v-if="false"/>
+			<el-table-column label="交易日期(用于不明保证金退款日期)" align="center" prop="rtnTradedate"/>
+			<el-table-column label="流水号(用于不明保证金退款流水号)" align="center" prop="rtnSerialno"/>
+			<el-table-column label="中心账号" align="center" prop="rtnAssetno" v-if="false"/>
+			<el-table-column label="中心账户名" align="center" prop="rtnAssetname" v-if="false"/>
 			<el-table-column label="入账账号" align="center" prop="rtnOppassetno"/>
 			<el-table-column label="入账账户名" align="center" prop="rtnOppassetname"/>
 			<el-table-column label="入账账号行号" align="center" prop="rtnOppbankno"/>
@@ -196,8 +121,7 @@
 						icon="el-icon-edit"
 						@click="handleUpdate(scope.row)"
 						v-hasPermi="['bank:uncleardeposit:edit']"
-					>修改
-					</el-button>
+					>退还保证金</el-button>
 					<el-button
 						size="mini"
 						type="text"
@@ -419,12 +343,6 @@ export default {
 			this.$refs["form"].validate(valid => {
 				if (valid) {
 					if ((this.form.begdt != null) && (this.form.enddt != null)) {
-						updateUncleardeposit(this.form).then(response => {
-							this.$modal.msgSuccess("修改成功");
-							this.open = false;
-							this.getList();
-						});
-					} else {
 						addUncleardeposit(this.form).then(response => {
 							this.$modal.msgSuccess("新增成功");
 							this.open = false;

ruoyi-ui/src/views/bank/uncleardepositrfnd/index.vue

@@ -1,543 +1,444 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="采购计划" prop="ppid">
-        <el-input
-          v-model="queryParams.ppid"
-          placeholder="请输入采购计划id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="流水号" prop="trnuid">
-        <el-input
-          v-model="queryParams.trnuid"
-          placeholder="请输入客户端交易的唯一流水号建议值为yyyymmdd+序号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="报文节点" prop="rqbody">
-        <el-input
-          v-model="queryParams.rqbody"
-          placeholder="请输入报文节点"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="原入账流水号“。" prop="serialno">
-        <el-input
-          v-model="queryParams.serialno"
-          placeholder="请输入原入账交易流水号注：对应“查询不明保证金明细”接口响应字段中“serialno 流水号“。"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="原入账会计日期" prop="tradedate">
-        <el-input
-          v-model="queryParams.tradedate"
-          placeholder="请输入原入账会计日期yyyymmdd注：对应“查询不明保证金明细”接口响应字段中“tradedate 交易日期”"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="退款金额" prop="destbailamt">
-        <el-input
-          v-model="queryParams.destbailamt"
-          placeholder="请输入退款金额注：退款金额需等于查询不明保证金明细”接口响应字段中”amt 交易金额“，不明保证金明细查询接口中交易金额和可退款金额必须相等才可以退款。"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="交易唯一标志" prop="rtnTrnuid">
-        <el-input
-          v-model="queryParams.rtnTrnuid"
-          placeholder="请输入客户端交易的唯一标志"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="处理结果码" prop="rtnCode">
-        <el-input
-          v-model="queryParams.rtnCode"
-          placeholder="请输入处理结果码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="项目编号" prop="rtnPrjno">
-        <el-input
-          v-model="queryParams.rtnPrjno"
-          placeholder="请输入项目编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="标段编号" prop="rtnSgtno">
-        <el-input
-          v-model="queryParams.rtnSgtno"
-          placeholder="请输入标段编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="标段id" prop="rtnSgtid">
-        <el-input
-          v-model="queryParams.rtnSgtid"
-          placeholder="请输入标段id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="投标编号" prop="rtnTenderid">
-        <el-input
-          v-model="queryParams.rtnTenderid"
-          placeholder="请输入投标编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="退款时收款户名" prop="rtnAcctname">
-        <el-input
-          v-model="queryParams.rtnAcctname"
-          placeholder="请输入退款时收款户名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="退款时收款行号" prop="rtnBankname">
-        <el-input
-          v-model="queryParams.rtnBankname"
-          placeholder="请输入退款时收款行号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="退还金额" prop="rtnRefundamt">
-        <el-input
-          v-model="queryParams.rtnRefundamt"
-          placeholder="请输入退还金额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备注" prop="rtnRemark">
-        <el-input
-          v-model="queryParams.rtnRemark"
-          placeholder="请输入备注"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="指令处理状态报文节点" prop="rtnXferprcsts">
-        <el-input
-          v-model="queryParams.rtnXferprcsts"
-          placeholder="请输入指令处理状态报文节点"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="指令状态编码" prop="rtnXferprccode">
-        <el-input
-          v-model="queryParams.rtnXferprccode"
-          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>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+				 label-width="68px">
+			<el-form-item label="原入账流水号" prop="serialno" label-width="120">
+				<el-input
+					v-model="queryParams.serialno"
+					placeholder="请输入原入账交易流水号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="原入账会计日期" prop="tradedate" label-width="120">
+				<el-input
+					v-model="queryParams.tradedate"
+					placeholder="请输入原入账会计日期"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="退款时收款户名" prop="rtnAcctname" label-width="120">
+				<el-input
+					v-model="queryParams.rtnAcctname"
+					placeholder="请输入退款时收款户名"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="退款时收款行号" prop="rtnBankname" label-width="120">
+				<el-input
+					v-model="queryParams.rtnBankname"
+					placeholder="请输入退款时收款行号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="退还金额" prop="rtnRefundamt">
+				<el-input
+					v-model="queryParams.rtnRefundamt"
+					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-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['bank:uncleardepositrfnd:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['bank:uncleardepositrfnd:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['bank:uncleardepositrfnd:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['bank:uncleardepositrfnd:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button
+					type="warning"
+					plain
+					icon="el-icon-download"
+					size="mini"
+					@click="handleExport"
+					v-hasPermi="['bank:uncleardepositrfnd:export']"
+				>导出
+				</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
 
-    <el-table v-loading="loading" :data="uncleardepositrfndList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="不明保证金退款申请id" align="center" prop="uncleardepositrfndid" />
-      <el-table-column label="采购计划id" align="center" prop="ppid" />
-      <el-table-column label="客户端交易的唯一流水号建议值为yyyymmdd+序号" align="center" prop="trnuid" />
-      <el-table-column label="报文节点" align="center" prop="rqbody" />
-      <el-table-column label="原入账交易流水号注：对应“查询不明保证金明细”接口响应字段中“serialno 流水号“。" align="center" prop="serialno" />
-      <el-table-column label="原入账会计日期yyyymmdd注：对应“查询不明保证金明细”接口响应字段中“tradedate 交易日期”" align="center" prop="tradedate" />
-      <el-table-column label="退款金额注：退款金额需等于查询不明保证金明细”接口响应字段中”amt 交易金额“，不明保证金明细查询接口中交易金额和可退款金额必须相等才可以退款。" align="center" prop="destbailamt" />
-      <el-table-column label="客户端交易的唯一标志" align="center" prop="rtnTrnuid" />
-      <el-table-column label="交易处理状态" align="center" prop="rtnStatus" />
-      <el-table-column label="处理结果码" align="center" prop="rtnCode" />
-      <el-table-column label="处理结果等级(info/warn/error)" align="center" prop="rtnSeverity" />
-      <el-table-column label="报文节点" align="center" prop="rtnRsbody" />
-      <el-table-column label="项目编号" align="center" prop="rtnPrjno" />
-      <el-table-column label="标段编号" align="center" prop="rtnSgtno" />
-      <el-table-column label="退款状态tbsp_success-执行成功tbsp_fail-执行失败tbsp_process-处理中" align="center" prop="rtnRecordstate" />
-      <el-table-column label="标段id" align="center" prop="rtnSgtid" />
-      <el-table-column label="投标编号" align="center" prop="rtnTenderid" />
-      <el-table-column label="退还方式general_bail-一般保证金keep_bail-长期保证金cash_bail-现金guarantee_bail-保函" align="center" prop="rtnRefundflag" />
-      <el-table-column label="退款方式principal-本金退还" align="center" prop="rtnRefundtype" />
-      <el-table-column label="退款时收款账号" align="center" prop="rtnAcctid" />
-      <el-table-column label="退款时收款币种" align="center" prop="rtnCurrency" />
-      <el-table-column label="退款时收款户名" align="center" prop="rtnAcctname" />
-      <el-table-column label="退款时收款行号" align="center" prop="rtnBankname" />
-      <el-table-column label="退还金额" align="center" prop="rtnRefundamt" />
-      <el-table-column label="备注" align="center" prop="rtnRemark" />
-      <el-table-column label="指令处理状态报文节点" align="center" prop="rtnXferprcsts" />
-      <el-table-column label="指令状态编码" align="center" prop="rtnXferprccode" />
-      <el-table-column label="指令处理时间yyyymmdd hhmmss" align="center" prop="rtnDtxferprc" />
-      <el-table-column label="指令处理信息" align="center" prop="rtnMessage" />
-      <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="handleUpdate(scope.row)"
-            v-hasPermi="['bank:uncleardepositrfnd:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['bank:uncleardepositrfnd:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+		<el-table v-loading="loading" :data="uncleardepositrfndList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center"/>
+			<el-table-column label="不明保证金退款申请id" align="center" prop="uncleardepositrfndid" v-if="false"/>
+			<el-table-column label="采购计划id" align="center" prop="ppid" v-if="false"/>
+			<el-table-column label="客户端交易的唯一流水号建议值为yyyymmdd+序号" align="center" prop="trnuid"
+							 v-if="false"/>
+			<el-table-column label="报文节点" align="center" prop="rqbody" v-if="false"/>
+			<el-table-column label="原入账交易流水号" align="center" prop="serialno" width="160"/>
+			<el-table-column label="原入账会计日期" align="center" prop="tradedate"/>
+			<el-table-column label="退款金额" align="center" prop="destbailamt"/>
+			<el-table-column label="客户端交易的唯一标志" align="center" prop="rtnTrnuid" v-if="false"/>
+			<el-table-column label="交易处理状态" align="center" prop="rtnStatus" v-if="false"/>
+			<el-table-column label="处理结果码" align="center" prop="rtnCode" v-if="false"/>
+			<el-table-column label="处理结果等级(info/warn/error)" align="center" prop="rtnSeverity" v-if="false"/>
+			<el-table-column label="报文节点" align="center" prop="rtnRsbody" v-if="false"/>
+			<el-table-column label="项目编号" align="center" prop="rtnPrjno" v-if="false"/>
+			<el-table-column label="标段编号" align="center" prop="rtnSgtno" v-if="false"/>
+			<el-table-column label="退款状态" align="center"
+							 prop="rtnRecordstate">
+				<template slot-scope="scope">
+					<el-tag type="info" v-if="scope.row.rtnRecordstate.toLowerCase()==='tbsp_success' ">执行成功</el-tag>
+					<el-tag type="warning" v-if="scope.row.rtnRecordstate.toLowerCase()==='tbsp_fail' ">执行失败</el-tag>
+					<el-tag type="warning" v-if="scope.row.rtnRecordstate.toLowerCase()==='tbsp_process' ">处理中</el-tag>
+				</template>
+			</el-table-column>
+			<el-table-column label="标段id" align="center" prop="rtnSgtid" v-if="false"/>
+			<el-table-column label="投标编号" align="center" prop="rtnTenderid" width="160"/>
+			<el-table-column
+				label="退还方式"
+				align="center" prop="rtnRefundflag">
+				<template slot-scope="scope">
+					<el-tag type="info" v-if="scope.row.rtnRefundflag.toLowerCase()==='general_bail' ">一般保证金</el-tag>
+					<el-tag type="warning" v-if="scope.row.rtnRefundflag.toLowerCase()==='keep_bail' ">长期保证金</el-tag>
+					<el-tag type="warning" v-if="scope.row.rtnRefundflag.toLowerCase()==='cash_bail' ">现金</el-tag>
+					<el-tag type="warning" v-if="scope.row.rtnRefundflag.toLowerCase()==='guarantee_bail' ">保函</el-tag>
+				</template>
+			</el-table-column>
+			<el-table-column label="退款方式" align="center" prop="rtnRefundtype">
+				<template slot-scope="scope">
+					<el-tag type="info" v-if="scope.row.rtnRefundtype.toLowerCase()==='principal' ">本金退还</el-tag>
+				</template>
+			</el-table-column>
+			<el-table-column label="退款时收款账号" align="center" prop="rtnAcctid"/>
+			<el-table-column label="退款时收款币种" align="center" prop="rtnCurrency"/>
+			<el-table-column label="退款时收款户名" align="center" prop="rtnAcctname"/>
+			<el-table-column label="退款时收款行号" align="center" prop="rtnBankname"/>
+			<el-table-column label="退还金额" align="center" prop="rtnRefundamt"/>
+			<el-table-column label="备注" align="center" prop="rtnRemark"/>
+			<el-table-column label="指令处理状态报文节点" align="center" prop="rtnXferprcsts" v-if="false"/>
+			<el-table-column label="指令状态编码" align="center" prop="rtnXferprccode"/>
+			<el-table-column label="指令处理时间" align="center" prop="rtnDtxferprc"/>
+			<el-table-column label="指令处理信息" align="center" prop="rtnMessage"/>
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="80">
+				<template slot-scope="scope">
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-delete"
+						@click="handleDelete(scope.row)"
+						v-hasPermi="['bank:uncleardepositrfnd:remove']"
+					>删除
+					</el-button>
+				</template>
+			</el-table-column>
+		</el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+		<pagination
+			v-show="total>0"
+			:total="total"
+			:page.sync="queryParams.pageNum"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList"
+		/>
 
-    <!-- 添加或修改不明保证金退款申请对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="采购计划id" prop="ppid">
-          <el-input v-model="form.ppid" placeholder="请输入采购计划id" />
-        </el-form-item>
-        <el-form-item label="客户端交易的唯一流水号建议值为yyyymmdd+序号" prop="trnuid">
-          <el-input v-model="form.trnuid" placeholder="请输入客户端交易的唯一流水号建议值为yyyymmdd+序号" />
-        </el-form-item>
-        <el-form-item label="报文节点" prop="rqbody">
-          <el-input v-model="form.rqbody" placeholder="请输入报文节点" />
-        </el-form-item>
-        <el-form-item label="原入账交易流水号注：对应“查询不明保证金明细”接口响应字段中“serialno 流水号“。" prop="serialno">
-          <el-input v-model="form.serialno" placeholder="请输入原入账交易流水号注：对应“查询不明保证金明细”接口响应字段中“serialno 流水号“。" />
-        </el-form-item>
-        <el-form-item label="原入账会计日期yyyymmdd注：对应“查询不明保证金明细”接口响应字段中“tradedate 交易日期”" prop="tradedate">
-          <el-input v-model="form.tradedate" placeholder="请输入原入账会计日期yyyymmdd注：对应“查询不明保证金明细”接口响应字段中“tradedate 交易日期”" />
-        </el-form-item>
-        <el-form-item label="退款金额注：退款金额需等于查询不明保证金明细”接口响应字段中”amt 交易金额“，不明保证金明细查询接口中交易金额和可退款金额必须相等才可以退款。" prop="destbailamt">
-          <el-input v-model="form.destbailamt" placeholder="请输入退款金额注：退款金额需等于查询不明保证金明细”接口响应字段中”amt 交易金额“，不明保证金明细查询接口中交易金额和可退款金额必须相等才可以退款。" />
-        </el-form-item>
-        <el-form-item label="客户端交易的唯一标志" prop="rtnTrnuid">
-          <el-input v-model="form.rtnTrnuid" placeholder="请输入客户端交易的唯一标志" />
-        </el-form-item>
-        <el-form-item label="处理结果码" prop="rtnCode">
-          <el-input v-model="form.rtnCode" placeholder="请输入处理结果码" />
-        </el-form-item>
-        <el-form-item label="处理结果等级(info/warn/error)" prop="rtnSeverity">
-          <el-input v-model="form.rtnSeverity" placeholder="请输入处理结果等级(info/warn/error)" />
-        </el-form-item>
-        <el-form-item label="报文节点" prop="rtnRsbody">
-          <el-input v-model="form.rtnRsbody" placeholder="请输入报文节点" />
-        </el-form-item>
-        <el-form-item label="项目编号" prop="rtnPrjno">
-          <el-input v-model="form.rtnPrjno" placeholder="请输入项目编号" />
-        </el-form-item>
-        <el-form-item label="标段编号" prop="rtnSgtno">
-          <el-input v-model="form.rtnSgtno" placeholder="请输入标段编号" />
-        </el-form-item>
-        <el-form-item label="退款状态tbsp_success-执行成功tbsp_fail-执行失败tbsp_process-处理中" prop="rtnRecordstate">
-          <el-input v-model="form.rtnRecordstate" placeholder="请输入退款状态tbsp_success-执行成功tbsp_fail-执行失败tbsp_process-处理中" />
-        </el-form-item>
-        <el-form-item label="标段id" prop="rtnSgtid">
-          <el-input v-model="form.rtnSgtid" placeholder="请输入标段id" />
-        </el-form-item>
-        <el-form-item label="投标编号" prop="rtnTenderid">
-          <el-input v-model="form.rtnTenderid" placeholder="请输入投标编号" />
-        </el-form-item>
-        <el-form-item label="退还方式general_bail-一般保证金keep_bail-长期保证金cash_bail-现金guarantee_bail-保函" prop="rtnRefundflag">
-          <el-input v-model="form.rtnRefundflag" placeholder="请输入退还方式general_bail-一般保证金keep_bail-长期保证金cash_bail-现金guarantee_bail-保函" />
-        </el-form-item>
-        <el-form-item label="退款时收款账号" prop="rtnAcctid">
-          <el-input v-model="form.rtnAcctid" placeholder="请输入退款时收款账号" />
-        </el-form-item>
-        <el-form-item label="退款时收款币种" prop="rtnCurrency">
-          <el-input v-model="form.rtnCurrency" placeholder="请输入退款时收款币种" />
-        </el-form-item>
-        <el-form-item label="退款时收款户名" prop="rtnAcctname">
-          <el-input v-model="form.rtnAcctname" placeholder="请输入退款时收款户名" />
-        </el-form-item>
-        <el-form-item label="退款时收款行号" prop="rtnBankname">
-          <el-input v-model="form.rtnBankname" placeholder="请输入退款时收款行号" />
-        </el-form-item>
-        <el-form-item label="退还金额" prop="rtnRefundamt">
-          <el-input v-model="form.rtnRefundamt" placeholder="请输入退还金额" />
-        </el-form-item>
-        <el-form-item label="备注" prop="rtnRemark">
-          <el-input v-model="form.rtnRemark" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="指令处理状态报文节点" prop="rtnXferprcsts">
-          <el-input v-model="form.rtnXferprcsts" placeholder="请输入指令处理状态报文节点" />
-        </el-form-item>
-        <el-form-item label="指令状态编码" prop="rtnXferprccode">
-          <el-input v-model="form.rtnXferprccode" placeholder="请输入指令状态编码" />
-        </el-form-item>
-        <el-form-item label="指令处理时间yyyymmdd hhmmss" prop="rtnDtxferprc">
-          <el-input v-model="form.rtnDtxferprc" placeholder="请输入指令处理时间yyyymmdd hhmmss" />
-        </el-form-item>
-        <el-form-item label="指令处理信息" prop="rtnMessage">
-          <el-input v-model="form.rtnMessage" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
+		<!-- 添加或修改不明保证金退款申请对话框 -->
+		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
+				<el-form-item label="采购计划id" prop="ppid">
+					<el-input v-model="form.ppid" placeholder="请输入采购计划id"/>
+				</el-form-item>
+				<el-form-item label="客户端交易的唯一流水号建议值为yyyymmdd+序号" prop="trnuid">
+					<el-input v-model="form.trnuid" placeholder="请输入客户端交易的唯一流水号建议值为yyyymmdd+序号"/>
+				</el-form-item>
+				<el-form-item label="报文节点" prop="rqbody">
+					<el-input v-model="form.rqbody" placeholder="请输入报文节点"/>
+				</el-form-item>
+				<el-form-item label="原入账交易流水号注：对应“查询不明保证金明细”接口响应字段中“serialno 流水号“。"
+							  prop="serialno">
+					<el-input v-model="form.serialno"
+							  placeholder="请输入原入账交易流水号注：对应“查询不明保证金明细”接口响应字段中“serialno 流水号“。"/>
+				</el-form-item>
+				<el-form-item
+					label="原入账会计日期yyyymmdd注：对应“查询不明保证金明细”接口响应字段中“tradedate 交易日期”"
+					prop="tradedate">
+					<el-input v-model="form.tradedate"
+							  placeholder="请输入原入账会计日期yyyymmdd注：对应“查询不明保证金明细”接口响应字段中“tradedate 交易日期”"/>
+				</el-form-item>
+				<el-form-item
+					label="退款金额注：退款金额需等于查询不明保证金明细”接口响应字段中”amt 交易金额“，不明保证金明细查询接口中交易金额和可退款金额必须相等才可以退款。"
+					prop="destbailamt">
+					<el-input v-model="form.destbailamt"
+							  placeholder="请输入退款金额注：退款金额需等于查询不明保证金明细”接口响应字段中”amt 交易金额“，不明保证金明细查询接口中交易金额和可退款金额必须相等才可以退款。"/>
+				</el-form-item>
+				<el-form-item label="客户端交易的唯一标志" prop="rtnTrnuid">
+					<el-input v-model="form.rtnTrnuid" placeholder="请输入客户端交易的唯一标志"/>
+				</el-form-item>
+				<el-form-item label="处理结果码" prop="rtnCode">
+					<el-input v-model="form.rtnCode" placeholder="请输入处理结果码"/>
+				</el-form-item>
+				<el-form-item label="处理结果等级(info/warn/error)" prop="rtnSeverity">
+					<el-input v-model="form.rtnSeverity" placeholder="请输入处理结果等级(info/warn/error)"/>
+				</el-form-item>
+				<el-form-item label="报文节点" prop="rtnRsbody">
+					<el-input v-model="form.rtnRsbody" placeholder="请输入报文节点"/>
+				</el-form-item>
+				<el-form-item label="项目编号" prop="rtnPrjno">
+					<el-input v-model="form.rtnPrjno" placeholder="请输入项目编号"/>
+				</el-form-item>
+				<el-form-item label="标段编号" prop="rtnSgtno">
+					<el-input v-model="form.rtnSgtno" placeholder="请输入标段编号"/>
+				</el-form-item>
+				<el-form-item label="退款状态tbsp_success-执行成功tbsp_fail-执行失败tbsp_process-处理中"
+							  prop="rtnRecordstate">
+					<el-input v-model="form.rtnRecordstate"
+							  placeholder="请输入退款状态tbsp_success-执行成功tbsp_fail-执行失败tbsp_process-处理中"/>
+				</el-form-item>
+				<el-form-item label="标段id" prop="rtnSgtid">
+					<el-input v-model="form.rtnSgtid" placeholder="请输入标段id"/>
+				</el-form-item>
+				<el-form-item label="投标编号" prop="rtnTenderid">
+					<el-input v-model="form.rtnTenderid" placeholder="请输入投标编号"/>
+				</el-form-item>
+				<el-form-item
+					label="退还方式general_bail-一般保证金keep_bail-长期保证金cash_bail-现金guarantee_bail-保函"
+					prop="rtnRefundflag">
+					<el-input v-model="form.rtnRefundflag"
+							  placeholder="请输入退还方式general_bail-一般保证金keep_bail-长期保证金cash_bail-现金guarantee_bail-保函"/>
+				</el-form-item>
+				<el-form-item label="退款时收款账号" prop="rtnAcctid">
+					<el-input v-model="form.rtnAcctid" placeholder="请输入退款时收款账号"/>
+				</el-form-item>
+				<el-form-item label="退款时收款币种" prop="rtnCurrency">
+					<el-input v-model="form.rtnCurrency" placeholder="请输入退款时收款币种"/>
+				</el-form-item>
+				<el-form-item label="退款时收款户名" prop="rtnAcctname">
+					<el-input v-model="form.rtnAcctname" placeholder="请输入退款时收款户名"/>
+				</el-form-item>
+				<el-form-item label="退款时收款行号" prop="rtnBankname">
+					<el-input v-model="form.rtnBankname" placeholder="请输入退款时收款行号"/>
+				</el-form-item>
+				<el-form-item label="退还金额" prop="rtnRefundamt">
+					<el-input v-model="form.rtnRefundamt" placeholder="请输入退还金额"/>
+				</el-form-item>
+				<el-form-item label="备注" prop="rtnRemark">
+					<el-input v-model="form.rtnRemark" placeholder="请输入备注"/>
+				</el-form-item>
+				<el-form-item label="指令处理状态报文节点" prop="rtnXferprcsts">
+					<el-input v-model="form.rtnXferprcsts" placeholder="请输入指令处理状态报文节点"/>
+				</el-form-item>
+				<el-form-item label="指令状态编码" prop="rtnXferprccode">
+					<el-input v-model="form.rtnXferprccode" placeholder="请输入指令状态编码"/>
+				</el-form-item>
+				<el-form-item label="指令处理时间yyyymmdd hhmmss" prop="rtnDtxferprc">
+					<el-input v-model="form.rtnDtxferprc" placeholder="请输入指令处理时间yyyymmdd hhmmss"/>
+				</el-form-item>
+				<el-form-item label="指令处理信息" prop="rtnMessage">
+					<el-input v-model="form.rtnMessage" type="textarea" placeholder="请输入内容"/>
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitForm">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+	</div>
 </template>
 
 <script>
-import { listUncleardepositrfnd, getUncleardepositrfnd, delUncleardepositrfnd, addUncleardepositrfnd, updateUncleardepositrfnd } from "@/api/bank/uncleardepositrfnd";
+import {
+	listUncleardepositrfnd,
+	getUncleardepositrfnd,
+	delUncleardepositrfnd,
+	addUncleardepositrfnd,
+	updateUncleardepositrfnd
+} from "@/api/bank/uncleardepositrfnd";
 
 export default {
-  name: "Uncleardepositrfnd",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 不明保证金退款申请表格数据
-      uncleardepositrfndList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        ppid: null,
-        trnuid: null,
-        rqbody: null,
-        serialno: null,
-        tradedate: null,
-        destbailamt: null,
-        rtnTrnuid: null,
-        rtnStatus: null,
-        rtnCode: null,
-        rtnSeverity: null,
-        rtnRsbody: null,
-        rtnPrjno: null,
-        rtnSgtno: null,
-        rtnRecordstate: null,
-        rtnSgtid: null,
-        rtnTenderid: null,
-        rtnRefundflag: null,
-        rtnRefundtype: null,
-        rtnAcctid: null,
-        rtnCurrency: null,
-        rtnAcctname: null,
-        rtnBankname: null,
-        rtnRefundamt: null,
-        rtnRemark: null,
-        rtnXferprcsts: null,
-        rtnXferprccode: null,
-        rtnDtxferprc: null,
-        rtnMessage: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        ppid: [
-          { required: true, message: "采购计划id不能为空", trigger: "blur" }
-        ],
-        trnuid: [
-          { required: true, message: "客户端交易的唯一流水号建议值为yyyymmdd+序号不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询不明保证金退款申请列表 */
-    getList() {
-      this.loading = true;
-      listUncleardepositrfnd(this.queryParams).then(response => {
-        this.uncleardepositrfndList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        uncleardepositrfndid: null,
-        ppid: null,
-        trnuid: null,
-        rqbody: null,
-        serialno: null,
-        tradedate: null,
-        destbailamt: null,
-        rtnTrnuid: null,
-        rtnStatus: null,
-        rtnCode: null,
-        rtnSeverity: null,
-        rtnRsbody: null,
-        rtnPrjno: null,
-        rtnSgtno: null,
-        rtnRecordstate: null,
-        rtnSgtid: null,
-        rtnTenderid: null,
-        rtnRefundflag: null,
-        rtnRefundtype: null,
-        rtnAcctid: null,
-        rtnCurrency: null,
-        rtnAcctname: null,
-        rtnBankname: null,
-        rtnRefundamt: null,
-        rtnRemark: null,
-        rtnXferprcsts: null,
-        rtnXferprccode: null,
-        rtnDtxferprc: null,
-        rtnMessage: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.uncleardepositrfndid)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加不明保证金退款申请";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const uncleardepositrfndid = row.uncleardepositrfndid || this.ids
-      getUncleardepositrfnd(uncleardepositrfndid).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改不明保证金退款申请";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.uncleardepositrfndid != null) {
-            updateUncleardepositrfnd(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addUncleardepositrfnd(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const uncleardepositrfndids = row.uncleardepositrfndid || this.ids;
-      this.$modal.confirm('是否确认删除不明保证金退款申请编号为"' + uncleardepositrfndids + '"的数据项？').then(function() {
-        return delUncleardepositrfnd(uncleardepositrfndids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('bank/uncleardepositrfnd/export', {
-        ...this.queryParams
-      }, `uncleardepositrfnd_${new Date().getTime()}.xlsx`)
-    }
-  }
+	name: "Uncleardepositrfnd",
+	data() {
+		return {
+			// 遮罩层
+			loading: true,
+			// 选中数组
+			ids: [],
+			// 非单个禁用
+			single: true,
+			// 非多个禁用
+			multiple: true,
+			// 显示搜索条件
+			showSearch: true,
+			// 总条数
+			total: 0,
+			// 不明保证金退款申请表格数据
+			uncleardepositrfndList: [],
+			// 弹出层标题
+			title: "",
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNum: 1,
+				pageSize: 10,
+				ppid: null,
+				trnuid: null,
+				rqbody: null,
+				serialno: null,
+				tradedate: null,
+				destbailamt: null,
+				rtnTrnuid: null,
+				rtnStatus: null,
+				rtnCode: null,
+				rtnSeverity: null,
+				rtnRsbody: null,
+				rtnPrjno: null,
+				rtnSgtno: null,
+				rtnRecordstate: null,
+				rtnSgtid: null,
+				rtnTenderid: null,
+				rtnRefundflag: null,
+				rtnRefundtype: null,
+				rtnAcctid: null,
+				rtnCurrency: null,
+				rtnAcctname: null,
+				rtnBankname: null,
+				rtnRefundamt: null,
+				rtnRemark: null,
+				rtnXferprcsts: null,
+				rtnXferprccode: null,
+				rtnDtxferprc: null,
+				rtnMessage: null
+			},
+			// 表单参数
+			form: {},
+			// 表单校验
+			rules: {
+				ppid: [
+					{required: true, message: "采购计划id不能为空", trigger: "blur"}
+				],
+				trnuid: [
+					{required: true, message: "客户端交易的唯一流水号建议值为yyyymmdd+序号不能为空", trigger: "blur"}
+				],
+			}
+		};
+	},
+	created() {
+		this.getList();
+	},
+	methods: {
+		/** 查询不明保证金退款申请列表 */
+		getList() {
+			this.loading = true;
+			listUncleardepositrfnd(this.queryParams).then(response => {
+				this.uncleardepositrfndList = response.rows;
+				this.total = response.total;
+				this.loading = false;
+			});
+		},
+		// 取消按钮
+		cancel() {
+			this.open = false;
+			this.reset();
+		},
+		// 表单重置
+		reset() {
+			this.form = {
+				uncleardepositrfndid: null,
+				ppid: null,
+				trnuid: null,
+				rqbody: null,
+				serialno: null,
+				tradedate: null,
+				destbailamt: null,
+				rtnTrnuid: null,
+				rtnStatus: null,
+				rtnCode: null,
+				rtnSeverity: null,
+				rtnRsbody: null,
+				rtnPrjno: null,
+				rtnSgtno: null,
+				rtnRecordstate: null,
+				rtnSgtid: null,
+				rtnTenderid: null,
+				rtnRefundflag: null,
+				rtnRefundtype: null,
+				rtnAcctid: null,
+				rtnCurrency: null,
+				rtnAcctname: null,
+				rtnBankname: null,
+				rtnRefundamt: null,
+				rtnRemark: null,
+				rtnXferprcsts: null,
+				rtnXferprccode: null,
+				rtnDtxferprc: null,
+				rtnMessage: null
+			};
+			this.resetForm("form");
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNum = 1;
+			this.getList();
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm("queryForm");
+			this.handleQuery();
+		},
+		// 多选框选中数据
+		handleSelectionChange(selection) {
+			this.ids = selection.map(item => item.uncleardepositrfndid)
+			this.single = selection.length !== 1
+			this.multiple = !selection.length
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset();
+			this.open = true;
+			this.title = "添加不明保证金退款申请";
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset();
+			const uncleardepositrfndid = row.uncleardepositrfndid || this.ids
+			getUncleardepositrfnd(uncleardepositrfndid).then(response => {
+				this.form = response.data;
+				this.open = true;
+				this.title = "修改不明保证金退款申请";
+			});
+		},
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs["form"].validate(valid => {
+				if (valid) {
+					if (this.form.uncleardepositrfndid != null) {
+						updateUncleardepositrfnd(this.form).then(response => {
+							this.$modal.msgSuccess("修改成功");
+							this.open = false;
+							this.getList();
+						});
+					} else {
+						addUncleardepositrfnd(this.form).then(response => {
+							this.$modal.msgSuccess("新增成功");
+							this.open = false;
+							this.getList();
+						});
+					}
+				}
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const uncleardepositrfndids = row.uncleardepositrfndid || this.ids;
+			this.$modal.confirm('是否确认删除不明保证金退款申请编号为"' + uncleardepositrfndids + '"的数据项？').then(function () {
+				return delUncleardepositrfnd(uncleardepositrfndids);
+			}).then(() => {
+				this.getList();
+				this.$modal.msgSuccess("删除成功");
+			}).catch(() => {
+			});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			this.download('bank/uncleardepositrfnd/export', {
+				...this.queryParams
+			}, `uncleardepositrfnd_${new Date().getTime()}.xlsx`)
+		}
+	}
 };
 </script>