From 3ee62e76c51a78e0cd1854c8b35c6b02e6f7369a Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 12 十一月 2024 11:50:46 +0800
Subject: [PATCH] 花城 修改志愿者返回参数内容
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngVolunteerMngDOMapper.xml | 5 ++++-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java | 20 ++++++++++++++++++++
2 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java
index c66b8d0..03d420c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java
@@ -1,5 +1,6 @@
package com.panzhihua.service_community.service.impl;
+import cn.hutool.core.util.IdcardUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.PageBaseDTO;
@@ -1100,6 +1101,25 @@
//志愿者组织数据
List<VolunteerOrgRelationVO> volunteerOrgRelationList = new ArrayList<>();
List<ComMngVolunteerMngVO> volunteerData = comMngVolunteerMngDAO.selectVolunteerByCommunityId(communityId);
+
+ if(volunteerData!=null && volunteerData.size()>0)
+ {
+ for (ComMngVolunteerMngVO ent:volunteerData)
+ {
+ if(!StringUtils.isEmpty(ent.getIdCard()))
+ {
+ try {
+ Integer age = IdcardUtil.getAgeByIdCard(ent.getIdCard());
+ ent.setAge(age);
+ }
+ catch (Exception e)
+ {
+ log.error("身份证号码转换年龄失败，人员id:" + ent.getId());
+ }
+ }
+ }
+ }
+
if (!volunteerData.isEmpty()) {
Map<String, List<ComMngVolunteerMngVO>> collect = volunteerData.stream().collect(Collectors.groupingBy(ComMngVolunteerMngVO::getOrgName));
for (Map.Entry<String, List<ComMngVolunteerMngVO>> entry : collect.entrySet()) {
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngVolunteerMngDOMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngVolunteerMngDOMapper.xml
index 6556fd2..08412f7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngVolunteerMngDOMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngVolunteerMngDOMapper.xml
@@ -177,7 +177,10 @@
</select>
<select id="selectVolunteerByCommunityId"
resultType="com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO">
- SELECT t1.id, t1.`name`, t1.photo_path, t2.`name` AS teamName, t3.`name` AS orgName
+ SELECT t1.id, t1.`name`,t1.phone,t1.id_card,t1.is_university,
+ t1.photo_path,
+ (select name from com_mng_volunteer_skill where id=t1.skill_id) as skillName,
+ t2.`name` AS teamName, t3.`name` AS orgName
FROM com_mng_volunteer_mng t1
INNER JOIN com_mng_volunteer_org_team t2 ON t1.team_id = t2.id
INNER JOIN com_mng_volunteer_org_team t3 ON t1.org_id = t3.id
--
Gitblit v1.7.1