市场导入

modules/report/src/main/java/com/jeesite/modules/report/web/ResearchReportController.java

@@ -56,10 +56,6 @@ public class ResearchReportController extends BaseController {
 	@Value("${file.baseDir}")
 	private String basePath;
 	private static final String TEMP_PATH = "/temp";
-	private static final String marketScaleZH = "市场规模";
-	private static final String marketScaleEN = "Market Scale";
-	private static final String marketDrivenZH = "市场驱动";
-	private static final String marketDrivenEN = "Market Driven";
 
 	/**
 	 * 获取数据
@@ -274,24 +270,18 @@ public class ResearchReportController extends BaseController {
 			sb.append(vo.getTitle());	//标题
 			sb.append("\r\r");
 			sb.append(Html2PlainTxtUtils.convert(vo.getReportScopeHtml()));	//研究范围
+			if (StringUtils.isNotEmpty(vo.getMarketScale()) || StringUtils.isNotEmpty(vo.getMarketDriven())) {
+				sb.append("\r\r");
+			}
 			if (StringUtils.isNotEmpty(vo.getMarketScale())) {
-				sb.append("\r\r\r\r");
-				if (Constants.lang.ZH_CH.equals(vo.getLang())) {
-					sb.append(marketScaleZH + "\r\r");
-				} else {
-					sb.append(marketScaleEN + "\r\r");
-				}
+				sb.append("\r\r");
 				sb.append(Html2PlainTxtUtils.convert(vo.getMarketScale()));
+				sb.append("\r\r");
 			}
-			sb.append("\r\r");
 			if (StringUtils.isNotEmpty(vo.getMarketDriven())) {
-				sb.append("\r\r\r\r");
-				if (Constants.lang.ZH_CH.equals(vo.getLang())) {
-					sb.append(marketDrivenZH + "\r\r");
-				} else {
-					sb.append(marketDrivenEN + "\r\r");
-				}
+				sb.append("\r\r");
 				sb.append(Html2PlainTxtUtils.convert(vo.getMarketDriven()));
+				sb.append("\r\r");
 			}
 			sb.append("\r\r");
 			sb.append(Html2PlainTxtUtils.convert(vo.getDirectoryHtml()));		//正文目录
@@ -359,23 +349,14 @@ public class ResearchReportController extends BaseController {
 		if(!list.isEmpty()){
 			listExcel = list.stream().map(vo -> {
 				vo.setReportScopeHtml(Html2PlainTxtUtils.convert(vo.getReportScopeHtml()));
+				if (StringUtils.isNotEmpty(vo.getMarketScale()) || StringUtils.isNotEmpty(vo.getMarketDriven())) {
+					vo.setReportScopeHtml(vo.getReportScopeHtml() + lineStr + lineStr);
+				}
 				if (StringUtils.isNotEmpty(vo.getMarketScale())) {
-					String str;
-					if (Constants.lang.ZH_CH.equals(vo.getLang())) {
-						str = marketScaleZH;
-					} else {
-						str = marketScaleEN;
-					}
-					vo.setReportScopeHtml(vo.getReportScopeHtml() + lineStr + lineStr + lineStr + lineStr + str + lineStr + lineStr + Html2PlainTxtUtils.convert(vo.getMarketScale()));
+					vo.setReportScopeHtml(vo.getReportScopeHtml() + lineStr + lineStr + Html2PlainTxtUtils.convert(vo.getMarketScale()) + lineStr + lineStr);
 				}
 				if (StringUtils.isNotEmpty(vo.getMarketDriven())) {
-					String str;
-					if (Constants.lang.ZH_CH.equals(vo.getLang())) {
-						str = marketDrivenZH;
-					} else {
-						str = marketDrivenEN;
-					}
-					vo.setReportScopeHtml(vo.getReportScopeHtml() + lineStr + lineStr + lineStr + lineStr + str + lineStr + lineStr + Html2PlainTxtUtils.convert(vo.getMarketDriven()));
+					vo.setReportScopeHtml(vo.getReportScopeHtml() + lineStr + lineStr + Html2PlainTxtUtils.convert(vo.getMarketDriven()) + lineStr + lineStr);
 				}
 				vo.setDirectoryHtml(Html2PlainTxtUtils.convert(vo.getDirectoryHtml()));
 				return vo;
@@ -410,24 +391,18 @@ public class ResearchReportController extends BaseController {
 				sb.append(vo.getTitle());	//标题
 				sb.append("\r\r");
 				sb.append(Html2PlainTxtUtils.convert(vo.getReportScopeHtml()));	//研究范围
+				if (StringUtils.isNotEmpty(vo.getMarketScale()) || StringUtils.isNotEmpty(vo.getMarketDriven())) {
+					sb.append("\r\r");
+				}
 				if (StringUtils.isNotEmpty(vo.getMarketScale())) {
-					sb.append("\r\r\r\r");
-					if (Constants.lang.ZH_CH.equals(vo.getLang())) {
-						sb.append(marketScaleZH + "\r\r");
-					} else {
-						sb.append(marketScaleEN + "\r\r");
-					}
+					sb.append("\r\r");
 					sb.append(Html2PlainTxtUtils.convert(vo.getMarketScale()));
+					sb.append("\r\r");
 				}
-				sb.append("\r\r");
 				if (StringUtils.isNotEmpty(vo.getMarketDriven())) {
-					sb.append("\r\r\r\r");
-					if (Constants.lang.ZH_CH.equals(vo.getLang())) {
-						sb.append(marketDrivenZH + "\r\r");
-					} else {
-						sb.append(marketDrivenEN + "\r\r");
-					}
+					sb.append("\r\r");
 					sb.append(Html2PlainTxtUtils.convert(vo.getMarketDriven()));
+					sb.append("\r\r");
 				}
 				sb.append("\r\r");
 				sb.append(Html2PlainTxtUtils.convert(vo.getDirectoryHtml()));		//正文目录