From 2e64c232ab6b51b2cecf1ee96e1e9b709234f326 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 21 八月 2021 16:35:14 +0800
Subject: [PATCH] 随手拍改版接口开发

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java |   46 +++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java
index 81c70a7..557ea3d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java
@@ -29,24 +29,60 @@
 	@Select("select * from com_act_message_back where msg_id=#{id} order by create_at desc")
 	List<ComActMessageBackVO> selectMsgBackList(@Param("id")Long id);
 	
-	@Select("select * from com_act_message where (sendto_user_id in (select id from com_pb_member_role t1 where t1.phone=#{comActMessageVO.phone})) or (sendto_user_id in (select id from com_pb_service_team t2 where t2.phone=#{comActMessageVO.phone}))  order by create_at desc")
+	@Select("<script>" +
+			"select * from com_act_message " +
+			" where " +
+			" ((sendto_user_id in (select id from com_pb_member_role t1 where t1.phone=#{comActMessageVO.phone})) " +
+			" or (sendto_user_id in (select id from com_pb_service_team t2 where t2.phone=#{comActMessageVO.phone})))" +
+			"<if test='comActMessageVO.status != null'>" +
+			" and status=#{comActMessageVO.status} \n" +
+			" </if> " +
+			" order by create_at desc"+
+			"</script>")
 	IPage<PageComActMessageVO> pageSendMeMessageApplets(Page page, @Param("comActMessageVO")ComActMessageVO comActMessageVO);
 	
 	@Select("select * from com_act_message where user_id=#{comActMessageVO.userId}  order by create_at desc")
 	IPage<PageComActMessageVO> pageMyMessageApplets(Page page, @Param("comActMessageVO")ComActMessageVO comActMessageVO);
-	@Select("select * from com_act_message where sendto_user_id=#{comActMessageVO.sendtoUserId} and ispublic=1")
+	@Select("select * from com_act_message where sendto_user_id=#{comActMessageVO.sendtoUserId} and ispublic=1 order by create_at desc ")
 	IPage<PageComActMessageVO> pageMessageByUserApplets(Page page, @Param("comActMessageVO")ComActMessageVO comActMessageVO);
 	
 	@Update("update com_act_message set ispublic=#{ispublic} where id=#{id}")
 	void updatePublic(@Param("ispublic") Integer ispublic,@Param("id") Long id);
 	
 	@Select("<script> " +
-            "SELECT * \n" +
-            "FROM\n" +
-            "com_act_message t where t.community_id=#{comActMessageVO.communityId}\n" +
+            "SELECT t.id,t.msg_content,t.photo_pah,t.phone,t.sendto_user_id,t.sendto_user_name,t.status,t.ispublic," +
+			"t.user_id,t.user_account,t.user_name,t.user_phone,t.community_id,t.create_at,t.type, u.phone as userAccount \n" +
+            "FROM \n" +
+            " com_act_message t LEFT JOIN sys_user u ON t.user_id = u.user_id " +
+			" where t.community_id=#{comActMessageVO.communityId}\n" +
+            "<if test='comActMessageVO.userAccount != null and comActMessageVO.userAccount.trim() != &quot;&quot;'>" +
+            " and u.phone=#{comActMessageVO.userAccount} \n" +
+            " </if> " +
+            "<if test='comActMessageVO.userName != null and comActMessageVO.userName.trim() != &quot;&quot;'>" +
+            " and t.user_name=#{comActMessageVO.userName} \n" +
+            " </if> " +
             "<if test='comActMessageVO.userPhone != null and comActMessageVO.userPhone.trim() != &quot;&quot;'>" +
             " and t.user_phone=#{comActMessageVO.userPhone} \n" +
             " </if> " +
+            "<if test='comActMessageVO.msgContent != null and comActMessageVO.msgContent.trim() != &quot;&quot;'>" +
+            " and t.msg_content like concat('%',#{comActMessageVO.msgContent},'%') \n" +
+            " </if> " +
+            "<if test='comActMessageVO.status != null and comActMessageVO.status != 0'>" +
+            " and t.`status`=#{comActMessageVO.status} \n" +
+            " </if> " +
+            "<if test='comActMessageVO.ispublic != null and comActMessageVO.ispublic != 0'>" +
+            " and t.ispublic=#{comActMessageVO.ispublic} \n" +
+            " </if> " +
+            "<if test='comActMessageVO.sendtoUserName != null and comActMessageVO.sendtoUserName.trim() != &quot;&quot;'>" +
+            " and t.sendto_user_name=#{comActMessageVO.sendtoUserName} \n" +
+            " </if> " +
+            "<if test='comActMessageVO.publishAtBegin != null '>" +
+            "AND t.create_at BETWEEN #{comActMessageVO.publishAtBegin} \n" +
+            "AND #{comActMessageVO.publishAtEnd} \n" +
+            " </if> " +
+			"<if test='comActMessageVO.type != null and comActMessageVO.type !=0'>" +
+			" AND t.type=#{comActMessageVO.type} \n" +
+			" </if> " +
             " order by create_at desc"+
             "</script>")
 	IPage<PageComActMessageVO> pageMyCommunityMessageApplets(Page page, @Param("comActMessageVO")ComActMessageVO comActMessageVO);

--
Gitblit v1.7.1