研究报告导出

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

@@ -219,5 +219,5 @@ public interface Constants {
         String REPORT_PUBLISHDATE = "bjfl:report:publish:date";
     }
 
-    String textFormat = "<p><span style=\"font-size: 16px; font-family: 微软雅黑;\">%s</span></p>";
+    String textFormat = "<p>%s</p>";
 }

modules/report/src/main/java/com/jeesite/modules/report/service/ResearchReportService.java

@@ -965,7 +965,7 @@ public class ResearchReportService extends CrudService<ResearchReportDao, Resear
 					ResearchReport update = new ResearchReport();
 					update.setReportCode(dto.getReportCode());
 					update.setReportRegion(dto.getReportRegion());
-					update.setMarketScale(String.format(Constants.textFormat, dto.getMarketScale()).replaceAll("\\n", "<br/>"));
+					update.setMarketScale(String.format(Constants.textFormat, dto.getMarketScale()).replaceAll("\\n\\n", "</p><p>"));
 					updateList.add(update);
 				}
 			}
@@ -1032,7 +1032,7 @@ public class ResearchReportService extends CrudService<ResearchReportDao, Resear
 					ResearchReport update = new ResearchReport();
 					update.setReportCode(dto.getReportCode());
 					update.setReportRegion(dto.getReportRegion());
-					update.setMarketDriven(String.format(Constants.textFormat, dto.getMarketDriven()).replaceAll("\\n", "<br/>"));
+					update.setMarketDriven(String.format(Constants.textFormat, dto.getMarketDriven()).replaceAll("\\n\\n", "</p><p>"));
 					updateList.add(update);
 				}
 			}