From a3aa71fd0ba1b48fe52f080e8d2776f50c5ed514 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期二, 27 四月 2021 11:32:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
index 86f0d9e..e1c20af 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.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;
import java.util.List;
@@ -62,8 +63,11 @@
"<if test='comActMicroWishVO.sponsorPhone != null and comActMicroWishVO.sponsorPhone.trim() != ""'>" +
"AND w.sponsor_phone like concat(#{comActMicroWishVO.sponsorPhone},'%') \n" +
" </if> " +
- "<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 and comActMicroWishVO.isPageMyWish==null'>" +
+ "<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 and comActMicroWishVO.status!=3 and comActMicroWishVO.isPageMyWish==null'>" +
"AND w.`status` = #{comActMicroWishVO.status} \n" +
+ " </if> " +
+ "<if test='comActMicroWishVO.status == 3 and comActMicroWishVO.isPageMyWish==null'>" +
+ "AND ( w.`status` = 3 or w.`status` = 5 )\n" +
" </if> " +
"<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 and comActMicroWishVO.isPageMyWish!=null and comActMicroWishVO.status==1'>" +
"AND w.`status` in (1,2) \n" +
@@ -73,7 +77,7 @@
"AND #{comActMicroWishVO.createEnd}" +
" </if> " +
"<if test='comActMicroWishVO.isApplets != null and comActMicroWishVO.isApplets != 0'>" +
- "AND w.status in (3,6) \n" +
+ "AND w.status in (3, 5, 6) \n" +
" </if> " +
"<if test='comActMicroWishVO.userId != null and comActMicroWishVO.userId != 0'>" +
"AND w.sponsor_id =#{comActMicroWishVO.userId} \n" +
@@ -122,13 +126,12 @@
"LEFT JOIN com_act_micro_wish_user wu ON w.id = wu.micro_wish_id \n" +
"WHERE\n" +
"w.id =#{id}"+
- " group by w.id "
+ " group by w.id " +
+ "order by w.create_at desc"
)
ComActMicroWishVO detailMicroWish(Long id);
@Select("SELECT\n" +
- "'微心愿' FUNCTION,\n" +
- "'待审核' behavior,\n" +
- "'新增微心愿动态待审核' words \n" +
+ "'2' type\n" +
"FROM\n" +
"com_act_micro_wish w \n" +
"WHERE\n" +
@@ -138,9 +141,7 @@
"union all \n" +
"\n" +
"SELECT\n" +
- "\t'微心愿' FUNCTION,\n" +
- "\t'需要进行反馈' behavior,\n" +
- "\t'微心愿有待反馈动态' words \n" +
+ "'2' type\n" +
"FROM\n" +
"\tcom_act_micro_wish w \n" +
"WHERE\n" +
@@ -151,4 +152,8 @@
"GROUP BY\n" +
"\tw.community_id\n")
List<TodoEventsVO> selectNeedToDo(@Param("communityId") Long communityId, @Param("userId") Long userId);
+
+ @Update("update com_act_micro_wish set `status`=4 where `status`=5 and TIMESTAMPDIFF(HOUR, feedback_at, SYSDATE())>=72")
+ int updateStatusAutoConfirm();
+
}
--
Gitblit v1.7.1