Browse Source

生成中标通知书时间

ZC 3 weeks ago
parent
commit
6c7b492ef1

+ 7 - 4
ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidWinnerController.java

@@ -7,9 +7,7 @@ import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 
 import com.hh.bidding.domain.*;
-import com.hh.bidding.service.IBidInvoiceService;
-import com.hh.bidding.service.IBidTenderService;
-import com.hh.bidding.service.IBidWinningResultsService;
+import com.hh.bidding.service.*;
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.RemotePlanService;
@@ -25,7 +23,6 @@ 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.IBidWinnerService;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
@@ -60,6 +57,9 @@ public class BidWinnerController extends BaseController
     @Autowired
     private IBidWinningResultsService bidWinningResultsService;
 
+    @Autowired
+    private IBidNoticeService bidNoticeService;
+
 
     public Long getOwnerdept() {
         Long r = 0L;
@@ -446,6 +446,9 @@ public class BidWinnerController extends BaseController
             Long ownerDept = bidTender.getOwnerDept();
             SysDept sysDept = remoteUserService.getInfoById(ownerDept, SecurityConstants.INNER);
             item.setsUnit(sysDept.getDeptName());
+
+            BidNotice bidNotice = bidNoticeService.selectBidNoticeBySid(item.getSid());
+            item.setuKaiTime(bidNotice.getuKaiTime());
         }
         return getDataTable(list);
     }

+ 6 - 0
ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/ExpertMarkController.java

@@ -691,6 +691,12 @@ public class ExpertMarkController extends BaseController{
         List<BidQuote> bidQuoteList = bidQuoteService.selectQuoteListBySid(sid);
         Long userId = SecurityUtils.getLoginUser().getUserid();
 
+        for(BidQuote item : bidQuoteList){
+            Long hid = item.getHid();
+            BsSupplier bsSupplier = bidTenderService.selectSupplierByHid(hid);
+            item.sethName(bsSupplier.gethName());
+        }
+
         BidExpertExamine bidExpertExamine = new BidExpertExamine();
         BidExpertTech bidExpertTech = new BidExpertTech();
         BidExpertRespond bidExpertRespond = new BidExpertRespond();

+ 12 - 0
ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/domain/BidWinner.java

@@ -1,6 +1,8 @@
 package com.hh.bidding.domain;
 
 import java.math.BigDecimal;
+import java.util.Date;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
@@ -69,6 +71,8 @@ public class BidWinner extends BaseEntity
 
     private String sUnit;
 
+    private Date uKaiTime;
+
     public void setWid(Long wid)
     {
         this.wid = wid;
@@ -230,6 +234,14 @@ public class BidWinner extends BaseEntity
         this.sUnit = sUnit;
     }
 
+    public Date getuKaiTime() {
+        return uKaiTime;
+    }
+
+    public void setuKaiTime(Date uKaiTime) {
+        this.uKaiTime = uKaiTime;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)