springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -108,7 +108,7 @@ if (loginUserInfo != null) { userId = loginUserInfo.getUserId(); } return communityService.detailActivity(id, userId); return communityService.detailActivity(id, userId,null,null); } @ApiOperation(value = "分页查询活动评价记录", response = ComActActEvaluateVO.class) @@ -144,7 +144,7 @@ signactivityVO.setUserId(userId); R r = communityService.signActivity(signactivityVO); if (R.isOk(r) && signactivityVO.getType().intValue() == 1) { R r2 = communityService.detailActivity(activityId, userId); R r2 = communityService.detailActivity(activityId, userId,null,null); ComActActivityVO comActActivityVO = JSONObject.parseObject(JSONObject.toJSONString(r2.getData()), ComActActivityVO.class); SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO(); springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
@@ -123,7 +123,7 @@ private List<ComActActEvaluateVO> comActActEvaluateVOList; @ApiModelProperty("活动评价总数") private Integer evaluateAmount; private Long evaluateAmount; @ApiModelProperty("活动评分星级平均数") private Double evaluateLevel; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -191,7 +191,7 @@ * @return 详情 */ @PostMapping("detailactivity") R detailActivity(@RequestParam("id") Long id, @RequestParam(value = "userId", required = false) Long userId); R detailActivity(@RequestParam("id") Long id, @RequestParam(value = "userId", required = false) Long userId,@RequestParam(value = "pageNum", required = false) Long pageNum,@RequestParam(value = "pageSize", required = false) Long pageSize); /** * 分页活动报名名单 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java
@@ -157,7 +157,7 @@ if (R.isOk(r)) { ActivitySignVO activitySignVO = new ActivitySignVO(); activitySignVO.setActivityId(id); R r3 = this.detailActivity(id); R r3 = this.detailActivity(id,null,null); if (R.isOk(r3)) { Object data = r3.getData(); ComActActivityVO comActActivityVO = @@ -208,9 +208,9 @@ @ApiOperation(value = "活动详情", response = ComActActivityVO.class) @GetMapping("detailactivity") public R detailActivity(@RequestParam("id") Long id) { public R detailActivity(@RequestParam("id") Long id,@RequestParam(value = "pageNum", required = false) Long pageNum,@RequestParam(value = "pageSize", required = false) Long pageSize) { Long userId = this.getUserId(); return communityService.detailActivity(id, userId); return communityService.detailActivity(id, userId,pageNum,pageSize); } @ApiOperation(value = "查询活动报名名单集合") springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -11,6 +11,7 @@ import javax.annotation.Resource; import com.panzhihua.service_community.dao.ComActActEvaluateDAO; import com.panzhihua.service_community.model.dos.*; import com.panzhihua.service_community.service.*; import org.springframework.beans.BeanUtils; @@ -149,6 +150,8 @@ private ComEldersAuthElderlyService comEldersAuthElderlyService; @Resource private ComActMicroWishOperationRecordService wishOperationRecordService; @Resource private ComActActEvaluateDAO comActActEvaluateDAO; /** * 新增社区活动 @@ -334,7 +337,9 @@ */ @PostMapping("detailactivity") public R detailActivity(@RequestParam("id") Long id, @RequestParam(value = "userId", required = false) Long userId) { @RequestParam(value = "userId", required = false) Long userId, @RequestParam(value = "pageNum",defaultValue = "1", required = false) Long pageNum, @RequestParam(value = "pageSize",defaultValue = "10", required = false) Long pageSize) { ComActActivityVO comActActivityVO = comActActivityService.inforActivity(id, userId); if (ObjectUtils.isEmpty(comActActivityVO)) { return R.fail("活动不存在"); @@ -352,26 +357,14 @@ comActActivityVO.setComActActPrizeVOList(comActActPrizeVOS); } //活动评价 List<ComActActEvaluateDO> comActActEvaluateDOList = comActActEvaluateService .list(new QueryWrapper<ComActActEvaluateDO>().lambda().eq(ComActActEvaluateDO::getActivityId, id)); if (!ObjectUtils.isEmpty(comActActEvaluateDOList)) { List<ComActActEvaluateVO> comActActEvaluateVOList = new ArrayList<>(); comActActEvaluateDOList.forEach(comActActEvaluateDO -> { ComActActEvaluateVO comActActEvaluateVO = new ComActActEvaluateVO(); BeanUtils.copyProperties(comActActEvaluateDO, comActActEvaluateVO); comActActEvaluateVOList.add(comActActEvaluateVO); }); comActActivityVO.setComActActEvaluateVOList(comActActEvaluateVOList); //活动评价总数 comActActivityVO.setEvaluateAmount(comActActEvaluateDOList.size()); //当前用户对活动的评分 Optional.ofNullable(userId).ifPresent(currentUserId -> { Optional<ComActActEvaluateDO> optional = comActActEvaluateDOList.stream() .filter(comActActEvaluateDO -> comActActEvaluateDO.getUserId().equals(currentUserId)).findFirst(); if (optional.isPresent()) { comActActivityVO.setMyRating(optional.get().getStarLevel()); } }); IPage<ComActActEvaluateVO> comActActEvaluatePage = comActActEvaluateDAO.getEvaluateListPage(new Page(pageNum,pageSize),id); comActActivityVO.setComActActEvaluateVOList(comActActEvaluatePage.getRecords()); //活动评价总数 comActActivityVO.setEvaluateAmount(comActActEvaluatePage.getTotal()); //当前用户对活动的评分 ComActActEvaluateVO userActEvaluateVO = comActActEvaluateDAO.getEvaluateListByUserId(id,userId); if(userActEvaluateVO != null){ comActActivityVO.setMyRating(userActEvaluateVO.getStarLevel()); } fillActivitySignList(id, comActActivityVO); comActActivityVO.setIntegral(0); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActEvaluateDAO.java
@@ -28,4 +28,8 @@ List<ComActActEvaluateExcelVO> getEvaluateLists(@Param("comActActEvaluateVO") ComActActEvaluateVO comActActEvaluateVO); IPage<ComActActEvaluateVO> getEvaluateListPage(Page page, @Param("activityId") Long activityId); ComActActEvaluateVO getEvaluateListByUserId(@Param("activityId") Long activityId,@Param("userId") Long userId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActEvaluateMapper.xml
@@ -94,4 +94,25 @@ </if> order by caae.create_at desc </select> <select id="getEvaluateListPage" resultType="com.panzhihua.common.model.vos.community.ComActActEvaluateVO"> SELECT caae.*,su.`name`,su.nick_name,su.image_url FROM com_act_act_evaluate AS caae LEFT JOIN sys_user AS su ON su.user_id = caae.user_id where caae.activity_id = #{activityId} order by caae.create_at desc </select> <select id="getEvaluateListByUserId" resultType="com.panzhihua.common.model.vos.community.ComActActEvaluateVO"> SELECT caae.*,su.`name`,su.nick_name,su.image_url FROM com_act_act_evaluate AS caae LEFT JOIN sys_user AS su ON su.user_id = caae.user_id where caae.activity_id = #{activityId} and caae.user_id = #{userId} order by caae.create_at desc limit 1 </select> </mapper>
