研究报告导出

modules/report/src/main/java/com/jeesite/modules/report/dto/ResearchReportDto.java

@@ -11,6 +11,7 @@ public class ResearchReportDto implements Serializable {
         @ExcelField(title = "SUBJECT",attrName = "marketType",align = ExcelField.Align.AUTO,sort = 20),
         @ExcelField(title = "ABSTRACT",attrName = "reportScopeHtml",align = ExcelField.Align.AUTO,sort = 30),
         @ExcelField(title = "TABLE OF CONTENTS",attrName = "directoryHtml",align = ExcelField.Align.AUTO,sort = 40),
+        @ExcelField(title = "TABLES AND FIGURES",attrName = "chartsHtml",align = ExcelField.Align.AUTO,sort = 50),
     })
     private String title;		// 标题
     private String marketType;		// 所属分类
@@ -19,6 +20,7 @@ public class ResearchReportDto implements Serializable {
     private String marketScale; //市场规模
     private String marketDriven; //市场驱动
     private String lang;
+    private String chartsHtml;   // 图表目录
 
     public String getTitle() {
         return title;
@@ -75,4 +77,12 @@ public class ResearchReportDto implements Serializable {
     public void setLang(String lang) {
         this.lang = lang;
     }
+
+    public String getChartsHtml() {
+        return chartsHtml;
+    }
+
+    public void setChartsHtml(String chartsHtml) {
+        this.chartsHtml = chartsHtml;
+    }
 }

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

@@ -351,6 +351,7 @@ public class ResearchReportController extends BaseController {
 				vo.setReportScopeHtml(convertMarket(vo.getMarketScale(), vo.getMarketDriven(), vo.getLang()) + lineStr + lineStr + Html2PlainTxtUtils.convert(vo.getReportScopeHtml()));
 				vo.setDirectoryHtml(Html2PlainTxtUtils.convert(vo.getDirectoryHtml()));
 				vo.setMarketType(convertMarketType(vo.getMarketType(), vo.getLang()));
+				vo.setChartsHtml(Html2PlainTxtUtils.convert(vo.getChartsHtml()));
 				return vo;
 			}).collect(Collectors.toList());
 		}

modules/report/src/main/resources/mappings/modules/report/ResearchReportDao.xml

@@ -261,7 +261,7 @@
 
 	<select id="findListByIdArr" parameterType="java.lang.String"
 		resultType="com.jeesite.modules.report.dto.ResearchReportDto">
-		select title,report_scope_html,market_type,directory_html,market_scale, market_driven,lang
+		select title,report_scope_html,market_type,directory_html,market_scale, market_driven,lang,charts_html
 		from research_report_view where report_id in
 		<foreach collection="ids.split(',')" item="id" separator="," open="(" close=")">
 			#{id}