bug修复

dsk-module/dsk-biz-api/src/main/java/com/dsk/search/controller/ExportController.java

 package com.dsk.search.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.utils.poi.ExcelUtil;
+import com.dsk.jsk.domain.JskCombineSearchDto;
 import com.dsk.jsk.domain.bo.ComposeQueryDto;
 import com.dsk.search.service.BusinessOpportunityRadarService;
 import com.dsk.search.service.ExportService;
@@ -62,4 +64,26 @@ public class ExportController {
         return exportService.aptitudeFile(file);
     }
 
+    /**
+     * 集团成员列表导出
+     */
+    @PostMapping("/combine/memberList")
+    public AjaxResult memberListExportPre(@RequestBody JskCombineSearchDto dto) throws Exception {
+        return exportService.memberListExport(dto);
+    }
+
+    //集团中标业绩导出
+    @PostMapping("/combine/win/bid")
+    @SaCheckPermission("combine:info:export:win:bid")
+    public AjaxResult exportWinBid(@RequestBody JskCombineSearchDto dto) {
+        return exportService.exportWinBid(dto);
+    }
+
+    //集团招标业绩导出
+    @PostMapping("/combine/bid")
+    @SaCheckPermission("combine:info:export:win:bid")
+    public AjaxResult exportBid(@RequestBody JskCombineSearchDto dto) {
+        return exportService.exportBid(dto);
+    }
+
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/search/service/ExportService.java

 package com.dsk.search.service;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.map.MapUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.constant.Constants;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.excel.ExcelUtils;
 import com.dsk.common.exception.ServiceException;
+import com.dsk.jsk.domain.JskCombineSearchDto;
 import com.dsk.jsk.domain.bo.ComposeQueryDto;
 import com.dsk.jsk.service.EnterpriseService;
 import com.dsk.system.domain.SysUserFileRecord;
@@ -63,6 +65,7 @@ public class ExportService {
         //生成中
         fileRecord.setStatus(2);
         fileRecord.setRemark("资质批量导出");
+        fileRecord.setCreateTime(new DateTime());
         Long fileId = sysUserFileRecordService.exportAdd(fileRecord);
         composeQueryDto.setExportUniqueCode(fileId.toString());
         //回调函数
@@ -72,4 +75,52 @@ public class ExportService {
         return AjaxResult.success();
     }
 
+    //集团成员导出
+    public AjaxResult memberListExport(JskCombineSearchDto dto) {
+        SysUserFileRecord fileRecord = new SysUserFileRecord();
+        fileRecord.setFileName(dto.getExportExeclName().concat(Constants.SUFFIX_XLSX));
+        fileRecord.setType(1);
+        //生成中
+        fileRecord.setStatus(2);
+        fileRecord.setRemark("集团成员列表导出");
+        Long fileId = sysUserFileRecordService.exportAdd(fileRecord);
+        dto.setExportUniqueCode(fileId.toString());
+        //回调函数
+        dto.setExportBackUrl(EXPORT_BACK_URL);
+        dskOpenApiUtil.requestBody("/operate/export/member", BeanUtil.beanToMap(dto, false, false));
+        return AjaxResult.success();
+    }
+
+    //集团中标业绩导出
+    public AjaxResult exportWinBid(JskCombineSearchDto dto) {
+        SysUserFileRecord fileRecord = new SysUserFileRecord();
+        fileRecord.setFileName(dto.getExportExeclName().concat(Constants.SUFFIX_XLSX));
+        fileRecord.setType(1);
+        //生成中
+        fileRecord.setStatus(2);
+        fileRecord.setRemark("集团中标业绩导出");
+        Long fileId = sysUserFileRecordService.exportAdd(fileRecord);
+        dto.setExportUniqueCode(fileId.toString());
+        //回调函数
+        dto.setExportBackUrl(EXPORT_BACK_URL);
+        dskOpenApiUtil.requestBody("/operate/export/combineBid", BeanUtil.beanToMap(dto, false, false));
+        return AjaxResult.success();
+    }
+
+    //集团招标业绩
+    public AjaxResult exportBid(JskCombineSearchDto dto) {
+        SysUserFileRecord fileRecord = new SysUserFileRecord();
+        fileRecord.setFileName(dto.getExportExeclName().concat(Constants.SUFFIX_XLSX));
+        fileRecord.setType(1);
+        //生成中
+        fileRecord.setStatus(2);
+        fileRecord.setRemark("集团招标业绩导出");
+        Long fileId = sysUserFileRecordService.exportAdd(fileRecord);
+        dto.setExportUniqueCode(fileId.toString());
+        //回调函数
+        dto.setExportBackUrl(EXPORT_BACK_URL);
+        dskOpenApiUtil.requestBody("/operate/export/combine/tender", BeanUtil.beanToMap(dto, false, false));
+        return AjaxResult.success();
+    }
+
 }