微信移动端支付

.idea/workspace.xml

@@ -30,7 +30,6 @@
   <component name="ChangeListManager">
     <list default="true" id="fc9366aa-6566-4981-8149-d75e02f8e884" name="默认的" comment="微信移动端支付">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/dto/ResearchReportDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/dto/ResearchReportDto.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/web/ResearchReportController.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/web/ResearchReportController.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -465,14 +464,7 @@
       <workItem from="1735970895886" duration="8433000" />
       <workItem from="1736126123480" duration="510000" />
       <workItem from="1736127959643" duration="53060000" />
-      <workItem from="1736385778472" duration="68222000" />
-    </task>
-    <task id="LOCAL-00045" summary="wx sdk">
-      <created>1735184653308</created>
-      <option name="number" value="00045" />
-      <option name="presentableId" value="LOCAL-00045" />
-      <option name="project" value="LOCAL" />
-      <updated>1735184653308</updated>
+      <workItem from="1736385778472" duration="70928000" />
     </task>
     <task id="LOCAL-00046" summary="wx sdk">
       <created>1735184664592</created>
@@ -810,7 +802,14 @@
       <option name="project" value="LOCAL" />
       <updated>1736908680267</updated>
     </task>
-    <option name="localTasksCounter" value="94" />
+    <task id="LOCAL-00094" summary="微信移动端支付">
+      <created>1736927301211</created>
+      <option name="number" value="00094" />
+      <option name="presentableId" value="LOCAL-00094" />
+      <option name="project" value="LOCAL" />
+      <updated>1736927301212</updated>
+    </task>
+    <option name="localTasksCounter" value="95" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

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

@@ -215,12 +215,12 @@ public class ResearchReportController extends BaseController {
 			sb.append(vo.getTitle());	//标题
 			sb.append("\r\r");
 			sb.append(Html2PlainTxtUtils.convert(vo.getReportScopeHtml()));	//研究范围
-			sb.append("\r\r");
 			if (StringUtils.isNotEmpty(vo.getGeneralization())) {
-				sb.append("\r\r");
+				sb.append("\r\r\r\r");
 				sb.append("市场概况\r\r");
 				sb.append(Html2PlainTxtUtils.convert(vo.getGeneralization()));
 			}
+			sb.append("\r\r");
 			sb.append(Html2PlainTxtUtils.convert(vo.getDirectoryHtml()));		//正文目录
 			sb.append("\r\r");
 			sb.append(Html2PlainTxtUtils.convert(vo.getChartsHtml()));		//图表目录
@@ -282,11 +282,12 @@ public class ResearchReportController extends BaseController {
 		List<ResearchReportDto> list = researchReportService.findListByIdArr(researchReport.getId());
 		String fileName = "调查报告" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
 		List<ResearchReportDto> listExcel = ListUtils.newArrayList();
+		String lineStr = System.lineSeparator();
 		if(!list.isEmpty()){
 			listExcel = list.stream().map(vo -> {
 				vo.setReportScopeHtml(Html2PlainTxtUtils.convert(vo.getReportScopeHtml()));
 				if (StringUtils.isNotEmpty(vo.getGeneralization())) {
-					vo.setReportScopeHtml(vo.getReportScopeHtml() + "\r\r市场概况\r\r" + Html2PlainTxtUtils.convert(vo.getGeneralization()));
+					vo.setReportScopeHtml(vo.getReportScopeHtml() + lineStr + lineStr + lineStr + lineStr + "市场概况" + lineStr + lineStr + Html2PlainTxtUtils.convert(vo.getGeneralization()));
 				}
 				vo.setDirectoryHtml(Html2PlainTxtUtils.convert(vo.getDirectoryHtml()));
 				return vo;
@@ -322,7 +323,7 @@ public class ResearchReportController extends BaseController {
 				sb.append("\r\r");
 				sb.append(Html2PlainTxtUtils.convert(vo.getReportScopeHtml()));	//研究范围
 				if (StringUtils.isNotEmpty(vo.getGeneralization())) {
-					sb.append("\r\r");
+					sb.append("\r\r\r\r");
 					sb.append("市场概况\r\r");
 					sb.append(Html2PlainTxtUtils.convert(vo.getGeneralization()));
 				}