图表发布调整

354798ggg

2023-05-25 8e997417832cb0339303391517b10c0d964574f9

 src/main/java/com/product/server/report/service/CommonReportService.java

@@ -40,7 +40,6 @@
    * @param recordDte           业务数据dte
    * @param totalStatisticsFlag 是否合计标识
    * @param reportConfigMap     报表配置缓存map
    * @param tableStyle
    * @return
    */
   public ReportEntity getReportEntity(DataTableEntity recordDte, String totalName, Map<Integer, List<JSONObject>> reportConfigMap) {
@@ -64,7 +63,9 @@

      if (!CollectionUtil.isEmpty(headTitleRows)) {
         List<List<ReportColumn>> reportHeader = report.getReportHeader();
         headTitleRows.addAll(reportHeader);
         if (reportHeader != null) {
            headTitleRows.addAll(reportHeader);
         }
         report.setReportHeader(headTitleRows);
      }
      if (!CollectionUtil.isEmpty(tailTitleRows)) {
@@ -298,7 +299,11 @@
                  }
               }
               paramKey = dataListReportService.concat(keyObj, CmnConst.ATTR_ROWSPAN);
               column.setRowspan(NumberUtil.parseInt(paramKey));
               if (NumberUtil.isNumber(paramKey)) {
                  column.setRowspan(NumberUtil.parseInt(paramKey));
               } else {
                  column.addProperty(paramKey, "rowspan");
               }
               replaceMap.put(paramKey, "1");
            }
            // class
@@ -349,13 +354,14 @@
      if (!StringUtils.isEmpty(totalName)) {
         reportData.add(getDataAreaTotalStatistics(statisticsMap, dataAreaFieldConfigMap, dataAreaGroupFieldNameList, preFse, dataAreaGroupFieldRecordObj, totalName));
      }
      for (Map.Entry<String, String> entry : replaceMap.entrySet()) {
         reportData.stream().forEach(item -> {
            item.stream().forEach(column -> {
      reportData.stream().forEach(item -> {
         item.stream().forEach(column -> {
            for (Map.Entry<String, String> entry : replaceMap.entrySet()) {
               column.replace(entry.getKey(), entry.getValue());
            });
            }
         });
      }
      });


      return reportData;
   }