From 2dbd65c087d193db8f084be2dabe5e91f54ad7a1 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 24 五月 2021 15:21:45 +0800
Subject: [PATCH] change:随手拍、一起议、微心愿 添加昵称字段

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java |   61 +++++++++++++++++++++++++++---
 1 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java
index 9bdbf05..97a23b0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java
@@ -9,6 +9,7 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -24,16 +25,24 @@
             "d.title,\n" +
             "COUNT(u.id)readNum,\n" +
             "d.`status`,\n" +
+            "d.`content`,\n" +
+            "d.`cover`,\n" +
+            "d.`type`,\n" +
+            "d.`cover_mode`,\n" +
             "d.is_topping,\n" +
             "d.publish_at,\n" +
-            "d.create_at\n" +
+            "d.create_at,\n" +
+            "ca.name as communityName \n" +
             "FROM\n" +
             "com_act_dyn d\n" +
             "LEFT JOIN com_act_dyn_user u ON d.id = u.dyn_id \n" +
-            "WHERE\n" +
-            "d.community_id=#{comActDynVO.communityId}\n" +
+            "LEFT JOIN com_act ca ON d.community_id = ca.community_id \n" +
+            "WHERE 1=1 \n" +
+            "<if test='comActDynVO.choice == 0 '>" +
+            "and d.community_id=#{comActDynVO.communityId}\n" +
+            " </if> " +
             "<if test='comActDynVO.title != null and comActDynVO.title.trim() != &quot;&quot;'>" +
-            "d.title = #{comActDynVO.title} \n" +
+            "AND d.title like concat(#{comActDynVO.title},'%')  \n" +
             " </if> " +
             "<if test='comActDynVO.isTopping != null '>" +
             "AND d.is_topping = #{comActDynVO.isTopping} \n" +
@@ -41,12 +50,52 @@
             "<if test='comActDynVO.status != null '>" +
             "AND d.`status` = #{comActDynVO.status} \n" +
             " </if> " +
-            "<if test='comActDynVO.publishAtBegin != null and comActDynVO.publishAtBegin.trim() != &quot;&quot;'>" +
+            "<if test='comActDynVO.publishAtBegin != null '>" +
             "AND d.publish_at BETWEEN #{comActDynVO.publishAtBegin} \n" +
             "AND #{comActDynVO.publishAtEnd}" +
             " </if> " +
             " group by d.id  "+
-            " order by d.is_topping , d.create_at desc "+
+            " order by d.is_topping desc, d.create_at desc "+
             "</script>")
     IPage<ComActDynVO> pageDynamic(Page page, @Param("comActDynVO") ComActDynVO comActDynVO);
+    @Update("update com_act_dyn set `status`=1 WHERE `status`=0 and TIMESTAMPDIFF(MINUTE, SYSDATE(), publish_at)<=0 ")
+    int timedTaskDynStatus();
+
+    @Select("<script> " +
+            "SELECT \n" +
+            "d.id,\n" +
+            "d.title,\n" +
+            "COUNT(u.id)readNum,\n" +
+            "d.`status`,\n" +
+            "d.`content`,\n" +
+            "d.`cover`,\n" +
+            "d.`type`,\n" +
+            "d.`cover_mode`,\n" +
+            "d.is_topping,\n" +
+            "d.publish_at,\n" +
+            "d.create_at,\n" +
+            "ca.name as communityName \n" +
+            "FROM\n" +
+            "com_act_dyn d\n" +
+            "LEFT JOIN com_act_dyn_user u ON d.id = u.dyn_id \n" +
+            "LEFT JOIN com_act ca ON d.community_id = ca.community_id \n" +
+            "WHERE \n" +
+            "d.community_id=#{comActDynVO.communityId}\n" +
+            "<if test='comActDynVO.title != null and comActDynVO.title.trim() != &quot;&quot;'>" +
+            "AND d.title like concat(#{comActDynVO.title},'%')  \n" +
+            " </if> " +
+            "<if test='comActDynVO.isTopping != null '>" +
+            "AND d.is_topping = #{comActDynVO.isTopping} \n" +
+            " </if> " +
+            "<if test='comActDynVO.status != null '>" +
+            "AND d.`status` = #{comActDynVO.status} \n" +
+            " </if> " +
+            "<if test='comActDynVO.publishAtBegin != null '>" +
+            "AND d.publish_at BETWEEN #{comActDynVO.publishAtBegin} \n" +
+            "AND #{comActDynVO.publishAtEnd}" +
+            " </if> " +
+            " group by d.id  "+
+            " order by d.is_topping desc, d.create_at desc "+
+            "</script>")
+    IPage<ComActDynVO> pageDynamicByAdmin(Page page, @Param("comActDynVO") ComActDynVO comActDynVO);
 }

--
Gitblit v1.7.1