|
@@ -232,21 +232,25 @@ public class MemberInfoServiceImpl implements IMemberInfoService {
|
|
if (activityScdyList != null){
|
|
if (activityScdyList != null){
|
|
//活动视察调研
|
|
//活动视察调研
|
|
map.put("activityScdyNum", activityScdyList.size());
|
|
map.put("activityScdyNum", activityScdyList.size());
|
|
|
|
+ memberInfoVo.setActivityScdyList(activityScdyList);
|
|
}
|
|
}
|
|
List<ZxActivity> activityLlzList = collectType.get(THR);
|
|
List<ZxActivity> activityLlzList = collectType.get(THR);
|
|
if (activityLlzList != null){
|
|
if (activityLlzList != null){
|
|
//活动联络组
|
|
//活动联络组
|
|
map.put("activityLlzNum", activityLlzList.size());
|
|
map.put("activityLlzNum", activityLlzList.size());
|
|
|
|
+ memberInfoVo.setActivityLlzList(activityLlzList);
|
|
}
|
|
}
|
|
List<ZxActivity> activityJbList = collectType.get(THR);
|
|
List<ZxActivity> activityJbList = collectType.get(THR);
|
|
if (activityJbList != null){
|
|
if (activityJbList != null){
|
|
//活动界别
|
|
//活动界别
|
|
map.put("activityJbNum", activityJbList.size());
|
|
map.put("activityJbNum", activityJbList.size());
|
|
|
|
+ memberInfoVo.setActivityJbList(activityJbList);
|
|
}
|
|
}
|
|
List<ZxActivity> activityBssList = collectType.get(THR);
|
|
List<ZxActivity> activityBssList = collectType.get(THR);
|
|
if (activityBssList != null){
|
|
if (activityBssList != null){
|
|
//活动为群众办实事
|
|
//活动为群众办实事
|
|
map.put("activityBssNum", activityBssList.size());
|
|
map.put("activityBssNum", activityBssList.size());
|
|
|
|
+ memberInfoVo.setActivityBssList(activityBssList);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -264,6 +268,7 @@ public class MemberInfoServiceImpl implements IMemberInfoService {
|
|
zxInvestment.setUserId(userId);
|
|
zxInvestment.setUserId(userId);
|
|
List<ZxInvestment> zxInvestments = zxInvestmentMapper.selectZxInvestmentList(zxInvestment);
|
|
List<ZxInvestment> zxInvestments = zxInvestmentMapper.selectZxInvestmentList(zxInvestment);
|
|
if (zxInvestments != null){
|
|
if (zxInvestments != null){
|
|
|
|
+ map.put("investmentNum", zxInvestments.size());
|
|
memberInfoVo.setZxInvestmentList(zxInvestments);
|
|
memberInfoVo.setZxInvestmentList(zxInvestments);
|
|
}
|
|
}
|
|
//查询委员得分和排名
|
|
//查询委员得分和排名
|