集团户招标导出

dsk-admin/src/main/java/com/dsk/web/controller/dsk/JskCombineInfoController.java

@@ -168,7 +168,7 @@ public class JskCombineInfoController extends BaseController {
      */
     @PostMapping("/export/bid")
     @PreAuthorize("@ss.hasPermi('combine:info:export:bid')")
-    public void exportBid(@RequestBody JskCombineSearchDto dto, HttpServletResponse response) {
+    public void exportBid(@RequestBody JskCombineBidPageDto dto, HttpServletResponse response) {
         List<JskCombineBidProjectExportVo> list = baseService.exportBid(dto);
         ExcelUtil<JskCombineBidProjectExportVo> util = new ExcelUtil<>(JskCombineBidProjectExportVo.class);
         util.exportExcel(response, list, "集团招标", dto.getCombineName().concat("招标公告清单"), true);

dsk-system/src/main/java/com/dsk/system/domain/dsk/dto/JskCombineBidPageDto.java

@@ -20,6 +20,10 @@ public class JskCombineBidPageDto extends BasePage implements Serializable {
      */
     @NotNull(message = "集团id不能为空！")
     private String combineId;
+    /**
+     * 集团名称
+     */
+    private String combineName;
     /**
      * 筛选参数
      */

dsk-system/src/main/java/com/dsk/system/domain/dsk/vo/JskCombineBidProjectExportVo.java

@@ -18,10 +18,10 @@ public class JskCombineBidProjectExportVo implements Serializable {
     private Integer id;
 
     @Excel(name = "招标发布时间",  width = 15, dateFormat = "yyyy/MM/dd")
-    private Date bidTime;
+    private Date issueTime;
 
     @Excel(name = "招标成员",  width = 30)
-    private String companyName;
+    private String tenderee;
 
     @Excel(name = "持股比例", suffix = "%" ,  width = 15)
     private Double stockPercent;
@@ -39,13 +39,13 @@ public class JskCombineBidProjectExportVo implements Serializable {
     private String address;
 
     @Excel(name = "招标采购分类",  width = 15)
-    private String bidType;
+    private String subjectMatter;
 
     @Excel(name = "项目类型",  width = 15)
     private String projectType;
 
     @Excel(name = "代理单位",  width = 30)
-    private String projectUnit;
+    private String agency;
 
 
 

dsk-system/src/main/java/com/dsk/system/dskService/JskCombineInfoService.java

@@ -175,11 +175,11 @@ public class JskCombineInfoService {
     }
 
 
-    public List<JskCombineBidProjectExportVo> exportBid(JskCombineSearchDto dto) {
+    public List<JskCombineBidProjectExportVo> exportBid(JskCombineBidPageDto dto) {
         if (ObjectUtils.isEmpty(dto.getPageSize())) throw new ServiceException("导出条数不能为空！");
         if (dto.getPageSize() > 2000) dto.setPageSize(2000);
 
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/combine/businessList", BeanUtil.beanToMap(dto, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/combine/bidPage", BeanUtil.beanToMap(dto, false, false));
         if (ObjectUtils.isEmpty(map.get("data"))) throw new ServiceException("导出失败，系统错误！");
         Map<String, Object> data = BeanUtil.beanToMap(map.get("data"));
         if (ObjectUtils.isEmpty(data.get("list"))) throw new ServiceException("导出失败，系统错误！");
@@ -190,16 +190,16 @@ public class JskCombineInfoService {
         for (int i = 0; i < list.size(); i++) {
             JskCombineBidProjectExportVo vo = new JskCombineBidProjectExportVo();
             vo.setId(i + 1);
-            vo.setBidTime(MapUtil.getDate(list.get(i),"bidTime"));
-            vo.setCompanyName(MapUtil.getStr(list.get(i),"companyName"));
+            vo.setIssueTime(MapUtil.getDate(list.get(i),"issueTime"));
+            vo.setTenderee(MapUtil.getStr(list.get(i),"tenderee"));
             vo.setStockPercent(MapUtil.getDouble(list.get(i),"stockPercent"));
             vo.setMemberLevel(MapUtil.getStr(list.get(i),"memberLevel"));
             vo.setProjectName(MapUtil.getStr(list.get(i),"projectName"));
             vo.setBidAmount(MapUtil.getDouble(list.get(i),"bidAmount"));
             vo.setAddress(MapUtil.getStr(list.get(i),"address"));
-            vo.setBidType(MapUtil.getStr(list.get(i),"boundType"));
+            vo.setSubjectMatter(MapUtil.getStr(list.get(i),"subjectMatter"));
             vo.setProjectType(MapUtil.getStr(list.get(i),"projectType"));
-            vo.setProjectUnit(MapUtil.getStr(list.get(i),"projectUnit"));
+            vo.setAgency(MapUtil.getStr(list.get(i),"agency"));
             result.add(vo);
         }
         return result;