模板更新

common/src/main/java/com/jeesite/common/constant/Constants.java

@@ -70,10 +70,12 @@ public interface Constants {
         String SECOND_TEXT = "<p style=\"line-height: 1.15;\"><span style=\"font-family: 微软雅黑;\">Table secondIndex： di_company @@@@ Features and Details</span></p>";
         // 实体-中国、全球
         String THIRD_TEXT_ENTITY_CHINA = "<p style=\"line-height: 1.15;\"><span style=\"font-family: 微软雅黑;\">Table thirdIndex： di_company @@@@ Market Data: Revenue, Sales Volume, Price and Gross Margin 2021-2026</span></p>";
-        // 服务-中国、全球
+        // 服务-中国
         String THIRD_TEXT_SERVICE_CHINA = "<p style=\"line-height: 1.15;\"><span style=\"font-family: 微软雅黑;\">Table thirdIndex： di_company @@@@ Market Data: Revenue, Sales Volume, Price and Gross Margin 2021-2026</span></p>";
+        // 服务-全球
+        String THIRD_TEXT_SERVICE_GLOBAL = "<p style=\"line-height: 1.15;\"><span style=\"font-family: 微软雅黑;\">Table thirdIndex： di_company @@@@ Market Data: Revenue and Gross Margin 2021-2026</span></p>";
         String FOUR_TEXT = "<p style=\"line-height: 1.15;\"><span style=\"font-family: 微软雅黑;\">Table fourIndex： di_company @@@@ Product Revenue by Geographic Area</span></p>";
-        String FIVE_TEXT = "<p style=\"line-height: 1.15;\"><span style=\"font-family: 微软雅黑;\">Table fiveIndex： di_company Key Performance Indicators (KPIs) Assessment (Company Size, R&D Investment, International Revenue Contribution, @@@@ Market Position）</span></p>";
+        String FIVE_TEXT = "<p style=\"line-height: 1.15;\"><span style=\"font-family: 微软雅黑;\">Table fiveIndex： di_company Key Performance Indicators (KPIs) Assessment (Company Size, R&amp;D Investment, International Revenue Contribution, @@@@ Market Position）</span></p>";
         String TYPE_DESC = "<p style=\"line-height: 1.15;\"><span style=\"font-family: 微软雅黑;\">Figure firstIndex： di_type Product Analysis</span></p>";
         String APPLICATION_DESC = "<p style=\"line-height: 1.15;\"><span style=\"font-family: 微软雅黑;\">Figure firstIndex： di_application Overview</span></p>";
     }
@@ -103,7 +105,7 @@ public interface Constants {
         String COMPANY_DESC_THD_ENTITY = "<p style=\"line-height: 1.15;\"><span style=\"font-size: 16px; font-family: 微软雅黑;\"> &nbsp; &nbsp; &nbsp; &nbsp;firstTitleIndex.secondIndex.3 di_company @@@@ Market Data: Revenue, Sales Volume, Price and Gross Margin 2021-2026</span>";
         String COMPANY_DESC_THD_SERVICE ="<p style=\"line-height: 1.15;\"><span style=\"font-size: 16px; font-family: 微软雅黑;\"> &nbsp; &nbsp; &nbsp; &nbsp;firstTitleIndex.secondIndex.3 di_company @@@@ Market Data: Revenue and Gross Margin 2021-2026</span></p>";
         String COMPANY_DESC_FOUR = "<p style=\"line-height: 1.15;\"><span style=\"font-size: 16px; font-family: 微软雅黑;\"> &nbsp; &nbsp; &nbsp; &nbsp;firstTitleIndex.secondIndex.4 di_company @@@@ Product Revenue by Geographic Area</span></p>";
-        String COMPANY_DESC_FIVE = "<p style=\"line-height: 1.15;\"><span style=\"font-size: 16px; font-family: 微软雅黑;\"> &nbsp; &nbsp; &nbsp; &nbsp;firstTitleIndex.secondIndex.5 di_company Key Performance Indicators (KPIs) Assessment (Company Size, R&D Investment, International Revenue Contribution, @@@@ Market Position）</span></p>";
+        String COMPANY_DESC_FIVE = "<p style=\"line-height: 1.15;\"><span style=\"font-size: 16px; font-family: 微软雅黑;\"> &nbsp; &nbsp; &nbsp; &nbsp;firstTitleIndex.secondIndex.5 di_company Key Performance Indicators (KPIs) Assessment (Company Size, R&amp;D Investment, International Revenue Contribution, @@@@ Market Position）</span></p>";
     }
 
     // 研究范围

modules/report/src/main/java/com/jeesite/modules/report/util/TransContentUtils.java

@@ -258,8 +258,11 @@ public class TransContentUtils {
                             .replaceAll(info04.getPriceUnit(), priceUnit);
                 }*/
             }else {
-                thirdText = Constants.charts_en.THIRD_TEXT_SERVICE_CHINA.replaceAll(info04.getWord(), researchReport.getContext());
-
+                if(Constants.reportRegion.CHINA_KEY.equals(researchReport.getReportRegion())) {
+                    thirdText = Constants.charts_en.THIRD_TEXT_SERVICE_CHINA.replaceAll(info04.getWord(), researchReport.getContext());
+                } else {
+                    thirdText = Constants.charts_en.THIRD_TEXT_SERVICE_GLOBAL.replaceAll(info04.getWord(), researchReport.getContext());
+                }
                 /*if (Constants.reportRegion.CHINA_KEY.equals(info04.getRegion())){
                     thirdText = Constants.charts.THIRD_TEXT_SERVICE_CHINA.replaceAll(info04.getWord(), researchReport.getContext());
                 }else{