From aa6db9d64d68746ae52a70fea14f2aeb71d7b236 Mon Sep 17 00:00:00 2001
From: luoyuanqiao <2376770955@qq.com>
Date: 星期四, 24 二月 2022 11:09:38 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
index 856a974..b15abb3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
@@ -675,7 +675,6 @@
//查询党员统计数据
ComDataStatisticsMemberVo statisticsMemberVo = comPbMemberDAO.getMemberStatistics(member.getUserId(),member.getCommunityId());
if(statisticsMemberVo != null){
- BeanUtils.copyProperties(statisticsMemberVo,member);
member.setPartyActivityCount(statisticsMemberVo.getPartyActivityCount());
member.setPartyActivityDuration(statisticsMemberVo.getPartyActivityDuration());
member.setVolunteerActivityCount(statisticsMemberVo.getVolunteerActivityCount());
@@ -690,6 +689,11 @@
return R.ok(memberPage);
}
+ /**
+ * 根据组织id查询组织下统计数据
+ * @param statisticsOrgDto 请求参数
+ * @return 组织下统计数据
+ */
@Override
public R getOrgDataStatistics(ComDataStatisticsOrgDto statisticsOrgDto) {
List<Long> orgIds = new ArrayList<>();
@@ -729,7 +733,9 @@
//查询左下数据
statisticsVo = comPbMemberDAO.getOrgDataStatisticsLeftDown(communityId,orgIds,startTime,endTime);
if(statisticsVo != null){
- BeanUtils.copyProperties(statisticsVo,statisticsOrgVo);
+ statisticsOrgVo.setParticipateVolunteerActivityDuration(statisticsVo.getParticipateVolunteerActivityDuration());
+ statisticsOrgVo.setParticipateVolunteerActivityNum(statisticsVo.getParticipateVolunteerActivityNum());
+ statisticsOrgVo.setParticipatePartyActivityNum(statisticsVo.getParticipatePartyActivityNum());
}
//查询党员数据
--
Gitblit v1.7.1