修改话题审核“我的已审”功能列表不展示的问题

修改禁言管理列表排序问题增加禁言管理键盘回车提交查询的事件

修改话题审核“我的已审”功能列表不展示的问题
修改禁言管理列表排序问题增加禁言管理键盘回车提交查询的事件
liwei2917
1 parent 1fb15689
Showing 4 changed files with 18 additions and 13 deletions
src/main/java/com/cnlive/shenhe/controller/TopicController.java
src/main/java/com/cnlive/shenhe/serviceImpl/NotspeakServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/TopicServiceImpl.java
src/main/resources/templates/page/notspeak.html
@@ -79,7 +79,7 @@ public class TopicController extends BaseController {
     @GetMapping("/page")
     public String getPage(Model model,  String topic_name,String topic_id, String topic_tag,
                           String start_date, String end_date, Integer shenhe_status, String sp_desc,
-                          Integer page, Integer pageSize, String orderByClause, HttpSession session) {
+                          Integer page, Integer pageSize,Integer receive, String orderByClause, HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         if(CommonUtils.isNull(sessionUser)){
         	return "redirect:/users/login";
@@ -114,7 +114,7 @@ public class TopicController extends BaseController {
             } catch (Exception e) {
             }
         }
-        PageInfo<ShyTopic> topicPage = topicService.getPage( topic_name,topic_tag,topic_id,  sDate, eDate, shenhe_status, null, page, pageSize, orderByClause, spid, userId);
+        PageInfo<ShyTopic> topicPage = topicService.getPage( topic_name,topic_tag,topic_id,  sDate, eDate, shenhe_status, null, page, pageSize, orderByClause, spid, userId,receive);
         List<ShyTopic> list = topicPage.getList();
         if (!list.isEmpty()) {
             for (ShyTopic topic : list) {
@@ -273,7 +273,7 @@ public class NotspeakServiceImpl {
         if (CommonUtils.isNotEmpty(orderByClause)) {
             example.setOrderByClause(orderByClause);
         } else {
-            example.setOrderByClause("state desc , end_time");
+            example.setOrderByClause("state desc , updated_at desc");
         }
         if (CommonUtils.isNotEmpty(user_name)) {
             criteria.andLike("user_name", "%" + user_name + "%");
@@ -107,7 +107,7 @@ public class TopicServiceImpl {
         return shyCommentsMapper.updateByPrimaryKeySelective(shyComments);
     }
-    public PageInfo<ShyTopic> getPage( String title,String topic_tag,String topicId,  Date start_date, Date end_date,  Integer shenhe_status, String updater, Integer page, Integer pageSize, String orderByClause, Integer spid, String userId) {
+    public PageInfo<ShyTopic> getPage( String title,String topic_tag,String topicId,  Date start_date, Date end_date,  Integer shenhe_status, String updater, Integer page, Integer pageSize, String orderByClause, Integer spid, String userId,Integer receive) {
         Example example = new Example(ShyTopic.class);
         Example.Criteria criteria = example.createCriteria();
         if (CommonUtils.isNotEmpty(orderByClause)) {
@@ -136,11 +136,16 @@ public class TopicServiceImpl {
         if (CommonUtils.isNotEmpty(topicId)) {
         	criteria.andEqualTo("topic_id", topicId);
         }
-        if (CommonUtils.isNotNull(shenhe_status)) {
+        if (CommonUtils.isNotNull(receive)&&receive==CommonConst.RECEIVE_AFTER) {
+            criteria.andEqualTo("auditor_id", userId);
+        }
+        if (CommonUtils.isNotNull(shenhe_status) && shenhe_status != 3) {//不是   我的已审 进来的，只查一种状态
             criteria.andEqualTo("shenhe_status", shenhe_status);
-            if (shenhe_status!=CommonConst.AUDIT_INTT) {
-                criteria.andEqualTo("auditor_id", userId);
-            }
+        } else if (CommonUtils.isNotNull(shenhe_status) && shenhe_status == 3) {//是 我的已审，查通过和拒绝的两种状态
+        	Example.Criteria criteria1 = example.createCriteria();
+        	criteria1.orEqualTo("shenhe_status", 1);
+        	criteria1.orEqualTo("shenhe_status", 2);
+        	example.and(criteria1);
         }
         PageHelper.startPage(page, pageSize, true);
@@ -541,11 +541,11 @@ input:checked + .slider:before {
       //鼠标回车事件
-//         $(document).keyup(function(event){
-//         	  if(event.keyCode ==13){
-//         	    $("#notspeakQuery").trigger("click");
-//         	  }
-//         	});
+        $(document).keyup(function(event){
+        	  if(event.keyCode ==13){
+        		  quanbu();
+        	  }
+        	});
       //打开编辑窗口
 //         function edit(Id,notspeak,remark,write_business){
 //         	$("#myModalLabel").text("编辑邮件消息");