采购公告改名

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

@@ -0,0 +1,24 @@
+package com.ruoyi.system.api;
+
+import com.ruoyi.common.core.constant.SecurityConstants;
+import com.ruoyi.common.core.constant.ServiceNameConstants;
+import com.ruoyi.system.api.domain.BidNotice;
+import com.ruoyi.system.api.factory.RemoteBidNoticeFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author GMCS
+ * @version 1.0
+ * @title RemoteBidNoticeService
+ * @description
+ * @create 2024/6/3 11:03
+ */
+@FeignClient(contextId = "RemoteBidNoticeService", value = ServiceNameConstants.BIDDING_SERVICE, fallbackFactory = RemoteBidNoticeFallbackFactory.class)
+public interface RemoteBidNoticeService {
+
+    @PostMapping("/notice/selectBidNoticeByUids/{uids}")
+    public List<BidNotice> selectBidNoticeByUids(@PathVariable("uids") Long[] uids, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+}

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

@@ -0,0 +1,520 @@
+package com.ruoyi.system.api.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 招标公告对象 bid_notice
+ * 
+ * @author ruoyi
+ * @date 2023-11-19
+ */
+public class BidNotice extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 招标公告ID */
+    private Long uid;
+
+    /** 招标项目ID */
+    @Excel(name = "招标项目ID")
+    private Long sid;
+
+    /** 公告标题 */
+    @Excel(name = "公告标题")
+    private String uTitle;
+
+    /** 关联项目 */
+    @Excel(name = "关联项目")
+    private String uProject;
+
+    /** 项目资金 */
+    @Excel(name = "项目资金")
+    private BigDecimal uMoney;
+
+    /** 标书获取时间/报名开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "标书获取时间/报名开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date uGetTime;
+
+    /** 接受答疑时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "接受答疑时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date uAcceptTime;
+
+    /** 投标截止时间/获取标书截止时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "投标截止时间/获取标书截止时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date uEndTime;
+
+    /** 开标时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "开标时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date uKaiTime;
+
+    /** 附件集 */
+    @Excel(name = "附件集")
+    private String fjAnnex;
+
+    /** 招标公告审批状态 */
+    @Excel(name = "招标公告审批状态")
+    private Long fjStatus;
+
+    /** 内容 */
+    @Excel(name = "内容")
+    private String fjRemark;
+
+	/** 状态为已发布  公告公示时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "状态为已发布  公告公示时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date uUpdateTime;
+	
+	/** 公告类型，字典中定义 */
+    @Excel(name = "公告类型，字典中定义")
+    private Long fjType;
+
+
+    private BidTender bidTender;//招标项目
+
+    private List<Result> results;
+
+    private Long hid;
+
+    /** 关联表招标项目编号 */
+    @Excel(name = "关联表招标项目编号")
+    private String sCode;
+
+    public String getsCode() {
+        return sCode;
+    }
+
+    public void setsCode(String sCode) {
+        this.sCode = sCode;
+    }
+
+    /**
+     * 仅用来查询子表
+     */
+    @Excel(name = "采购单位")
+    private String sUnit;
+
+
+    private PpmApprovalRecord editor;
+
+    /**
+     * 仅用来查询子表
+     */
+    @Excel(name = "供应商库名称")
+    private String materialName;
+
+    private Integer aid;
+
+    private String buyingMode;
+
+    private String quoteMode;
+
+    private String enrollStarttime;
+
+    private String enrollEndtime;
+
+    private Long isEarnest;
+
+    private Long status;
+
+    private Long intervalTime;
+
+    private Long qid;
+
+    private Long sProjectState;
+
+    private String sName;
+
+    /**
+     * 审批意见详情，存入审批记录
+     */
+    private String opinionDetails;
+
+    private Long isSign;
+
+    private Long ownerDept;
+
+    private String hName;
+
+    private String ownerDepts;
+
+    private String bankAccount;
+
+    private Integer isSms;
+
+    public String getOpinionDetails() {
+        return opinionDetails;
+    }
+
+    public void setOpinionDetails(String opinionDetails) {
+        this.opinionDetails = opinionDetails;
+    }
+
+    public PpmApprovalRecord getEditor() {
+        return editor;
+    }
+
+    public void setEditor(PpmApprovalRecord editor) {
+        this.editor = editor;
+    }
+
+    public String getMaterialName() {
+        return materialName;
+    }
+
+    public void setMaterialName(String materialName) {
+        this.materialName = materialName;
+    }
+
+    public String getsUnit() {
+        return sUnit;
+    }
+
+    public void setsUnit(String sUnit) {
+        this.sUnit = sUnit;
+    }
+
+    public void setResults(List<Result> results)
+    {
+        this.results = results;
+    }
+
+    public List<Result> getResults()
+    {
+        return results;
+    }
+
+    public void setBidTender(BidTender bidTender)
+    {
+        this.bidTender = bidTender;
+    }
+
+    public BidTender getBidTender()
+    {
+        return bidTender;
+    }
+
+    public void setuUpdateTime(Date uUpdateTime)
+    {
+        this.uUpdateTime = uUpdateTime;
+    }
+
+    public Date getuUpdateTime()
+    {
+        return uUpdateTime;
+    }
+
+    public void setUid(Long uid) 
+    {
+        this.uid = uid;
+    }
+
+    public Long getUid() 
+    {
+        return uid;
+    }
+    public void setSid(Long sid) 
+    {
+        this.sid = sid;
+    }
+
+    public Long getSid() 
+    {
+        return sid;
+    }
+    public void setuTitle(String uTitle) 
+    {
+        this.uTitle = uTitle;
+    }
+
+    public String getuTitle() 
+    {
+        return uTitle;
+    }
+    public void setuProject(String uProject)
+    {
+        this.uProject = uProject;
+    }
+
+    public String getuProject()
+    {
+        return uProject;
+    }
+    public void setuMoney(BigDecimal uMoney)
+    {
+        this.uMoney = uMoney;
+    }
+
+    public BigDecimal getuMoney()
+    {
+        return uMoney;
+    }
+    public void setuGetTime(Date uGetTime) 
+    {
+        this.uGetTime = uGetTime;
+    }
+
+    public Date getuGetTime() 
+    {
+        return uGetTime;
+    }
+    public void setuAcceptTime(Date uAcceptTime) 
+    {
+        this.uAcceptTime = uAcceptTime;
+    }
+
+    public Date getuAcceptTime() 
+    {
+        return uAcceptTime;
+    }
+    public void setuEndTime(Date uEndTime) 
+    {
+        this.uEndTime = uEndTime;
+    }
+
+    public Date getuEndTime() 
+    {
+        return uEndTime;
+    }
+    public void setuKaiTime(Date uKaiTime) 
+    {
+        this.uKaiTime = uKaiTime;
+    }
+
+    public Date getuKaiTime() 
+    {
+        return uKaiTime;
+    }
+    public void setFjAnnex(String fjAnnex)
+    {
+        this.fjAnnex = fjAnnex;
+    }
+
+    public String getFjAnnex()
+    {
+        return fjAnnex;
+    }
+    public void setFjStatus(Long fjStatus) 
+    {
+        this.fjStatus = fjStatus;
+    }
+
+    public Long getFjStatus() 
+    {
+        return fjStatus;
+    }
+    public void setFjRemark(String fjRemark) 
+    {
+        this.fjRemark = fjRemark;
+    }
+
+    public String getFjRemark() 
+    {
+        return fjRemark;
+    }
+
+    public Long getFjType() {
+        return fjType;
+    }
+
+    public void setFjType(Long fjType) {
+        this.fjType = fjType;
+    }
+
+    public Integer getAid() {
+        return aid;
+    }
+
+    public void setAid(Integer aid) {
+        this.aid = aid;
+    }
+
+    public String getBuyingMode() {
+        return buyingMode;
+    }
+
+    public void setBuyingMode(String buyingMode) {
+        this.buyingMode = buyingMode;
+    }
+
+    public String getQuoteMode() {
+        return quoteMode;
+    }
+
+    public void setQuoteMode(String quoteMode) {
+        this.quoteMode = quoteMode;
+    }
+
+    public String getEnrollStarttime() {
+        return enrollStarttime;
+    }
+
+    public void setEnrollStarttime(String enrollStarttime) {
+        this.enrollStarttime = enrollStarttime;
+    }
+
+    public String getEnrollEndtime() {
+        return enrollEndtime;
+    }
+
+    public void setEnrollEndtime(String enrollEndtime) {
+        this.enrollEndtime = enrollEndtime;
+    }
+
+    public Long getIsEarnest() {
+        return isEarnest;
+    }
+
+    public void setIsEarnest(Long isEarnest) {
+        this.isEarnest = isEarnest;
+    }
+
+    public Long getIntervalTime() {
+        return intervalTime;
+    }
+
+    public void setIntervalTime(Long intervalTime) {
+        this.intervalTime = intervalTime;
+    }
+
+    public Long getStatus() {
+        return status;
+    }
+
+    public void setStatus(Long status) {
+        this.status = status;
+    }
+
+    public Long getQid() {
+        return qid;
+    }
+
+    public void setQid(Long qid) {
+        this.qid = qid;
+    }
+
+    public Long getsProjectState() {
+        return sProjectState;
+    }
+
+    public void setsProjectState(Long sProjectState) {
+        this.sProjectState = sProjectState;
+    }
+
+    public String getsName() {
+        return sName;
+    }
+
+    public void setsName(String sName) {
+        this.sName = sName;
+    }
+
+    public String getOwnerDepts() {
+        return ownerDepts;
+    }
+
+    public void setOwnerDepts(String ownerDepts) {
+        this.ownerDepts = ownerDepts;
+    }
+
+
+    public Long getHid() {
+        return hid;
+    }
+
+    public void setHid(Long hid) {
+        this.hid = hid;
+    }
+
+    public Long getIsSign() {
+        return isSign;
+    }
+
+    public void setIsSign(Long isSign) {
+        this.isSign = isSign;
+    }
+
+    public Long getOwnerDept() {
+        return ownerDept;
+    }
+
+    public void setOwnerDept(Long ownerDept) {
+        this.ownerDept = ownerDept;
+    }
+
+    public String gethName() {
+        return hName;
+    }
+
+    public void sethName(String hName) {
+        this.hName = hName;
+    }
+
+    public Integer getIsSms() {
+        return isSms;
+    }
+
+    public void setIsSms(Integer isSms) {
+        this.isSms = isSms;
+    }
+
+    public String getBankAccount() {
+        return bankAccount;
+    }
+
+    public void setBankAccount(String bankAccount) {
+        this.bankAccount = bankAccount;
+    }
+
+    @Override
+    public String toString() {
+        return "BidNotice{" +
+                "uid=" + uid +
+                ", sid=" + sid +
+                ", uTitle='" + uTitle + '\'' +
+                ", uProject='" + uProject + '\'' +
+                ", uMoney=" + uMoney +
+                ", uGetTime=" + uGetTime +
+                ", uAcceptTime=" + uAcceptTime +
+                ", uEndTime=" + uEndTime +
+                ", uKaiTime=" + uKaiTime +
+                ", fjAnnex='" + fjAnnex + '\'' +
+                ", fjStatus=" + fjStatus +
+                ", fjRemark='" + fjRemark + '\'' +
+                ", uUpdateTime=" + uUpdateTime +
+                ", fjType=" + fjType +
+                ", bidTender=" + bidTender +
+                ", results=" + results +
+                ", hid=" + hid +
+                ", sCode='" + sCode + '\'' +
+                ", sUnit='" + sUnit + '\'' +
+                ", editor=" + editor +
+                ", materialName='" + materialName + '\'' +
+                ", aid=" + aid +
+                ", buyingMode='" + buyingMode + '\'' +
+                ", quoteMode='" + quoteMode + '\'' +
+                ", enrollStarttime='" + enrollStarttime + '\'' +
+                ", enrollEndtime='" + enrollEndtime + '\'' +
+                ", isEarnest=" + isEarnest +
+                ", status=" + status +
+                ", intervalTime=" + intervalTime +
+                ", qid=" + qid +
+                ", sProjectState=" + sProjectState +
+                ", sName='" + sName + '\'' +
+                ", opinionDetails='" + opinionDetails + '\'' +
+                ", isSign=" + isSign +
+                ", ownerDept=" + ownerDept +
+                ", hName='" + hName + '\'' +
+                ", ownerDepts='" + ownerDepts + '\'' +
+                '}';
+    }
+}

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

@@ -0,0 +1,42 @@
+package com.ruoyi.system.api.domain;
+
+import java.io.Serializable;
+
+public class Result implements Serializable {
+    private String name;
+    private String url;
+
+    private Long size;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setSize(Long size) {
+        this.size = size;
+    }
+
+    public Long getSize() {
+        return size;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    @Override
+    public String toString() {
+        return "Result{" +
+                "name='" + name + '\'' +
+                ", url='" + url + '\'' +
+                ", size='" + size + '\'' +
+                '}';
+    }
+}

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

@@ -0,0 +1,36 @@
+package com.ruoyi.system.api.factory;
+
+import com.ruoyi.system.api.RemoteBidNoticeService;
+import com.ruoyi.system.api.domain.BidNotice;
+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 RemoteBidNoticeFallbackFactory
+ * @description
+ * @create 2024/9/20 8:51
+ */
+@Component
+public class RemoteBidNoticeFallbackFactory implements FallbackFactory<RemoteBidNoticeService> {
+
+    private static final Logger log = LoggerFactory.getLogger(RemoteBidNoticeFallbackFactory.class);
+
+    @Override
+    public RemoteBidNoticeService create(Throwable cause) {
+
+        log.error("采购公告服务调用失败:{}", cause.getMessage());
+        return new RemoteBidNoticeService()
+        {
+            @Override
+            public List<BidNotice> selectBidNoticeByUids(Long[] uids, String source) {
+                return null;
+            }
+        };
+    }
+}

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

@@ -8,4 +8,5 @@ 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.RemoteDepositFallbackFactory
+com.ruoyi.system.api.factory.RemoteDepositFallbackFactory
+com.ruoyi.system.api.factory.RemoteBidNoticeFallbackFactory

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

@@ -1,15 +1,15 @@
 package com.hh.bidding.controller;
 
-import java.math.BigDecimal;
 import java.util.*;
 import javax.servlet.http.HttpServletResponse;
 
 import com.alibaba.fastjson.JSON;
 import com.hh.bidding.domain.*;
+import com.hh.bidding.domain.BidNotice;
 import com.hh.bidding.domain.BidTender;
+import com.hh.bidding.domain.Result;
 import com.hh.bidding.service.IBidTenderService;
 import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.security.annotation.InnerAuth;
@@ -23,7 +23,6 @@ import org.springframework.validation.annotation.Validated;
 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.hh.bidding.service.IBidNoticeService;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
@@ -184,6 +183,13 @@ public class BidNoticeController extends BaseController {
         return success(bidNotice);
     }
 
+    @InnerAuth
+    @Log(title = "招标公告批量查询", businessType = BusinessType.EXPORT)
+    @PostMapping("/selectBidNoticeByUids/{uids}")
+    public List<BidNotice> selectBidNoticeByUids(@PathVariable("uids") Long[] uids) {
+        return bidNoticeService.selectBidNoticeByUids(uids);
+    }
+
     /**
      * 新增招标公告
      */

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

@@ -14,6 +14,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.nacos.common.utils.MD5Utils;
 import com.hh.bidding.domain.*;
+import com.hh.bidding.domain.BidNotice;
 import com.hh.bidding.domain.BidTender;
 import com.hh.bidding.domain.BidWinningResults;
 import com.hh.bidding.service.*;

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

@@ -152,4 +152,11 @@ public interface BidNoticeMapper
      * @return
      */
     public List<BidNotice> findBidOpenBySupplier(BidNoticeAndMaterial bidNoticeAndMaterial);
+
+    /**
+     * 批量查询
+     * @param uids
+     * @return
+     */
+    public List<BidNotice> selectBidNoticeByUids(Long[] uids);
 }

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

@@ -60,6 +60,13 @@ public interface IBidNoticeService
      */
     public int deleteBidNoticeByUids(Long[] uids);
 
+    /**
+     * 批量查询
+     * @param uids
+     * @return
+     */
+    public List<BidNotice> selectBidNoticeByUids(Long[] uids);
+
     /**
      * 删除招标公告信息
      * 

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

@@ -194,4 +194,14 @@ public class BidNoticeServiceImpl implements IBidNoticeService
     public List<BidNotice> findBidOpenBySupplier(BidNoticeAndMaterial bidNoticeAndMaterial) {
         return bidNoticeMapper.findBidOpenBySupplier(bidNoticeAndMaterial);
     }
+
+    /**
+     * 批量查询
+     * @param uids
+     * @return
+     */
+    @Override
+    public List<BidNotice> selectBidNoticeByUids(Long[] uids){
+        return bidNoticeMapper.selectBidNoticeByUids(uids);
+    }
 }

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

@@ -46,6 +46,18 @@
         from bid_notice n inner join bid_tender t on n.sid = t.sid
     </sql>
 
+    <sql id="selectBidNoticeVo3">
+        select uid,
+               sid,
+               u_title,
+               u_project,
+               u_money,
+               fj_status,
+               fj_type,
+               bank_account
+        from bid_notice
+    </sql>
+
     <select id="selectBidNoticeList" parameterType="com.hh.bidding.domain.BidNotice" resultMap="BidNoticeResult">
         <include refid="selectBidNoticeVo"/>
         <where>
@@ -262,6 +274,14 @@
         </foreach>
     </delete>
 
+    <select id="selectBidNoticeByUids" parameterType="String" resultMap="BidNoticeResult">
+        <include refid="selectBidNoticeVo3"/>
+        where uid in
+        <foreach item="uid" collection="array" open="(" separator="," close=")">
+            #{uid}
+        </foreach>
+    </select>
+
     <select id="findTwoInfo" resultMap="TwoTableResult" parameterType="Long">
         select n.uid uid,u_title,u_project,u_money,u_get_time,u_accept_time,u_end_time,u_kai_time,fj_remark,fj_annex,fj_status,u_updateTime,fj_type,t.*
         from bid_notice n inner join bid_tender t on n.sid = t.sid where uid=#{uid}

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

@@ -10,6 +10,7 @@ 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.utils.JsonUtils;
+import com.ruoyi.system.api.RemoteBidNoticeService;
 import com.ruoyi.system.api.RemotePlanService;
 import kong.unirest.core.HttpResponse;
 import kong.unirest.core.Unirest;
@@ -46,9 +47,6 @@ public class BankAccrualController extends BaseController
     @Autowired
     private IBankAccrualService bankAccrualService;
 
-    @Autowired
-    private RemotePlanService remotePlanService;
-
     @Autowired
     private Environment env;
 

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

@@ -44,10 +44,6 @@ public class BankDepositleftController extends BaseController {
     @Autowired
     private IBankDepositleftService bankDepositleftService;
 
-
-    @Autowired
-    private RemotePlanService remotePlanService;
-
     @Autowired
     private Environment env;
 

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

@@ -46,9 +46,6 @@ public class BankFrzandpenaltyController extends BaseController
     @Autowired
     private IBankFrzandpenaltyService bankFrzandpenaltyService;
 
-    @Autowired
-    private RemotePlanService remotePlanService;
-
     @Autowired
     private Environment env;
 

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

@@ -46,9 +46,6 @@ public class BankRefundController extends BaseController {
     @Autowired
     private IBankRefundService bankRefundService;
 
-    @Autowired
-    private RemotePlanService remotePlanService;
-
     @Autowired
     private Environment env;
 

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

@@ -47,9 +47,6 @@ public class BankRefundbatController extends BaseController {
     @Autowired
     private IBankRefundbatService bankRefundbatService;
 
-    @Autowired
-    private RemotePlanService remotePlanService;
-
     @Autowired
     private Environment env;
 

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

@@ -45,10 +45,6 @@ public class BankRefundmgrController extends BaseController {
     @Autowired
     private IBankRefundmgrService bankRefundmgrService;
 
-
-    @Autowired
-    private RemotePlanService remotePlanService;
-
     @Autowired
     private Environment env;
 

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

@@ -46,9 +46,6 @@ public class BankSubaccoutapplyController extends BaseController
     @Autowired
     private IBankSubaccoutapplyService bankSubaccoutapplyService;
 
-    @Autowired
-    private RemotePlanService remotePlanService;
-
     @Autowired
     private Environment env;
 

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

@@ -45,9 +45,6 @@ public class BankTenderdelController extends BaseController {
     @Autowired
     private IBankTenderdelService bankTenderdelService;
 
-    @Autowired
-    private RemotePlanService remotePlanService;
-
     @Autowired
     private Environment env;
 

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

@@ -45,9 +45,6 @@ public class BankTendereditController extends BaseController {
     @Autowired
     private IBankTendereditService bankTendereditService;
 
-    @Autowired
-    private RemotePlanService remotePlanService;
-
     @Autowired
     private Environment env;
 

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

@@ -4,8 +4,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
+import java.util.stream.Collectors;
 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;
@@ -13,7 +15,9 @@ import com.ruoyi.mast.bank.domain.*;
 import com.ruoyi.mast.bank.service.IBankRefundService;
 import com.ruoyi.mast.bank.service.IBankTenderqueryService;
 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;
@@ -61,7 +65,7 @@ public class BankTenderpubController extends BaseController {
     private IBankRefundService bankRefundService;
 
     @Autowired
-    private RemotePlanService remotePlanService;
+    private RemoteBidNoticeService remoteBidNoticeService;
 
     @Autowired
     private Environment env;
@@ -74,9 +78,22 @@ public class BankTenderpubController extends BaseController {
     public TableDataInfo list(BankTenderpub bankTenderpub) {
         startPage();
         List<BankTenderpub> list = bankTenderpubService.selectBankTenderpubList(bankTenderpub);
+
+        Long[] uids = list.stream().map(BankTenderpub::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/BankTenderqueryController.java

@@ -10,7 +10,9 @@ 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.utils.JsonUtils;
+import com.ruoyi.system.api.RemoteBidNoticeService;
 import com.ruoyi.system.api.RemotePlanService;
+import com.ruoyi.system.api.domain.BidNotice;
 import com.ruoyi.system.api.domain.PpmProcurementPlan;
 import kong.unirest.core.HttpResponse;
 import kong.unirest.core.Unirest;
@@ -47,7 +49,7 @@ public class BankTenderqueryController extends BaseController {
     private IBankTenderqueryService bankTenderqueryService;
 
     @Autowired
-    private RemotePlanService remotePlanService;
+    private RemoteBidNoticeService remoteBidNoticeService;
 
     @Autowired
     private Environment env;
@@ -60,29 +62,18 @@ public class BankTenderqueryController extends BaseController {
     public TableDataInfo list(BankTenderquery bankTenderquery) throws Exception {
         startPage();
         List<BankTenderquery> list = bankTenderqueryService.selectBankTenderqueryList(bankTenderquery);
+
+        Long[] uids = list.stream().map(BankTenderquery::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);
-//
-//        List<Long> ppidlist = list.stream().map(BankTenderquery::getPpid).collect(Collectors.toList());
-//
-//        Integer[] aids = new Integer[ppidlist.size()];
-//
-//        for (int i = 0; i < ppidlist.size(); i++) {
-//            aids[i] = Integer.valueOf(ppidlist.get(i).toString());
-//        }
-//
-//        List<PpmProcurementPlan> plist = remotePlanService.selectPlanByids(aids, SecurityConstants.INNER);
-//
-//        if(plist.isEmpty()) return getDataTable(list);
-//
-//        List objs = new ArrayList();
-//
-//        for (BankTenderquery bt : list) {
-//            String ppnm = plist.stream().filter(p->p.getAid().equals(bt.getPpid())).collect(Collectors.toList()).get(0).getaName();
-//            bt.setPpnm(ppnm);       //采购计划名
-//            objs.add(bt);
-//        }
-//
-//        return getDataTable(objs);
     }
 
     /**

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/controller/BankUncleardepositController.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.mast.bank.domain.BankTenderpub;
 import com.ruoyi.mast.bank.domain.BankUncleardepositrfnd;
 import com.ruoyi.mast.bank.utils.JsonUtils;
+import com.ruoyi.system.api.RemoteBidNoticeService;
 import com.ruoyi.system.api.RemotePlanService;
+import com.ruoyi.system.api.domain.BidNotice;
 import kong.unirest.core.HttpResponse;
 import kong.unirest.core.Unirest;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,10 +52,10 @@ public class BankUncleardepositController extends BaseController {
     private BankUncleardepositrfndController bankUncleardepositrfndController;
 
     @Autowired
-    private RemotePlanService remotePlanService;
+    private Environment env;
 
     @Autowired
-    private Environment env;
+    private RemoteBidNoticeService remoteBidNoticeService;
 
     /**
      * 查询查询不明保证金明细列表
@@ -61,6 +65,17 @@ public class BankUncleardepositController extends BaseController {
     public TableDataInfo list(BankUncleardeposit bankUncleardeposit) {
         startPage();
         List<BankUncleardeposit> list = bankUncleardepositService.selectBankUncleardepositList(bankUncleardeposit);
+
+        Long[] uids = list.stream().map(BankUncleardeposit::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/BankUncleardepositrfndController.java

@@ -46,9 +46,6 @@ public class BankUncleardepositrfndController extends BaseController
     @Autowired
     private IBankUncleardepositrfndService bankUncleardepositrfndService;
 
-    @Autowired
-    private RemotePlanService remotePlanService;
-
     @Autowired
     private Environment env;
 

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

@@ -23,6 +23,18 @@ public class BankTenderpub 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/BankTenderquery.java

@@ -36,6 +36,18 @@ public class BankTenderquery 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/BankUncleardeposit.java

@@ -26,6 +26,18 @@ public class BankUncleardeposit 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/utils/JsonUtils.java

@@ -1,5 +1,6 @@
 package com.ruoyi.mast.bank.utils;
 
+import com.ruoyi.system.api.domain.BidNotice;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.json.XML;
@@ -10,6 +11,8 @@ import java.io.StringReader;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
 
 import static org.json.JSONArray.*;
 
@@ -159,4 +162,10 @@ public class JsonUtils {
         if ("".equals(str)) return BigDecimal.ZERO;
         return new BigDecimal(str);
     }
+
+    public static String getBidNoticeName(long ppid, List<BidNotice> list){
+        List<BidNotice> blist = list.stream().filter(bidNotice -> bidNotice.getUid().equals(ppid)).collect(Collectors.toList());
+        if(blist.isEmpty())return "";
+        return blist.get(0).getuTitle();
+    }
 }

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

@@ -39,7 +39,8 @@
 		<el-table v-loading="loading" :data="tenderpubList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center"/>
 			<el-table-column label="标段发布id" align="center" prop="tenderpubid" v-if="false"/>
-			<el-table-column label="招标项目" align="center" prop="ppid"/>
+			<el-table-column label="采购公告" align="center" prop="ppid" v-if="false"/>
+			<el-table-column label="采购公告" align="center" prop="cggg"/>
 			<el-table-column label="银行流水" align="center" prop="trnuid"/>
 			<el-table-column label="账号" align="center" prop="acctno"  v-if="false"/>
 			<el-table-column label="币种01-人民币" align="center" prop="ccycd" v-if="false"/>
@@ -255,6 +256,7 @@ export default {
 				pageNum: 1,
 				pageSize: 10,
 				ppid: null,
+				cggg: null,
 				trnuid: null,
 				acctno: null,
 				ccycd: null,
@@ -327,6 +329,7 @@ export default {
 			this.form = {
 				tenderpubid: null,
 				ppid: null,
+				cggg: null,
 				trnuid: null,
 				acctno: null,
 				ccycd: null,