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/service/impl/BigScreenStatisticsServiceImpl.java | 22 +++++++++++++++++++++-
1 files changed, 21 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 a1eb4ef..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;
@@ -171,7 +172,7 @@
statisticsVO.setWarehouseImages(warehouseImages);
//居民活动柱状统计
- List<StatisticsCommVO> residentActHistogram = comActActivityDAO.selectResidentActHistogramData(communityId, true);
+ List<StatisticsCommVO> residentActHistogram = comActActivityDAO.selectResidentActHistogramData(communityId, false);
//居民活动新增数据
List<StatisticsCommVO> actAddPolylineData = comActActivityDAO.getActAddPolylineData(communityId, true);
//居民活动发布总数
@@ -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()) {
--
Gitblit v1.7.1