| | |
| | | |
| | | import javax.annotation.Resource; |
| | | |
| | | import com.panzhihua.common.model.dtos.property.CommonPage; |
| | | import com.panzhihua.common.model.vos.LoginUserInfoVO; |
| | | import com.panzhihua.common.model.vos.community.ComActActivityTypeVO; |
| | | import com.panzhihua.common.model.vos.community.volunteer.ComMngVolunteerExcelVO; |
| | | import com.panzhihua.common.model.vos.user.SysTemplateConfigVO; |
| | |
| | | } |
| | | comActActivityVO1.setComActActPrizeVOList(comActActPrizeVOList); |
| | | Integer volunteerMax = comActActivityVO1.getVolunteerMax(); |
| | | if (volunteerMax.intValue() != 0) { |
| | | comActActivityVO1.setType(1); |
| | | } else { |
| | | comActActivityVO1.setType(2); |
| | | if(comActActivityVO1.getType()==null){ |
| | | if (volunteerMax.intValue() != 0) { |
| | | comActActivityVO1.setType(1); |
| | | } else { |
| | | comActActivityVO1.setType(2); |
| | | } |
| | | } |
| | | fillActivitySignList(id, comActActivityVO1); |
| | | }); |
| | |
| | | */ |
| | | @PostMapping("addvolunteer") |
| | | R addVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO) { |
| | | Long submitUserId = comMngVolunteerMngVO.getSubmitUserId(); |
| | | if (Objects.nonNull(submitUserId)) { |
| | | //获取小程序用户信息 |
| | | R<LoginUserInfoVO> userInfoR = userService.getUserInfoByUserId(submitUserId.toString()); |
| | | LoginUserInfoVO userInfo = userInfoR.getData(); |
| | | if (Objects.nonNull(userInfo)) { |
| | | comMngVolunteerMngVO.setIdCard(userInfo.getIdCard()); |
| | | } |
| | | } |
| | | return comMngVolunteerMngService.addVolunteer(comMngVolunteerMngVO); |
| | | } |
| | | |
| | |
| | | */ |
| | | @PostMapping("listactivity") |
| | | public R listActivity(@RequestParam("userId") Long userId, |
| | | @RequestParam(value = "status", required = false) Integer status) { |
| | | return comActActivityService.listActivity(userId, status); |
| | | @RequestParam(value = "status", required = false) Integer status,@RequestParam(value = "type", required = false) Integer type) { |
| | | return comActActivityService.listActivity(userId, status,type); |
| | | } |
| | | |
| | | /** |
| | |
| | | public R partyMemberCount(@RequestParam("communityId")Long communityId,@RequestParam("year")String year){ |
| | | return comActActivityService.partyMemberCount(communityId,year); |
| | | } |
| | | |
| | | /** |
| | | * 党员活动详情数据 |
| | | * @return |
| | | */ |
| | | @PostMapping("activity/partyMemberDetail") |
| | | public R partyMemberDetail(@RequestBody CommonPage commonPage){ |
| | | return comActActivityService.partyMemberDetail(commonPage); |
| | | } |
| | | |
| | | |
| | | /** |
| | | * 导出党员活动详情数据 |
| | | * @return |
| | | */ |
| | | @PostMapping("activity/exportPartyMemberDetail") |
| | | public R exportPartyMemberDetail(@RequestBody CommonPage commonPage){ |
| | | return comActActivityService.exportPartyMemberDetail(commonPage); |
| | | } |
| | | } |