update

周伟鹏
1 parent 32831ec3
Showing 2 changed files with 18 additions and 23 deletions
src/main/java/com/cnlive/shenhe/controller/CommentsController.java
src/main/java/com/cnlive/shenhe/serviceImpl/CommentsServiceImpl.java
@@ -48,7 +48,7 @@ public class CommentsController {
      */
     @GetMapping("/page")
     public String getPage(Model model, String activity_id, String content, Integer is_hot,
-                          String start_date, String end_date, String state,Boolean receive,
+                          String start_date, String end_date, String state, Boolean receive,
                           Integer page, Integer pageSize, String orderByClause, HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         Integer spid = sessionUser.getSpid();
@@ -71,7 +71,7 @@ public class CommentsController {
             } catch (Exception e) {
             }
         }
-        PageInfo<ShyComments> commentPage = commentsService.getPage(activity_id, content, is_hot, sDate, eDate, state,receive, null, page, pageSize, orderByClause, spid,userId);
+        PageInfo<ShyComments> commentPage = commentsService.getPage(activity_id, content, is_hot, sDate, eDate, state, receive, null, page, pageSize, orderByClause, spid, userId);
         List<ShyComments> list = commentPage.getList();
         if (!list.isEmpty()) {
             for (ShyComments comment : list) {
@@ -83,8 +83,8 @@ public class CommentsController {
                         user.setUser_id(auditor_id);
                         user = usersService.select(user);
                         if (CommonUtils.isNotNull(user)) {
-                            String userName = CommonUtils.isEmpty(user.getUsername())?"":user.getUsername();
-                            String email = CommonUtils.isEmpty(user.getEmail())?"":user.getEmail();
+                            String userName = CommonUtils.isEmpty(user.getUsername()) ? "" : user.getUsername();
+                            String email = CommonUtils.isEmpty(user.getEmail()) ? "" : user.getEmail();
                             auditor = userName + email;
                         }
                     }
@@ -152,33 +152,30 @@ public class CommentsController {
     /**
      * 认领
-     * @param ids 根据id认领
-     * @param num 认领条数
+     *
+     * @param ids     根据id认领
+     * @param num     认领条数
      * @param session
      * @return
      */
     @PostMapping("/receive")
     @ResponseBody
-    public ResponseBean receive(String ids, Integer num,HttpSession session) {
+    public ResponseBean receive(String ids, Integer num, HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         String userId = sessionUser.getUserId();
         Integer spid = sessionUser.getSpid();
-        Integer n = commentsService.receive(ids, num, userId,spid);
-        return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(),"认领到"+n+"条内容");
+        Integer n = commentsService.receive(ids, num, userId, spid);
+        return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(), "认领到" + n + "条内容");
     }
     @PostMapping("/retReceive")
     @ResponseBody
-    public ResponseBean retReceive(String ids,HttpSession session) {
+    public ResponseBean retReceive(String ids, HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         String userId = sessionUser.getUserId();
-        boolean n = commentsService.retReceive(ids, userId);
-        if(n){
-            return new ResponseBean();
-        }else{
-            return new ResponseBean(ErrorEnum.ERROR);
-        }
+        Integer n = commentsService.retReceive(ids, userId);
+        return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(), "退领了" + n + "条内容");
     }
 }
@@ -220,21 +220,19 @@ public class CommentsServiceImpl {
         return n;
     }
-    public boolean retReceive(String ids, String userId) {
-        boolean result = true;
+    public Integer retReceive(String ids, String userId) {
+        Integer n = 0;
         String[] cids = ids.split(",");
         for (String cid : cids) {
             ShyComments shyComments = shyCommentsMapper.selectByPrimaryKey(Integer.parseInt(cid));
-            if (shyComments.getState() == CommonConst.AUDIT_INTT && shyComments.getReceive() && shyComments.getReceive_user_id() == userId) {
+            if (shyComments.getState() == CommonConst.AUDIT_INTT && shyComments.getReceive() && userId.equals(shyComments.getReceive_user_id())) {
                 shyComments.setReceive(CommonConst.RECEIVE_BEFORE);
                 shyComments.setReceive_user_id(null);
                 int i = shyCommentsMapper.updateByPrimaryKeySelective(shyComments);
-                if (i != 1) result = false;
-            } else {
-                result = false;
+                if (i == 1) n++;
             }
         }
-        return result;
+        return n;
     }
 }