From 1b9b482e6c55f043a586665b84d2d0feb8daa397 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期三, 15 九月 2021 14:55:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_bak' into test_bak

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 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 49563f1..a193c72 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
@@ -43,7 +43,7 @@
             "w.`detail`, " +
             "w.form, " +
             "w.reject_reason, " +
-            "su.`name` responsible_name, " +
+            "su1.`name` responsible_name, " +
             "w.score, " +
             "w.img_width, " +
             "w.finish_at, " +
@@ -53,16 +53,16 @@
             "FROM " +
             "com_act_micro_wish w " +
             "left join com_act_micro_wish_user wu on w.id=wu.micro_wish_id "+
-            "JOIN sys_user u ON w.sponsor_id = u.user_id  " +
+            "left JOIN sys_user u ON w.sponsor_id = u.user_id  " +
             "<if test='comActMicroWishVO.sponsorName != null and comActMicroWishVO.sponsorName.trim() != &quot;&quot;'>" +
             "AND u.name like concat(#{comActMicroWishVO.sponsorName},'%')   " +
             " </if> " +
             "<if test='comActMicroWishVO.responsibleName == null or comActMicroWishVO.responsibleName.trim() == &quot;&quot;'>" +
-            "LEFT JOIN com_pb_service_team su ON w.responsible_id = su.id  " +
+            "LEFT JOIN sys_user su1 ON w.responsible_id = su1.user_id  " +
             " </if> " +
             "<if test='comActMicroWishVO.responsibleName != null and comActMicroWishVO.responsibleName.trim() != &quot;&quot;'>" +
-            " JOIN com_pb_service_team su ON w.responsible_id = su.id  " +
-            "AND su.`name` like concat(#{comActMicroWishVO.responsibleName},'%')   " +
+            " JOIN sys_user su1 ON w.responsible_id = su1.user_id  " +
+            "AND su1.`name` like concat(#{comActMicroWishVO.responsibleName},'%')   " +
             " </if> " +
             " <where>" +
             "<if test='comActMicroWishVO.communityId != null and comActMicroWishVO.communityId != 0'>" +
@@ -104,6 +104,8 @@
             "ORDER BY  w.create_at desc "+
             "</script>")
     IPage<ComActMicroWishVO> pageMicroWish(Page page, @Param("comActMicroWishVO") ComActMicroWishVO comActMicroWishVO);
+
+    IPage<ComActMicroWishVO> pageMicroWishApplets(Page page, @Param("comActMicroWishVO") ComActMicroWishVO comActMicroWishVO);
     @Select("SELECT " +
             "w.id, " +
             "u.name sponsor_name, " +
@@ -137,7 +139,7 @@
             "w.evaluate  " +
             "FROM " +
             "com_act_micro_wish w " +
-            "JOIN sys_user u ON w.sponsor_id = u.user_id " +
+            "LEFT JOIN sys_user u ON w.sponsor_id = u.user_id " +
             "LEFT JOIN com_pb_service_team su ON w.responsible_id = su.id  " +
             "LEFT JOIN com_act_micro_wish_user wu ON w.id = wu.micro_wish_id  " +
             "WHERE " +
@@ -169,9 +171,12 @@
             " w.community_id ")
     List<TodoEventsVO> selectNeedToDo(@Param("communityId") Long communityId, @Param("userId") Long userId);
 
-    @Update("update com_act_micro_wish set `status`=6, evaluate_at=now() 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, finish_at, SYSDATE())>=72")
     int updateStatusAutoConfirm();
 
+    @Select("select id from com_act_micro_wish where `status`=5 and TIMESTAMPDIFF(HOUR, feedback_at, SYSDATE())>=72 ")
+    List<Long> getWishAutoConfirmIds();
+
     @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 " +

--
Gitblit v1.7.1