|
|
@@ -269,19 +269,14 @@ public class SysActivityServiceImpl extends ServiceImpl<SysActivityMapper, SysAc
|
|
|
Page<SysActivity> pages = baseMapper.getSysActivityList(page,sysActivityVo);
|
|
|
pages.getRecords().forEach(activity -> {
|
|
|
SysDept sysDept = sysDeptService.getById(activity.getActDept());
|
|
|
- AtomicInteger count = new AtomicInteger();
|
|
|
List<SysActivityDept> sysActivityDeptList = sysActivityDeptService.list(new LambdaQueryWrapper<SysActivityDept>()
|
|
|
.eq(SysActivityDept::getActivityId, activity.getId()).eq(SysActivityDept::getIsEffective, 0));
|
|
|
- sysActivityDeptList.forEach(sysActivityDept -> {
|
|
|
- List<SysUserJzgInfo> sysUserJzgInfo = sysUserJzgInfoService.list(new LambdaQueryWrapper<SysUserJzgInfo>().eq(SysUserJzgInfo::getDeptId, sysActivityDept.getDeptId()));
|
|
|
- count.set(count.get() + sysUserJzgInfo.size());
|
|
|
- });
|
|
|
activity.setDeptIds(sysActivityDeptList.stream().map(SysActivityDept::getDeptId).collect(Collectors.toList()));
|
|
|
if(Objects.nonNull(sysDept)) {
|
|
|
activity.setActDeptName(sysDept.getName());
|
|
|
activity.setDepts(activity.getDeptIds().stream().map(deptId -> sysDeptService.getById(deptId).getName()).collect(Collectors.joining(",")));
|
|
|
}
|
|
|
- activity.setUserCount(count);
|
|
|
+ activity.setUserCount("0"+"人");
|
|
|
checkActivityStatus(activity.getActStartTime(), activity.getActEndTime(), activity);
|
|
|
updateById(activity);
|
|
|
});
|