| | |
|---|
| | | .filter(activityDO -> activityDO.getStatus().equals(status)).collect(Collectors.toList()); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | if(isNull(type)){ |
|---|
| | | if(!isNull(type)){ |
|---|
| | | comActActivityDOS=comActActivityDOS.stream().filter(comActActivityDO -> comActActivityDO.getType().equals(type)).collect(Collectors.toList()); |
|---|
| | | } |
|---|
| | | if (!comActActivityDOS.isEmpty()) { |
|---|
| | |
|---|
| | | .collect(Collectors.toList()); |
|---|
| | | comActActivityVO.setSignCount(collect.size()); |
|---|
| | | ActivitySignVO activitySignVO = collect.get(0); |
|---|
| | | Integer isVolunteer = activitySignVO.getIsVolunteer(); |
|---|
| | | if (isVolunteer.intValue() == 1) { |
|---|
| | | comActActivityVO.setType(1); |
|---|
| | | } else { |
|---|
| | | comActActivityVO.setType(2); |
|---|
| | | } |
|---|
| | | Integer activityStatus = comActActivityVO.getStatus(); |
|---|
| | | if (activityStatus.intValue() == 3) { |
|---|
| | | comActActivityVO.setStatus(4); |
|---|
| | |
|---|
| | | // return R.fail("你已签到，如要再次签到请三十分钟后尝试！"); |
|---|
| | | // } |
|---|
| | | ComActActRegistDO comActActRegistDO = new ComActActRegistDO(); |
|---|
| | | if(comActActRegistVO.getType()!=null&&comActActRegistVO.getType()==2){ |
|---|
| | | if(comActActRegistVO.getSignType()!=null&&comActActRegistVO.getSignType()==2){ |
|---|
| | | ComActActRegistDO comActActActRegistDO=comActActRegistDAO.selectOne(new QueryWrapper<ComActActRegistDO>() |
|---|
| | | .lambda().eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId).eq(ComActActRegistDO::getCodeId,comActActRegistVO.getCodeId())); |
|---|
| | | if(comActActActRegistDO==null){ |
|---|
