From 8b63848c363a6aadca8b459800ebd7ecac41bb23 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 03 九月 2021 09:14:22 +0800
Subject: [PATCH] 微心愿接口bug修复
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentDAO.java | 59 +++++++++++++++++++++++++----------------------------------
1 files changed, 25 insertions(+), 34 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentDAO.java
index 5ce5fe2..fee9511 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentDAO.java
@@ -1,18 +1,17 @@
package com.panzhihua.service_community.dao;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.panzhihua.common.model.dtos.neighbor.DetailNeighborAllCommentByAdminDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO;
-import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAppVO;
-import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleCommentAppVO;
-import com.panzhihua.common.model.vos.neighbor.ComActNeighborCommentByAdminVO;
-import com.panzhihua.service_community.model.dos.ComActNeighborCircleCommentDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO;
+import com.panzhihua.common.model.dtos.neighbor.DetailNeighborAllCommentByAdminDTO;
+import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleCommentAppVO;
+import com.panzhihua.common.model.vos.neighbor.ComActNeighborCommentByAdminVO;
+import com.panzhihua.service_community.model.dos.ComActNeighborCircleCommentDO;
/**
* @auther lyq
@@ -22,29 +21,21 @@
@Mapper
public interface ComActNeighborCircleCommentDAO extends BaseMapper<ComActNeighborCircleCommentDO> {
- @Select("<script> " +
- "select cancc.id,cancc.circle_id,cancc.user_id,cancc.content,cancc.fabulous_num" +
- ",cancc.create_at,cancc.is_release,su.nick_name as userName,su.image_url as userHeadUrl " +
- " from com_act_neighbor_circle_comment as cancc " +
- " left join sys_user as su on su.user_id = cancc.user_id" +
- " where cancc.circle_id = #{neighborCircleAppDTO.circleId} and cancc.status = 1" +
- "<if test='neighborCircleAppDTO.order != null and neighborCircleAppDTO.order == 1'>" +
- " order by cancc.create_at desc" +
- " </if> " +
- "<if test='neighborCircleAppDTO.order != null and neighborCircleAppDTO.order == 2'>" +
- " order by cancc.create_at asc" +
- " </if> " +
- " </script>")
- IPage<ComActNeighborCircleCommentAppVO> pageNeighborCommentByApp(Page page, @Param("neighborCircleAppDTO") ComActNeighborCircleDetailAppDTO neighborCircleAppDTO);
+ @Select("<script> " + "select cancc.id,cancc.circle_id,cancc.user_id,cancc.content,cancc.fabulous_num"
+ + ",cancc.create_at,cancc.is_release,su.nick_name as userName,su.image_url as userHeadUrl "
+ + " from com_act_neighbor_circle_comment as cancc " + " left join sys_user as su on su.user_id = cancc.user_id"
+ + " where cancc.circle_id = #{neighborCircleAppDTO.circleId} and cancc.status = 1"
+ + "<if test='neighborCircleAppDTO.order != null and neighborCircleAppDTO.order == 1'>"
+ + " order by cancc.create_at desc" + " </if> "
+ + "<if test='neighborCircleAppDTO.order != null and neighborCircleAppDTO.order == 2'>"
+ + " order by cancc.create_at asc" + " </if> " + " </script>")
+ IPage<ComActNeighborCircleCommentAppVO> pageNeighborCommentByApp(Page page,
+ @Param("neighborCircleAppDTO") ComActNeighborCircleDetailAppDTO neighborCircleAppDTO);
- @Select("<script> " +
- "select nc.*,u.name as userName from com_act_neighbor_circle_comment nc left join sys_user u on nc.user_id=u.user_id " +
- "<where>"+
- "<if test='dto.id != null and pageActWorkGuideDTO.dto!= 0l'>" +
- "circle_id = #{dto.id}"+
- " </if> " +
- "</where>"+
- " ORDER BY create_at"+
- "</script>")
- IPage<ComActNeighborCommentByAdminVO> selectPageDetailNeighborComment(Page page, DetailNeighborAllCommentByAdminDTO dto);
+ @Select("<script> "
+ + "select nc.*,u.nick_name as userName,u.phone as userPhone from com_act_neighbor_circle_comment nc left join sys_user u on nc.user_id=u.user_id "
+ + "<where>" + "<if test='dto.id != null and dto.id!= 0l'>" + "nc.circle_id = #{dto.id}" + " </if> " + "</where>"
+ + " ORDER BY create_at" + "</script>")
+ IPage<ComActNeighborCommentByAdminVO> selectPageDetailNeighborComment(Page page,
+ @Param("dto") DetailNeighborAllCommentByAdminDTO dto);
}
--
Gitblit v1.7.1