java/zhihuishenqu.git

			@@ -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()) {

			@@ -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

	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngVolunteerMngDOMapper.xml	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史