新增市场概括

modules/report/src/main/java/com/jeesite/modules/report/entity/ResearchReport.java

@@ -49,6 +49,7 @@ import com.jeesite.common.utils.excel.annotation.ExcelFields;
 		@Column(name="types", attrName="types", label="替换类型"),
 		@Column(name="applications", attrName="applications", label="替换应用"),
 		@Column(name="web_title", attrName="webTitle", label="网站标题",queryType = QueryType.LIKE),
+		@Column(name="generalization", attrName="generalization", label="市场概括"),
 //		@Column(name="web_id", attrName="webId", label="网站id"),
 //		@Column(name="is_replace", attrName="isReplace", label="是否替换"),
 	}, orderBy="a.update_date DESC"
@@ -138,6 +139,8 @@ public class ResearchReport extends DataEntity<ResearchReport> {
 	private String webId;	//网站id
 	private String isReplace;	// 是否替换
 
+	private String generalization; //市场概括
+
 	public ResearchReport() {
 		this(null);
 	}
@@ -516,4 +519,13 @@ public class ResearchReport extends DataEntity<ResearchReport> {
 	public void setIsReplace(String isReplace) {
 		this.isReplace = isReplace;
 	}
+
+	@Size(min=0, max=5000, message="市场概括长度不能超过 5000 个字符")
+	public String getGeneralization() {
+		return generalization;
+	}
+
+	public void setGeneralization(String generalization) {
+		this.generalization = generalization;
+	}
 }

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

@@ -44,7 +44,7 @@
 	</select>
 
 	<sql id="query_columns">
-		b.id,b.title,b.publish_date,b.outline,b.lang,b.web_title,b.report_region,
+		b.id,b.title,b.publish_date,b.outline,b.lang,b.web_title,b.report_region, b.generalization,
 		c.name fileName
 	</sql>
 
@@ -192,7 +192,7 @@
 		parameterType="com.jeesite.modules.report.entity.ResearchReport">
 		select b.id,b.report_region,b.title,b.publish_date,b.report_code,b.report_scope_html,b.directory_html,
 			b.charts_html,b.context_html,b.market_type,b.status,b.lang,b.fileName,b.context,
-			b.web_title,b.report_type,b.remarks
+			b.web_title,b.report_type,b.remarks, b.generalization
 		from research_report_view b
 		where b.report_id = #{report.id}
 		<if test="report.lang != null and report.lang !=''">and b.lang = #{report.lang}</if>
@@ -201,7 +201,7 @@
 	<sql id="researchReport_column">
 		id,update_date,remarks,original_title,title,publish_date,context,outline,market_type,report_code,lang,
 		sale_unit,price_unit,report_type,report_region,related_id,
-		companies,types,applications,web_title
+		companies,types,applications,web_title,generalization
 	</sql>
 
 	<select id="findListByIds" resultType="com.jeesite.modules.report.entity.ResearchReport"
@@ -233,7 +233,7 @@
 	<sql id="findResearchReportList">
 		id,update_date,remarks,original_title,title,publish_date,context,outline,market_type,report_code,lang,
 		sale_unit,price_unit,report_type,report_region,related_id,
-		companies,types,applications,web_title
+		companies,types,applications,web_title,generalization
 	</sql>
 
 	<select id="findResearchReportCount" parameterType="com.jeesite.modules.report.entity.ResearchReport"