springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthDTO.java
@@ -28,7 +28,7 @@ @NotNull private Long pageNum = 1L; @ApiModelProperty(value = "分页-每页记录数,默认10", example = "10") @ApiModelProperty(value = "分页-每页记录数,默认10", example = "10", required = true) @NotNull private Long pageSize = 10L;
@@ -53,7 +53,7 @@ private String status; @ApiModelProperty(value = "出生日期") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date birthDay;
@@ -29,7 +29,7 @@ @ApiModelProperty("消息标题") private String title; @ApiModelProperty("具体业务类型 1 社区活动 2党建活动 3微心愿通知 4随手拍服务通知 5支援者申请 6实名制审核 7人脸识别审核 8积分获取和消耗 9积分点击直接跳转积分列表 10 房屋审核通知 11 党员认证审核通知 12邻里圈审核通知") @ApiModelProperty("具体业务类型 1 社区活动 2党建活动 3微心愿通知 4随手拍服务通知 5支援者申请 6实名制审核 7人脸识别审核 8积分获取和消耗 9积分点击直接跳转积分列表 10 房屋审核通知 11 党员认证审核通知 12邻里圈审核通知 13 高龄认证社区反馈通知") private Integer businessType; @ApiModelProperty("业务标题") springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityQuestnaireApi.java
@@ -60,7 +60,7 @@ pageQuestnaireDTO.setForMasses(null); pageQuestnaireDTO.setForVolunteer(true); pageQuestnaireDTO.setForParty(true); return communityService.pageQuestnaire(pageQuestnaireDTO, 0l); return communityService.pageQuestnaire(pageQuestnaireDTO, this.getCommunityId()); } @ApiOperation(value = "创建调查问卷") springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -1,6 +1,7 @@ package com.panzhihua.service_community.api; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,9 @@ import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO; import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO; import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO; import com.panzhihua.common.model.vos.user.SysUserNoticeVO; import com.panzhihua.common.model.vos.user.UserPhoneVO; import com.panzhihua.common.service.user.UserService; import com.panzhihua.common.utlis.ClazzUtils; import com.panzhihua.common.utlis.IdCard; import com.panzhihua.common.utlis.IdCardUtil; @@ -71,7 +74,8 @@ private ComActMessageService comActMessageService; @Resource private ComActQuestnaireService comActQuestnaireService; @Resource private UserService userService; @Resource private EldersAuthService eldersAuthService; @Resource @@ -1596,6 +1600,28 @@ @PostMapping("/eldersauth/addFeedback") R add(@RequestBody EldersAuthFeedbackAddDTO eldersAuthFeedbackAddDTO){ ClazzUtils.setIfStringIsEmpty(eldersAuthFeedbackAddDTO); EldersAuthDO eldersAuthDO = eldersAuthService.getBaseMapper().selectById(eldersAuthFeedbackAddDTO.getAuthId()); if(eldersAuthDO==null){ return R.fail("认证记录不存在"); } R addR = eldersAuthService.addFeedback(eldersAuthFeedbackAddDTO); if(R.isOk(addR)){ SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO(); sysUserNoticeVO.setUserId(eldersAuthDO.getSumitUserId()); sysUserNoticeVO.setType(1); sysUserNoticeVO.setTitle("高龄认证社区社区反馈"); sysUserNoticeVO.setBusinessType(13); sysUserNoticeVO.setBusinessTitle(" "); sysUserNoticeVO.setBusinessContent("你提交【" +eldersAuthDO.getAuthUserName() + "】的高龄认证，社区进行了反馈"); sysUserNoticeVO.setBusinessId(eldersAuthDO.getId()); sysUserNoticeVO.setStatus(0); sysUserNoticeVO.setBusinessStatus(2); R r1 = userService.addNotice(sysUserNoticeVO); if (R.isOk(r1)) { log.info("新增用户报名党建活动通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO)); } } return eldersAuthService.addFeedback(eldersAuthFeedbackAddDTO); }
@@ -46,7 +46,7 @@ "LEFT JOIN com_act_easy_photo_comment_user u1 on m.id=u1.easy_photo_comment_id and u1.user_id=#{comActEasyPhotoCommentDTO.userId}\n" + "where m.easy_photo_id=#{comActEasyPhotoCommentDTO.id} " + "GROUP BY m.id\n" + " )t order by t.num desc") " )t order by t.num desc, t.create_at DESC ") IPage<ComActEasyPhotoCommentVO> pageComActEasyPhotoComment(Page page, @Param("comActEasyPhotoCommentDTO") PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO);
