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

dsk-admin/src/main/resources/application-dev.yml

@@ -187,15 +187,6 @@ sms:
     territory: ap-guangzhou
 
 dsk:
-  open:
-    endPoint: pre-openapi.jiansheku.com
-    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
-    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
-    protocol: https
-#    endPoint: openapi.jiansheku.com
-#    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
-#    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
-#    protocol: https
   exportBackUrl: http://47.104.91.229:9099/prod-api/export/backUrl
 
 sa-token:

dsk-admin/src/main/resources/application-prod.yml

@@ -190,12 +190,3 @@ sms:
     territory: ap-guangzhou
 
 dsk:
-  open:
-    #    endPoint: 120.27.13.145:8865
-    #    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
-    #    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
-    #    protocol: http
-    endPoint: openapi.jiansheku.com
-    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
-    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
-    protocol: https

dsk-admin/src/main/resources/application-test.yml

@@ -187,15 +187,6 @@ sms:
     territory: ap-guangzhou
 
 dsk:
-  open:
-#    endPoint: pre-openapi.jiansheku.com
-#    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
-#    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
-#    protocol: https
-#    endPoint: openapi.jiansheku.com
-#    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
-#    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
-#    protocol: https
   exportBackUrl: http://47.104.91.229:9099/prod-api/export/backUrl
 
 sa-token:

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/utils/ExcelUtils.java

@@ -184,7 +184,8 @@ public class ExcelUtils<T> {
         createExcelField();
         createWorkbook();
         createTitle();
-        createExportDate();
+//        createExportDate();
+        createExportMessage();
         createSubHead();
     }
 
@@ -207,7 +208,25 @@ public class ExcelUtils<T> {
             sheet.addMergedRegion(new CellRangeAddress(titleRow.getRowNum(), titleRow.getRowNum(), titleRow.getRowNum(), titleLastCol));
         }
     }
-
+    public void createExportMessage() {
+        if (dateStatus) {
+            subMergedFirstRowNum++;
+            subMergedLastRowNum++;
+            int dateLastCol = this.fields.size() - 1;
+            if (isSubList()) {
+                dateLastCol = dateLastCol + subFields.size() - 1;
+            }
+            Row dateRow = sheet.createRow(rownum);
+            dateRow.setHeightInPoints(15);
+            Cell dateCell = dateRow.createCell(0);
+            CellStyle cellStyle = wb.createCellStyle();
+            cellStyle.setAlignment(HorizontalAlignment.LEFT);
+            dateCell.setCellStyle(cellStyle);
+            dateCell.setCellValue("* 免责声明：本数据内容是大司空接受您的委托，查询公开信息所得结果。大司空不对该查询结果的全面、准确、真实性负责。本数据仅为您的决策提供参考。因使用该数据信息而产生的任何后果，大司空概不负责。如需下载更多数据，请联系工作人员。");
+            sheet.addMergedRegion(new CellRangeAddress(dateRow.getRowNum(), dateRow.getRowNum(), 0, dateLastCol));
+            rownum++;
+        }
+    }
     public void createExportDate() {
         if (dateStatus) {
             subMergedFirstRowNum++;

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

@@ -253,7 +253,7 @@ public class ExportService {
             //供应商
             vo.setSupplierCount(MapUtil.getInt(dataMap, "supplierCount"));
             //债卷余额
-            vo.setCreditBalance(MapUtil.getDouble(dataMap, "creditBalance"));
+            vo.setCreditBalance(MapUtil.getDouble(dataMap, "bondBalance"));
             //主体评级
             vo.setBratingSubjectLevel(MapUtil.getStr(dataMap, "bratingSubjectLevel"));
             //行政级别