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