From 6af3a9c58565a5616105d8c76b1cf91bae36d38a Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 16 六月 2021 21:25:41 +0800
Subject: [PATCH] 修改bug

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 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 21bbb4e..e18aee3 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
@@ -12,6 +12,7 @@
 import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -26,6 +27,7 @@
             "SELECT\n" +
             "w.id,\n" +
             "u.name sponsor_name,\n" +
+            "u.nick_name userNickName,\n" +
             "u.image_url ,\n" +
             "w.sponsor_phone,\n" +
             "w.wish_name,\n" +
@@ -99,6 +101,7 @@
     @Select("SELECT\n" +
             "w.id,\n" +
             "u.name sponsor_name,\n" +
+            "u.nick_name userNickName,\n" +
             "w.create_at,\n" +
             "u.image_url,\n" +
             "w.sponsor_phone,\n" +
@@ -156,7 +159,15 @@
             "\tw.community_id\n")
     List<TodoEventsVO> selectNeedToDo(@Param("communityId") Long communityId, @Param("userId") Long userId);
 
-    @Update("update com_act_micro_wish set `status`=6 where `status`=5 and TIMESTAMPDIFF(HOUR, feedback_at, SYSDATE())>=72")
+    @Update("update com_act_micro_wish set `status`=6, evaluate_at=now() where `status`=5 and TIMESTAMPDIFF(HOUR, feedback_at, SYSDATE())>=72")
     int updateStatusAutoConfirm();
 
+    @Select("SELECT COUNT(id) AS completedNum," +
+            "(SELECT COUNT(id) FROM com_act_micro_wish WHERE community_id = #{communityId} AND (status =1 OR status =2 OR status = 3 OR status = 5)) AS willNum ," +
+            "(SELECT COUNT(id) FROM com_act_micro_wish WHERE community_id = #{communityId} AND (status =1 OR status =2 OR status = 3 OR status = 5 OR status = 6) AND create_at LIKE CONCAT(#{nowDate},'%')) AS currentNum " +
+            "FROM com_act_micro_wish WHERE community_id = #{communityId} AND status = 6 ")
+    Map<String, Long> countByCommunityId(@Param("communityId") Long communityId,@Param("nowDate") String nowDate);
+
+    @Select("SELECT photo_path_list FROM com_act_micro_wish WHERE community_id = #{communityId} AND (status =1 OR status =2 OR status = 3 OR status = 5 OR status = 6) ORDER BY create_at DESC limit #{pageSize}")
+    List<String> getAllImgs(@Param("communityId") Long communityId,@Param("pageSize") Integer pageSize);
 }

--
Gitblit v1.7.1