周伟鹏 / cnlive_shenhe · Commits

Commit c2f3e20a4057dcf91a0d19c51626801a2d692d92

Authored by liwei2917
1 parent 1fb15689

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

修改禁言管理列表排序问题
增加禁言管理键盘回车提交查询的事件
Inline Side-by-side
Showing 4 changed files with 18 additions and 13 deletions
src/main/java/com/cnlive/shenhe/controller/TopicController.java
  View file @c2f3e20
... ... @@ -79,7 +79,7 @@ public class TopicController extends BaseController {
79 79 @GetMapping("/page")
80 80 public String getPage(Model model, String topic_name,String topic_id, String topic_tag,
81 81 String start_date, String end_date, Integer shenhe_status, String sp_desc,
82   - Integer page, Integer pageSize, String orderByClause, HttpSession session) {
  82 + Integer page, Integer pageSize,Integer receive, String orderByClause, HttpSession session) {
83 83 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
84 84 if(CommonUtils.isNull(sessionUser)){
85 85 return "redirect:/users/login";
... ... @@ -114,7 +114,7 @@ public class TopicController extends BaseController {
114 114 } catch (Exception e) {
115 115 }
116 116 }
117   - PageInfo<ShyTopic> topicPage = topicService.getPage( topic_name,topic_tag,topic_id, sDate, eDate, shenhe_status, null, page, pageSize, orderByClause, spid, userId);
  117 + PageInfo<ShyTopic> topicPage = topicService.getPage( topic_name,topic_tag,topic_id, sDate, eDate, shenhe_status, null, page, pageSize, orderByClause, spid, userId,receive);
118 118 List<ShyTopic> list = topicPage.getList();
119 119 if (!list.isEmpty()) {
120 120 for (ShyTopic topic : list) {
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/NotspeakServiceImpl.java
  View file @c2f3e20
... ... @@ -273,7 +273,7 @@ public class NotspeakServiceImpl {
273 273 if (CommonUtils.isNotEmpty(orderByClause)) {
274 274 example.setOrderByClause(orderByClause);
275 275 } else {
276   - example.setOrderByClause("state desc , end_time");
  276 + example.setOrderByClause("state desc , updated_at desc");
277 277 }
278 278 if (CommonUtils.isNotEmpty(user_name)) {
279 279 criteria.andLike("user_name", "%" + user_name + "%");
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/TopicServiceImpl.java
  View file @c2f3e20
... ... @@ -107,7 +107,7 @@ public class TopicServiceImpl {
107 107 return shyCommentsMapper.updateByPrimaryKeySelective(shyComments);
108 108 }
109 109  
110   - 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) {
  110 + 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) {
111 111 Example example = new Example(ShyTopic.class);
112 112 Example.Criteria criteria = example.createCriteria();
113 113 if (CommonUtils.isNotEmpty(orderByClause)) {
... ... @@ -136,11 +136,16 @@ public class TopicServiceImpl {
136 136 if (CommonUtils.isNotEmpty(topicId)) {
137 137 criteria.andEqualTo("topic_id", topicId);
138 138 }
139   - if (CommonUtils.isNotNull(shenhe_status)) {
  139 + if (CommonUtils.isNotNull(receive)&&receive==CommonConst.RECEIVE_AFTER) {
  140 + criteria.andEqualTo("auditor_id", userId);
  141 + }
  142 + if (CommonUtils.isNotNull(shenhe_status) && shenhe_status != 3) {//不是 我的已审 进来的，只查一种状态
140 143 criteria.andEqualTo("shenhe_status", shenhe_status);
141   - if (shenhe_status!=CommonConst.AUDIT_INTT) {
142   - criteria.andEqualTo("auditor_id", userId);
143   - }
  144 + } else if (CommonUtils.isNotNull(shenhe_status) && shenhe_status == 3) {//是 我的已审，查通过和拒绝的两种状态
  145 + Example.Criteria criteria1 = example.createCriteria();
  146 + criteria1.orEqualTo("shenhe_status", 1);
  147 + criteria1.orEqualTo("shenhe_status", 2);
  148 + example.and(criteria1);
144 149 }
145 150  
146 151 PageHelper.startPage(page, pageSize, true);
... ...
src/main/resources/templates/page/notspeak.html
  View file @c2f3e20
... ... @@ -541,11 +541,11 @@ input:checked + .slider:before {
541 541  
542 542  
543 543 //鼠标回车事件
544   -// $(document).keyup(function(event){
545   -// if(event.keyCode ==13){
546   -// $("#notspeakQuery").trigger("click");
547   -// }
548   -// });
  544 + $(document).keyup(function(event){
  545 + if(event.keyCode ==13){
  546 + quanbu();
  547 + }
  548 + });
549 549 //打开编辑窗口
550 550 // function edit(Id,notspeak,remark,write_business){
551 551 // $("#myModalLabel").text("编辑邮件消息");
... ...