From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVolunteerMngDAO.java | 47 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVolunteerMngDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVolunteerMngDAO.java
index cb7d029..4de6c94 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVolunteerMngDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVolunteerMngDAO.java
@@ -4,10 +4,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
+import com.panzhihua.common.model.vos.community.TodoEventsVO;
import com.panzhihua.service_community.model.dos.ComMngVolunteerMngDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -39,10 +42,10 @@
"com_mng_volunteer_mng \n" +
" where state=2 and community_id=#{comMngVolunteerMngVO.communityId}" +
"<if test='comMngVolunteerMngVO.name != null and comMngVolunteerMngVO.name.trim() != ""'>" +
- " and name = #{comMngVolunteerMngVO.name} \n" +
+ " and name like concat(#{comMngVolunteerMngVO.name},'%') \n" +
" </if> " +
"<if test='comMngVolunteerMngVO.phone != null and comMngVolunteerMngVO.phone.trim() != ""'>" +
- "AND phone = #{comMngVolunteerMngVO.phone}" +
+ "AND phone like concat(#{comMngVolunteerMngVO.phone},'%') " +
" </if> " +
" order by integral desc,create_at desc"+
"</script>")
@@ -50,25 +53,43 @@
@Select("<script> " +
"SELECT\n" +
- "id,\n" +
- "`name`,\n" +
- "state,\n" +
- "phone,\n" +
- "create_at \n" +
+ "t.id,\n" +
+ "t.`name`,\n" +
+ "t.state,\n" +
+ "t.phone,\n" +
+ "t.apply_reson,\n" +
+ "t.create_at, " +
+ "t.submit_user_id \n" +
"FROM\n" +
- "com_mng_volunteer_mng \n" +
+ "com_mng_volunteer_mng t\n" +
+ " RIGHT JOIN \n" +
+ "(select submit_user_id, MAX(create_at)create_at from com_mng_volunteer_mng where state IN ( 1, 3 ) GROUP BY submit_user_id ) tmp \n" +
+ "on t.create_at = tmp.create_at and t.submit_user_id=tmp.submit_user_id "+
"WHERE\n" +
- "state in (1,3)\n" +
+ "state in (1,3) and community_id=#{comMngVolunteerMngVO.communityId} \n" +
"<if test='comMngVolunteerMngVO.name != null and comMngVolunteerMngVO.name.trim() != ""'>" +
- "and name = #{comMngVolunteerMngVO.name} \n" +
+ "and t.name like concat(#{comMngVolunteerMngVO.name},'%') \n" +
" </if> " +
"<if test='comMngVolunteerMngVO.phone != null and comMngVolunteerMngVO.phone.trim() != ""'>" +
- "AND phone = #{comMngVolunteerMngVO.phone}\n" +
+ "AND t.phone like concat(#{comMngVolunteerMngVO.phone},'%')\n" +
" </if> " +
"<if test='comMngVolunteerMngVO.state != null and comMngVolunteerMngVO.state != 0'>" +
- "and state=#{comMngVolunteerMngVO.state}\n" +
+ "and t.state=#{comMngVolunteerMngVO.state}\n" +
" </if> " +
- "ORDER BY state asc " +
+ " \tORDER BY t.state asc " +
"</script>")
IPage<ComMngVolunteerMngVO> pageVolunteerExamine(Page page, @Param("comMngVolunteerMngVO") ComMngVolunteerMngVO comMngVolunteerMngVO);
+ @Select(
+ "SELECT\n" +
+ "'4' type\n" +
+ "FROM\n" +
+ "com_mng_volunteer_mng v \n" +
+ "WHERE\n" +
+ "v.state = 1 \n" +
+ "AND v.`community_id` = #{communityId} \n"
+ )
+ List<TodoEventsVO> selectNeedToDo(Long communityId);
+ @Select("select user_id from sys_user where type=1 and phone=#{phone}")
+ Long selectUserIdByPhone(String phone);
+
}
--
Gitblit v1.7.1