Merge remote-tracking branch 'origin/master'

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

@@ -16,7 +16,9 @@ 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.RemoteBidNoticeService;
 import com.ruoyi.system.api.RemotePlanService;
+import com.ruoyi.system.api.domain.BidNotice;
 import kong.unirest.core.HttpResponse;
 import kong.unirest.core.Unirest;
 import org.springframework.beans.BeanUtils;
@@ -63,6 +65,9 @@ public class BankDepositController extends BaseController {
     @Autowired
     private BankRefundbatController bankRefundbatController;
 
+    @Autowired
+    private RemoteBidNoticeService remoteBidNoticeService;
+
     /**
      * 查询查询保证金入账数量列表
      */
@@ -71,6 +76,17 @@ public class BankDepositController extends BaseController {
     public TableDataInfo list(BankDeposit bankDeposit) {
         startPage();
         List<BankDeposit> list = bankDepositService.selectBankDepositList(bankDeposit);
+
+        Long[] uids = list.stream().map(BankDeposit::getPpid).toArray(Long[]::new);
+
+        if(uids.length>0){
+            List<BidNotice> blist = remoteBidNoticeService.selectBidNoticeByUids(uids, SecurityConstants.INNER);
+
+            for (int i = 0; i < list.size(); i++) {
+                list.get(i).setCggg(JsonUtils.getBidNoticeName(list.get(i).getPpid(), blist));
+            }
+        }
+
         return getDataTable(list);
     }
 

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

@@ -6,11 +6,15 @@ import java.util.List;
 import java.util.Random;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.uuid.UUID;
 import com.ruoyi.common.security.annotation.InnerAuth;
 import com.ruoyi.mast.bank.domain.BankRefundbat;
+import com.ruoyi.mast.bank.domain.BankUncleardeposit;
 import com.ruoyi.mast.bank.utils.JsonUtils;
+import com.ruoyi.system.api.RemoteBidNoticeService;
+import com.ruoyi.system.api.domain.BidNotice;
 import kong.unirest.core.HttpResponse;
 import kong.unirest.core.Unirest;
 import org.apache.poi.hpsf.Decimal;
@@ -51,6 +55,9 @@ public class BankDepositdescController extends BaseController {
     @Autowired
     private Environment env;
 
+    @Autowired
+    private RemoteBidNoticeService remoteBidNoticeService;
+
     /**
      * 查询查询保证金入账明细列表
      */
@@ -59,6 +66,17 @@ public class BankDepositdescController extends BaseController {
     public TableDataInfo list(BankDepositdesc bankDepositdesc) {
         startPage();
         List<BankDepositdesc> list = bankDepositdescService.selectBankDepositdescList(bankDepositdesc);
+
+        Long[] uids = list.stream().map(BankDepositdesc::getPpid).toArray(Long[]::new);
+
+        if(uids.length>0){
+            List<BidNotice> blist = remoteBidNoticeService.selectBidNoticeByUids(uids, SecurityConstants.INNER);
+
+            for (int i = 0; i < list.size(); i++) {
+                list.get(i).setCggg(JsonUtils.getBidNoticeName(list.get(i).getPpid(), blist));
+            }
+        }
+
         return getDataTable(list);
     }
 

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

@@ -3,6 +3,12 @@ package com.ruoyi.mast.bank.controller;
 import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.core.constant.SecurityConstants;
+import com.ruoyi.mast.bank.domain.BankUncleardeposit;
+import com.ruoyi.mast.bank.utils.JsonUtils;
+import com.ruoyi.system.api.RemoteBidNoticeService;
+import com.ruoyi.system.api.domain.BidNotice;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -35,6 +41,9 @@ public class BankDepositdescrController extends BaseController
     @Autowired
     private IBankDepositdescrService bankDepositdescrService;
 
+    @Autowired
+    private RemoteBidNoticeService remoteBidNoticeService;
+
     /**
      * 查询查询保证金入账明细r列表
      */
@@ -44,6 +53,17 @@ public class BankDepositdescrController extends BaseController
     {
         startPage();
         List<BankDepositdescr> list = bankDepositdescrService.selectBankDepositdescrList(bankDepositdescr);
+
+        Long[] uids = list.stream().map(BankDepositdescr::getPpid).toArray(Long[]::new);
+
+        if(uids.length>0){
+            List<BidNotice> blist = remoteBidNoticeService.selectBidNoticeByUids(uids, SecurityConstants.INNER);
+
+            for (int i = 0; i < list.size(); i++) {
+                list.get(i).setCggg(JsonUtils.getBidNoticeName(list.get(i).getPpid(), blist));
+            }
+        }
+
         for(BankDepositdescr item : list){
             if("3".equals(item.getRtnRfndst())){
                 item.setStatus("退款处理中");
@@ -55,6 +75,7 @@ public class BankDepositdescrController extends BaseController
                 item.setStatus("未申请退款");
             }
         }
+
         return getDataTable(list);
     }
 

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

@@ -7,11 +7,15 @@ import java.io.IOException;
 import java.util.Random;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.uuid.UUID;
 import com.ruoyi.mast.bank.domain.BankTenderpub;
+import com.ruoyi.mast.bank.domain.BankUncleardeposit;
 import com.ruoyi.mast.bank.utils.JsonUtils;
+import com.ruoyi.system.api.RemoteBidNoticeService;
 import com.ruoyi.system.api.RemotePlanService;
+import com.ruoyi.system.api.domain.BidNotice;
 import kong.unirest.core.HttpResponse;
 import kong.unirest.core.Unirest;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,6 +53,9 @@ public class BankRefundController extends BaseController {
     @Autowired
     private Environment env;
 
+    @Autowired
+    private RemoteBidNoticeService remoteBidNoticeService;
+
     /**
      * 查询查询保证金退款信息列表
      */
@@ -57,6 +64,17 @@ public class BankRefundController extends BaseController {
     public TableDataInfo list(BankRefund bankRefund) {
         startPage();
         List<BankRefund> list = bankRefundService.selectBankRefundList(bankRefund);
+
+        Long[] uids = list.stream().map(BankRefund::getPpid).toArray(Long[]::new);
+
+        if(uids.length>0){
+            List<BidNotice> blist = remoteBidNoticeService.selectBidNoticeByUids(uids, SecurityConstants.INNER);
+
+            for (int i = 0; i < list.size(); i++) {
+                list.get(i).setCggg(JsonUtils.getBidNoticeName(list.get(i).getPpid(), blist));
+            }
+        }
+
         return getDataTable(list);
     }
 

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

@@ -7,12 +7,16 @@ import java.io.IOException;
 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.BankUncleardeposit;
 import com.ruoyi.mast.bank.utils.JsonUtils;
+import com.ruoyi.system.api.RemoteBidNoticeService;
 import com.ruoyi.system.api.RemotePlanService;
+import com.ruoyi.system.api.domain.BidNotice;
 import kong.unirest.core.HttpResponse;
 import kong.unirest.core.Unirest;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,6 +54,9 @@ public class BankRefundbatController extends BaseController {
     @Autowired
     private Environment env;
 
+    @Autowired
+    private RemoteBidNoticeService remoteBidNoticeService;
+
     /**
      * 查询批量退还保证金列表
      */
@@ -58,6 +65,17 @@ public class BankRefundbatController extends BaseController {
     public TableDataInfo list(BankRefundbat bankRefundbat) {
         startPage();
         List<BankRefundbat> list = bankRefundbatService.selectBankRefundbatList(bankRefundbat);
+
+        Long[] uids = list.stream().map(BankRefundbat::getPpid).toArray(Long[]::new);
+
+        if(uids.length>0){
+            List<BidNotice> blist = remoteBidNoticeService.selectBidNoticeByUids(uids, SecurityConstants.INNER);
+
+            for (int i = 0; i < list.size(); i++) {
+                list.get(i).setCggg(JsonUtils.getBidNoticeName(list.get(i).getPpid(), blist));
+            }
+        }
+
         return getDataTable(list);
     }
 

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

@@ -47,9 +47,6 @@ public class BankUncleardepositController extends BaseController {
     @Autowired
     private BankUncleardepositrfndController bankUncleardepositrfndController;
 
-    @Autowired
-    private RemotePlanService remotePlanService;
-
     @Autowired
     private Environment env;
 
@@ -61,6 +58,7 @@ public class BankUncleardepositController extends BaseController {
     public TableDataInfo list(BankUncleardeposit bankUncleardeposit) {
         startPage();
         List<BankUncleardeposit> list = bankUncleardepositService.selectBankUncleardepositList(bankUncleardeposit);
+
         for(BankUncleardeposit item : list){
             if(item.getRtnXferprccode() == null){
                 item.setStatus("未申请退款");

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

@@ -6,11 +6,15 @@ import java.io.IOException;
 import java.util.Random;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.uuid.UUID;
 import com.ruoyi.mast.bank.domain.BankTenderpub;
+import com.ruoyi.mast.bank.domain.BankUncleardeposit;
 import com.ruoyi.mast.bank.utils.JsonUtils;
+import com.ruoyi.system.api.RemoteBidNoticeService;
 import com.ruoyi.system.api.RemotePlanService;
+import com.ruoyi.system.api.domain.BidNotice;
 import kong.unirest.core.HttpResponse;
 import kong.unirest.core.Unirest;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,6 +62,7 @@ public class BankUncleardepositrfndController extends BaseController
     {
         startPage();
         List<BankUncleardepositrfnd> list = bankUncleardepositrfndService.selectBankUncleardepositrfndList(bankUncleardepositrfnd);
+
         return getDataTable(list);
     }
 

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

@@ -26,6 +26,18 @@ public class BankDeposit extends BaseEntity
     @Excel(name = "客户端交易的唯一流水号建议值为YYYYMMDD+序号")
     private String trnuid;
 
+    /** 采购公告 */
+    @Excel(name = "采购公告")
+    private String cggg;
+
+    public String getCggg() {
+        return cggg;
+    }
+
+    public void setCggg(String cggg) {
+        this.cggg = cggg;
+    }
+
     /** 报文节点 */
     @Excel(name = "报文节点")
     private String rqbody;

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

@@ -23,6 +23,18 @@ public class BankDepositdesc extends BaseEntity
     @Excel(name = "采购计划id")
     private Long ppid;
 
+    /** 采购公告 */
+    @Excel(name = "采购公告")
+    private String cggg;
+
+    public String getCggg() {
+        return cggg;
+    }
+
+    public void setCggg(String cggg) {
+        this.cggg = cggg;
+    }
+
     /** 客户端交易的唯一流水号建议值为yyyymmdd+序号 */
     @Excel(name = "客户端交易的唯一流水号建议值为yyyymmdd+序号")
     private String trnuid;

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

@@ -23,6 +23,18 @@ public class BankDepositdescr extends BaseEntity
     @Excel(name = "采购计划id")
     private Long ppid;
 
+    /** 采购公告 */
+    @Excel(name = "采购公告")
+    private String cggg;
+
+    public String getCggg() {
+        return cggg;
+    }
+
+    public void setCggg(String cggg) {
+        this.cggg = cggg;
+    }
+
     /** 客户端交易的唯一流水号建议值为yyyymmdd+序号 */
     @Excel(name = "客户端交易的唯一流水号建议值为yyyymmdd+序号")
     private String trnuid;

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

@@ -23,6 +23,18 @@ public class BankRefund extends BaseEntity
     @Excel(name = "采购计划id")
     private Long ppid;
 
+    /** 采购公告 */
+    @Excel(name = "采购公告")
+    private String cggg;
+
+    public String getCggg() {
+        return cggg;
+    }
+
+    public void setCggg(String cggg) {
+        this.cggg = cggg;
+    }
+
     /** 客户端交易的唯一流水号建议值为yyyymmdd+序号 */
     @Excel(name = "客户端交易的唯一流水号建议值为yyyymmdd+序号")
     private String trnuid;

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

@@ -22,6 +22,18 @@ public class BankRefundbat extends BaseEntity
     @Excel(name = "采购计划id")
     private Long ppid;
 
+    /** 采购公告 */
+    @Excel(name = "采购公告")
+    private String cggg;
+
+    public String getCggg() {
+        return cggg;
+    }
+
+    public void setCggg(String cggg) {
+        this.cggg = cggg;
+    }
+
     /** 客户端交易的唯一流水号建议值为yyyymmdd+序号 */
     private String trnuid;
 

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

@@ -23,6 +23,18 @@ public class BankUncleardepositrfnd extends BaseEntity
     @Excel(name = "采购计划id")
     private Long ppid;
 
+    /** 采购公告 */
+    @Excel(name = "采购公告")
+    private String cggg;
+
+    public String getCggg() {
+        return cggg;
+    }
+
+    public void setCggg(String cggg) {
+        this.cggg = cggg;
+    }
+
     /** 客户端交易的唯一流水号建议值为yyyymmdd+序号 */
     @Excel(name = "客户端交易的唯一流水号建议值为yyyymmdd+序号")
     private String trnuid;

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

@@ -112,7 +112,7 @@
     <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" v-if="false"/>
-      <el-table-column label="采购公告" align="center" prop="ppid" />
+      <el-table-column label="采购公告" align="center" prop="cggg" />
       <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"/>

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

@@ -51,7 +51,7 @@
 		<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" width="200"/>
+			<el-table-column label="采购公告" align="center" prop="cggg" 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" v-if="false"/>

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

@@ -75,7 +75,7 @@
     <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="cggg" 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"/>

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

@@ -34,7 +34,7 @@
 		<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="cggg"/>
 			<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"/>

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

@@ -48,7 +48,7 @@
 		<el-table v-loading="loading" :data="tenderqueryList" @selection-change="handleSelectionChange">
 			<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="cggg"/>
 			<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"/>