From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVolunteerMngDAO.java | 159 +++++++++++++++++++++++++----------------------------
1 files changed, 75 insertions(+), 84 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..b761fc7 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
@@ -1,16 +1,19 @@
package com.panzhihua.service_community.dao;
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.StatisticsCommVO;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenVolunteerStatisticsInfo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
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
@@ -20,87 +23,75 @@
**/
@Mapper
public interface ComMngVolunteerMngDAO extends BaseMapper<ComMngVolunteerMngDO> {
- // @Select("<script> " +
-// " <where>" +
-// "<if test='nameCn != null and nameCn.trim() != ""'>" +
-// " </if> " +
-// "<if test='nameCn != null and nameCn.trim() != ""'>" +
-// " </if> " +
-// "<if test='nameCn != null and nameCn.trim() != ""'>" +
-// " </if> " +
-// " </where>" +
-// "</script>")
- @Select("<script> " +
- "SELECT\n" +
- "id,\n" +
- "`name`,\n" +
- "photo_path,\n" +
- "phone,\n" +
- "integral,\n" +
- "create_at \n" +
- "FROM\n" +
- "com_mng_volunteer_mng \n" +
- " where state=2 and community_id=#{comMngVolunteerMngVO.communityId}" +
- "<if test='comMngVolunteerMngVO.name != null and comMngVolunteerMngVO.name.trim() != ""'>" +
- " and name like concat(#{comMngVolunteerMngVO.name},'%') \n" +
- " </if> " +
- "<if test='comMngVolunteerMngVO.phone != null and comMngVolunteerMngVO.phone.trim() != ""'>" +
- "AND phone like concat(#{comMngVolunteerMngVO.phone},'%') " +
- " </if> " +
- " order by integral desc,create_at desc"+
- "</script>")
- IPage<ComMngVolunteerMngVO> pageVolunteer(Page page, @Param("comMngVolunteerMngVO") ComMngVolunteerMngVO comMngVolunteerMngVO);
- @Select("<script> " +
- "SELECT\n" +
- "t.id,\n" +
- "t.`name`,\n" +
- "t.state,\n" +
- "t.phone,\n" +
- "t.apply_reson,\n" +
- "t.create_at \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 "+
- "WHERE\n" +
- "state in (1,3) and community_id=#{comMngVolunteerMngVO.communityId} \n" +
- "<if test='comMngVolunteerMngVO.name != null and comMngVolunteerMngVO.name.trim() != ""'>" +
- "and t.name like concat(#{comMngVolunteerMngVO.name},'%') \n" +
- " </if> " +
- "<if test='comMngVolunteerMngVO.phone != null and comMngVolunteerMngVO.phone.trim() != ""'>" +
- "AND t.phone like concat(#{comMngVolunteerMngVO.phone},'%')\n" +
- " </if> " +
- "<if test='comMngVolunteerMngVO.state != null and comMngVolunteerMngVO.state != 0'>" +
- "and t.state=#{comMngVolunteerMngVO.state}\n" +
- " </if> " +
- " \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\n" +
- "'志愿者审核' FUNCTION,\n" +
- "'待审核' behavior,\n" +
- "'新增志愿者申请待审核' words \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")
+ /**
+ * 分页查询志愿者列表
+ * @param page 分页参数
+ * @param comMngVolunteerMngVO 请求参数
+ * @return 志愿者列表
+ */
+ IPage<ComMngVolunteerMngVO> pageVolunteer(Page page,
+ @Param("comMngVolunteerMngVO") ComMngVolunteerMngVO comMngVolunteerMngVO);
+
+ 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);
+
+ @Select("select id_card from sys_user where type=1 and phone=#{idCard}")
+ Long selectUserIdByIdCard(String idCard);
+
+ /**
+ * 志愿者-组织直方图数据
+ * @param communityId
+ * @return
+ */
+ List<StatisticsCommVO> retrieveVolunteerOrgHistogram(@Param("communityId") Long communityId);
+
+ /**
+ * 获取杨家坪定制页面-志愿服务基础数据
+ * @param communityId
+ * @return
+ */
+ BigScreenVolunteerStatisticsInfo getVolunteerBaseData(@Param("communityId") Long communityId);
+
+ /**
+ * 获取志愿者数据
+ * @param communityId
+ * @return
+ */
+ List<ComMngVolunteerMngVO> retrieveVolunteerServiceTypeCircleData(@Param("communityId") Long communityId);
+
+ /**
+ * 志愿者年龄段占比圆形图数据
+ * @param communityId
+ * @return
+ */
+ List<StatisticsCommVO> retrieveVolunteerAgeCircleData(@Param("communityId") Long communityId);
+
+ /**
+ * 志愿者技能占比圆形图
+ * @param communityId
+ * @return
+ */
+ List<ComMngVolunteerMngVO> retrieveVolunteerSkillCircleData(@Param("communityId") Long communityId);
+
+ /**
+ * 根据社区id查询志愿者
+ * @param communityId
+ * @return
+ */
+ List<ComMngVolunteerMngVO> selectVolunteerByCommunityId(@Param("communityId") Long communityId);
+
+ /**
+ * 志愿者审核详情
+ * @param id
+ * @return
+ */
+ ComMngVolunteerMngVO detailVolunteerExamine(@Param("id") Long id);
}
--
Gitblit v1.7.1