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

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

@@ -1026,6 +1026,8 @@ public class BidTenderController extends BaseController {
             BidQuote bidQuote = bidQuoteService.selectQuoteBySupplier(map);
             // 已退款
             if(bidQuote.getStatus() == 6){
+                item.setIsRefund(1);
+                bidContractService.updateBidContract(item);
                 continue;
             }
 
@@ -1049,6 +1051,9 @@ public class BidTenderController extends BaseController {
             // 更新公告退款状态
             bidNotice.setIsRefund(bidNotice.getIsRefund() == null?1:bidNotice.getIsRefund()+1);
             bidNoticeService.updateBidNotice(bidNotice);
+
+            item.setIsRefund(1);
+            bidContractService.updateBidContract(item);
         }
         String[] depositdescids = new String[ids.size()];
 

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

@@ -64,6 +64,8 @@ public class BidContract extends BaseEntity
     @Excel(name = "审核意见")
     private String fOption;
 
+    private Integer isRefund;
+
     public void setCid(Long cid)
     {
         this.cid = cid;
@@ -214,6 +216,14 @@ public class BidContract extends BaseEntity
         this.qid = qid;
     }
 
+    public Integer getIsRefund() {
+        return isRefund;
+    }
+
+    public void setIsRefund(Integer isRefund) {
+        this.isRefund = isRefund;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -25,6 +25,7 @@
             <if test="examine != null "> and examine = #{examine}</if>
             <if test="examineOption != null  and examineOption != ''"> and examine_option = #{examineOption}</if>
             <if test="wid != null "> and wid = #{wid}</if>
+            and is_refund != 1
         </where>
         order by update_time desc limit 30
     </select>
@@ -65,6 +66,7 @@
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="wid != null">wid = #{wid},</if>
             <if test="fOption != null">f_option = #{fOption},</if>
+            <if test="isRefund != null">is_refund = #{isRefund},</if>
         </trim>
         where cid = #{cid}
     </update>