From c1e48a47b39dbd6919bfd9cf2e7023e9f3d6fee8 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 05 十一月 2021 10:24:21 +0800
Subject: [PATCH] 1105测试代码修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 a5d58e1..f023125 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
@@ -56,9 +56,6 @@
"com_act_micro_wish w " +
"left join com_act_micro_wish_user wu on w.id=wu.micro_wish_id "+
"left JOIN sys_user u ON w.sponsor_id = u.user_id " +
- "<if test='comActMicroWishVO.sponsorName != null and comActMicroWishVO.sponsorName.trim() != ""'>" +
- "AND u.name like concat(#{comActMicroWishVO.sponsorName},'%') " +
- " </if> " +
"<if test='comActMicroWishVO.responsibleName == null or comActMicroWishVO.responsibleName.trim() == ""'>" +
"LEFT JOIN sys_user su1 ON w.responsible_id = su1.user_id " +
" </if> " +
@@ -101,11 +98,21 @@
"<if test='comActMicroWishVO.backUserId != null and comActMicroWishVO.backUserId != 0 and comActMicroWishVO.status==0 '>" +
"and (w.status in(1,2,4,5,6) or (w.status=3 and w.responsible_id =#{comActMicroWishVO.backUserId})) " +
" </if> " +
+ "<if test='comActMicroWishVO.sponsorName != null and comActMicroWishVO.sponsorName.trim() != ""'>" +
+ "AND u.name like concat(#{comActMicroWishVO.sponsorName},'%') " +
+ " </if> " +
" </where>" +
" group by w.id "+
"ORDER BY w.create_at desc "+
"</script>")
IPage<ComActMicroWishVO> pageMicroWish(Page page, @Param("comActMicroWishVO") ComActMicroWishVO comActMicroWishVO);
+
+ /**
+ * 社区后台分页查询微心愿
+ * @param comActMicroWishVO 请求参数
+ * @return 微心愿列表
+ */
+ IPage<ComActMicroWishVO> pageMicroWishAdmin(Page page, @Param("comActMicroWishVO") ComActMicroWishVO comActMicroWishVO);
IPage<ComActMicroWishVO> pageMicroWishApplets(Page page, @Param("comActMicroWishVO") ComActMicroWishVO comActMicroWishVO);
@Select("SELECT " +
@@ -177,7 +184,7 @@
@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 ")
+ @Select("select id from com_act_micro_wish where `status`=5 and TIMESTAMPDIFF(HOUR, finish_at, SYSDATE())>=72 ")
List<Long> getWishAutoConfirmIds();
@Select("SELECT COUNT(id) AS completedNum," +
--
Gitblit v1.7.1