Merge branch 'V20230915' of http://192.168.60.201/root/dsk-operate-sys into V20230915

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/vo/UrbanInvestmentExportVo.java

@@ -32,7 +32,7 @@ public class UrbanInvestmentExportVo implements Serializable {
     @Excel(name = "供应商",  width = 10)
     private Integer supplierCount;
 
-    @Excel(name = "债卷余额" , suffix = "亿元")
+    @Excel(name = "债券余额" , suffix = "亿元")
     private Double creditBalance;
 
     @Excel(name = "主体评级",  width = 15)

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

@@ -59,6 +59,7 @@ public class ExportController {
         if (StringUtils.isEmpty(compose.getExportExeclName())){
             object.put("exportExeclName","企业基本信息导出");
         }
+        object.put("exportTemplateName","szh-enterprise-info.xlsx");
         return exportService.enterpriseInfoExport(object);
     }
 
@@ -76,6 +77,7 @@ public class ExportController {
         if (StringUtils.isEmpty(compose.getExportExeclName())){
             object.put("exportExeclName","企业资质信息导出");
         }
+        object.put("exportTemplateName","szh-cert-info.xlsx");
         return exportService.enterpriseAptitudeExport(object);
     }
 
@@ -124,7 +126,7 @@ public class ExportController {
     }
 
     //市场经济  城投平台导出
-    @PostMapping("/urbanInvestmentPlatform")
+    @PostMapping("/urbanInvestment")
     public AjaxResult export(@RequestBody UrbanInvestmentPlatformDto dto) {
         return exportService.export(dto);
     }

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

@@ -139,8 +139,6 @@ public class ExportService {
         return AjaxResult.success();
     }
 
-
-    @Async
     public AjaxResult uipSerachExport(EnterpriseUipSearchBody pageDto) {
         // 分页参数
         pageDto.setPageNum(1);
@@ -153,7 +151,7 @@ public class ExportService {
             throw new RuntimeException();
         }
         List<Object> list = CommonUtils.assertAsArray(MapUtils.getObject(map, "data", ""));
-        int i = 0;
+        int i = 1;
         List<UrbanInvestmentExportVo> resultList = new ArrayList<>();
         for (Object obj : list) {
             UrbanInvestmentExportVo vo = new UrbanInvestmentExportVo();
@@ -214,7 +212,6 @@ public class ExportService {
         return AjaxResult.success();
     }
 
-    @Async
     public AjaxResult export(UrbanInvestmentPlatformDto pageDto) {
         // 分页参数
         pageDto.setPageNum(1);
@@ -228,7 +225,7 @@ public class ExportService {
             throw new RuntimeException();
         }
         List<Object> list = CommonUtils.assertAsArray(MapUtils.getObject(map, "data", ""));
-        int i = 0;
+        int i = 1;
         List<UrbanInvestmentExportVo> resultList = new ArrayList<>();
         for (Object obj : list) {
             UrbanInvestmentExportVo vo = new UrbanInvestmentExportVo();