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 | 29 +++++++++--------------------
1 files changed, 9 insertions(+), 20 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 a1f5319..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
@@ -58,12 +58,13 @@
"t.state,\n" +
"t.phone,\n" +
"t.apply_reson,\n" +
- "t.create_at \n" +
+ "t.create_at, " +
+ "t.submit_user_id \n" +
"FROM\n" +
"com_mng_volunteer_mng t\n" +
" RIGHT JOIN \n" +
- "(select phone, MAX(create_at)create_at from com_mng_volunteer_mng where state IN ( 1, 3 ) GROUP BY phone ) tmp \n" +
- "on t.create_at = tmp.create_at and t.phone=tmp.phone "+
+ "(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) and community_id=#{comMngVolunteerMngVO.communityId} \n" +
"<if test='comMngVolunteerMngVO.name != null and comMngVolunteerMngVO.name.trim() != ""'>" +
@@ -78,29 +79,17 @@
" \tORDER BY t.state asc " +
"</script>")
IPage<ComMngVolunteerMngVO> pageVolunteerExamine(Page page, @Param("comMngVolunteerMngVO") ComMngVolunteerMngVO comMngVolunteerMngVO);
- @Select("SELECT\n" +
- "'人脸采集' FUNCTION,\n" +
- "'待审核' behavior,\n" +
- "'新增人脸采集信息待审核' words \n" +
- "FROM\n" +
- "sys_user u \n" +
- "WHERE\n" +
- "u.face_state = 0 \n" +
- "AND u.community_id = #{communityId} \n" +
- "GROUP BY\n" +
- "u.community_id UNION ALL\n" +
+ @Select(
"SELECT\n" +
- "'志愿者审核' FUNCTION,\n" +
- "'待审核' behavior,\n" +
- "'新增志愿者申请待审核' words \n" +
+ "'4' type\n" +
"FROM\n" +
"com_mng_volunteer_mng v \n" +
"WHERE\n" +
"v.state = 1 \n" +
- "AND v.`community_id` = #{communityId} \n" +
- "GROUP BY\n" +
- "v.community_id")
+ "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