platform / platform-cms · Commits

Go to a project

Authored by liangyi.chen@yoho.cn
Commit 5929af2718021bc59f3354d88b375282f8d5ec9b 1 parent 8411491f

增加按审核时间排序

Inline Side-by-side
Showing 3 changed files with 17 additions and 2 deletions
@@ -178,6 +178,7 @@ public class GrassArticleCommentServiceImpl implements IGrassArticleCommentServi @@ -178,6 +178,7 @@ public class GrassArticleCommentServiceImpl implements IGrassArticleCommentServi
178 grassArticleComment.setContent(req.getContent()); 178 grassArticleComment.setContent(req.getContent());
179 grassArticleComment.setDestId(req.getDestId()); 179 grassArticleComment.setDestId(req.getDestId());
180 grassArticleComment.setColumnType(ArticleCommentAddReq.COLUMNTYPE_ARTICLE); 180 grassArticleComment.setColumnType(ArticleCommentAddReq.COLUMNTYPE_ARTICLE);
  181 + grassArticleComment.setSource(1);
181 //查询内容articleType 182 //查询内容articleType
182 GrassArticle grassArticle = grassArticleDao.selectByPrimaryKey(req.getDestId()); 183 GrassArticle grassArticle = grassArticleDao.selectByPrimaryKey(req.getDestId());
183 if(grassArticle != null){ 184 if(grassArticle != null){
@@ -455,6 +455,7 @@ public class GrassArticleServiceImpl implements IGrassArticleService { @@ -455,6 +455,7 @@ public class GrassArticleServiceImpl implements IGrassArticleService {
455 Long endTimeInt = null; 455 Long endTimeInt = null;
456 Integer authorUid = req.getAuthorUid();//uid 456 Integer authorUid = req.getAuthorUid();//uid
457 String recommendSort = StringUtils.isEmpty(req.getRecommendSort()) || "0".equals(req.getRecommendSort()) ? null : req.getRecommendSort(); 457 String recommendSort = StringUtils.isEmpty(req.getRecommendSort()) || "0".equals(req.getRecommendSort()) ? null : req.getRecommendSort();
  458 + String auditSort = StringUtils.isEmpty(req.getAuditSort()) || "0".equals(req.getAuditSort()) ? null : req.getAuditSort();
458 PageResponseVO rsp = new PageResponseVO(); 459 PageResponseVO rsp = new PageResponseVO();
459 rsp.setList(Lists.newArrayList()); 460 rsp.setList(Lists.newArrayList());
460 rsp.setTotal(0); 461 rsp.setTotal(0);
@@ -495,13 +496,13 @@ public class GrassArticleServiceImpl implements IGrassArticleService { @@ -495,13 +496,13 @@ public class GrassArticleServiceImpl implements IGrassArticleService {
495 int size = req.getSize(); 496 int size = req.getSize();
496 logger.info("start getArticleList: grassArticleDao.getArticleCount "); 497 logger.info("start getArticleList: grassArticleDao.getArticleCount ");
497 int total = grassArticleDao.selectArticleCount(articleId, source, authStatus, authorUids, isRecommend, isTop, startTimeInt, endTimeInt, 498 int total = grassArticleDao.selectArticleCount(articleId, source, authStatus, authorUids, isRecommend, isTop, startTimeInt, endTimeInt,
498 - recommendSort, isExclude, userType, sort, currentTime,req.getMarkFlag(),req.getMarkFindgoods()); 499 + recommendSort, auditSort,isExclude, userType, sort, currentTime,req.getMarkFlag(),req.getMarkFindgoods());
499 logger.info("end getArticleList: grassArticleDao.getArticleCount, total is {}", total); 500 logger.info("end getArticleList: grassArticleDao.getArticleCount, total is {}", total);
500 int offset = (page - 1) * size; 501 int offset = (page - 1) * size;
501 502
502 logger.info("start getArticleList: grassArticleDao.selectArticleList , offset is {}, limit is {}", offset, size); 503 logger.info("start getArticleList: grassArticleDao.selectArticleList , offset is {}, limit is {}", offset, size);
503 List<GrassArticle> articleList = grassArticleDao.selectArticleList(articleId, source, authStatus, authorUids, isRecommend, isTop, startTimeInt, endTimeInt, 504 List<GrassArticle> articleList = grassArticleDao.selectArticleList(articleId, source, authStatus, authorUids, isRecommend, isTop, startTimeInt, endTimeInt,
504 - offset, size, recommendSort, isExclude, userType, sort, currentTime,req.getMarkFlag(),req.getMarkFindgoods()); 505 + offset, size, recommendSort,auditSort, isExclude, userType, sort, currentTime,req.getMarkFlag(),req.getMarkFindgoods());
505 logger.info("end getArticleList: grassArticleDao.selectArticleList , offset is {}, limit is {}", offset, size); 506 logger.info("end getArticleList: grassArticleDao.selectArticleList , offset is {}, limit is {}", offset, size);
506 507
507 rsp.setList(buildArticleDetail(articleList, false)); 508 rsp.setList(buildArticleDetail(articleList, false));
@@ -70,6 +70,8 @@ @@ -70,6 +70,8 @@
70 </input> 70 </input>
71 <input class="easyui-combobox" id="recommendSort"> 71 <input class="easyui-combobox" id="recommendSort">
72 </input> 72 </input>
  73 + <input class="easyui-combobox" id="auditSort">
  74 + </input>
73 <input class="easyui-combobox" id="authStatus"> 75 <input class="easyui-combobox" id="authStatus">
74 </input> 76 </input>
75 <input class="easyui-combobox" id="sortParam"> 77 <input class="easyui-combobox" id="sortParam">
@@ -174,6 +176,15 @@ @@ -174,6 +176,15 @@
174 data:[{text:"选择推荐顺序",value:"0"},{text:"推荐降序",value:"desc"},{text:"推荐升序",value:"asc"}] 176 data:[{text:"选择推荐顺序",value:"0"},{text:"推荐降序",value:"desc"},{text:"推荐升序",value:"asc"}]
175 }); 177 });
176 178
  179 + //审核顺序
  180 + $("#auditSort").combobox({
  181 + valueField : "value",
  182 + textField : "text",
  183 + required:false,
  184 + prompt: "请选择审核顺序",
  185 + data:[{text:"选择审核顺序",value:"0"},{text:"审核降序",value:"desc"},{text:"审核升序",value:"asc"}]
  186 + });
  187 +
177 //是否屏蔽 188 //是否屏蔽
178 $("#authStatus").combobox({ 189 $("#authStatus").combobox({
179 valueField : "value", 190 valueField : "value",
@@ -265,6 +276,7 @@ @@ -265,6 +276,7 @@
265 source: $("#source").combobox("getValue"), 276 source: $("#source").combobox("getValue"),
266 userType: $("#userType").combobox("getValue"), 277 userType: $("#userType").combobox("getValue"),
267 recommendSort:$("#recommendSort").combobox("getValue"), 278 recommendSort:$("#recommendSort").combobox("getValue"),
  279 + auditSort:$("#auditSort").combobox("getValue"),
268 isRecommend: $("#isRecommend").combobox("getValue"), 280 isRecommend: $("#isRecommend").combobox("getValue"),
269 isTop: $("#isTop").combobox("getValue"), 281 isTop: $("#isTop").combobox("getValue"),
270 startTimeStr:startTime, 282 startTimeStr:startTime,
@@ -288,6 +300,7 @@ @@ -288,6 +300,7 @@
288 source: $("#source").textbox("getValue"), 300 source: $("#source").textbox("getValue"),
289 userType: $("#userType").textbox("getValue"), 301 userType: $("#userType").textbox("getValue"),
290 recommendSort:$("#recommendSort").combobox("getValue"), 302 recommendSort:$("#recommendSort").combobox("getValue"),
  303 + auditSort:$("#auditSort").combobox("getValue"),
291 authStatus: $("#authStatus").combobox("getValue") 304 authStatus: $("#authStatus").combobox("getValue")
292 }, 305 },
293 url: serverContextPath + "/grassArticle/articleList", 306 url: serverContextPath + "/grassArticle/articleList",