diff --git a/src/main/java/net/mingsoft/cms/dao/IContentDao.xml b/src/main/java/net/mingsoft/cms/dao/IContentDao.xml
index 6383ef38..b9f8bf80 100644
--- a/src/main/java/net/mingsoft/cms/dao/IContentDao.xml
+++ b/src/main/java/net/mingsoft/cms/dao/IContentDao.xml
@@ -17,6 +17,7 @@
+
@@ -43,6 +44,7 @@
content_keyword,
content_details,
content_url,
+ content_hit,
appid,
create_by,
create_date,
@@ -64,6 +66,7 @@
#{contentKeyword},
#{contentDetails},
#{contentUrl},
+ #{contentHit},
#{appid},
#{createBy},
#{createDate},
@@ -90,6 +93,7 @@
content_keyword=#{contentKeyword},
content_details=#{contentDetails},
content_url=#{contentUrl},
+ content_hit=#{contentHit},
appid=#{appid},
create_by=#{createBy},
create_date=#{createDate},
@@ -122,6 +126,7 @@
and content_keyword=#{contentKeyword}
and content_details=#{contentDetails}
and content_url=#{contentUrl}
+ and content_hit=#{contentHit}
and appid=#{appid}
and create_by=#{createBy}
and create_date=#{createDate}
@@ -156,7 +161,7 @@
and content_title like CONCAT('%',#{contentTitle},'%')
and content_category_id=#{contentCategoryId}
- and content_type=#{contentType}
+ and content_type LIKE CONCAT('%',#{contentType},'%')
and content_display=#{contentDisplay}
and content_author=#{contentAuthor}
and content_source=#{contentSource}
@@ -167,6 +172,7 @@
and content_keyword=#{contentKeyword}
and content_details=#{contentDetails}
and content_url=#{contentUrl}
+ and content_hit=#{contentHit}
and appid=#{appid}
and create_by=#{createBy}
and create_date=#{createDate}
diff --git a/src/main/java/net/mingsoft/cms/entity/ContentEntity.java b/src/main/java/net/mingsoft/cms/entity/ContentEntity.java
index fa99f8d5..fe1ccdc2 100644
--- a/src/main/java/net/mingsoft/cms/entity/ContentEntity.java
+++ b/src/main/java/net/mingsoft/cms/entity/ContentEntity.java
@@ -74,7 +74,18 @@ private static final long serialVersionUID = 1574925152617L;
* 文章管理的应用id
*/
private Integer appid;
+ /**
+ * 点击次数
+ */
+ private Integer contentHit;
+ public Integer getContentHit() {
+ return contentHit;
+ }
+
+ public void setContentHit(Integer contentHit) {
+ this.contentHit = contentHit;
+ }
/**
* 设置文章标题
diff --git a/src/main/webapp/WEB-INF/manager/cms/content/main.ftl b/src/main/webapp/WEB-INF/manager/cms/content/main.ftl
index 201c4758..ba2d664e 100644
--- a/src/main/webapp/WEB-INF/manager/cms/content/main.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/content/main.ftl
@@ -62,13 +62,18 @@
-
+
-
+
-
+
-
+
+
+ {{scope.row.contentHit?scope.row.contentHit:0}}
+
+
+
@@ -151,6 +156,9 @@
pageSize : that.pageSize
}
var form = JSON.parse(JSON.stringify(that.form))
+ if(form.contentType.length > 0){
+ form.contentType = form.contentType.join(',');
+ }
for (key in form){
if(!form[key]){
delete form[key]
@@ -244,6 +252,13 @@
}
return value;
},
+ dateFormat: function(row, column, cellValue, index){
+ if(cellValue){
+ return ms.util.date.fmt(cellValue,'yyyy-MM-dd');
+ } else {
+ return ''
+ }
+ },
contentDisplayFormat(row, column, cellValue, index){
var value="";
if(cellValue){