修改活动bug

puhanshu

2021-12-23 b15b3957aed22143c7765f2769165eec547396ee

修改活动bug

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActEvaluateDAO.java

@@ -44,4 +44,11 @@
     */
    ComActActEvaluateVO getEvaluateListByUserId(@Param("activityId") Long activityId,@Param("userId") Long userId);

    /**
     * 查询某活动的用户评价列表
     * @param activityId
     * @param userId
     * @return
     */
    List<ComActActEvaluateVO> selectEvaluateList(@Param("activityId") Long activityId, @Param("userId") Long userId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActEvaluateServiceImpl.java

@@ -170,22 +170,13 @@
        if (isNull(comActActivityDO)) {
            return R.fail("活动不存在");
        }
        List<ComActActEvaluateDO> comActActEvaluateDOList = this.baseMapper.selectList(new QueryWrapper<ComActActEvaluateDO>()
                .lambda().eq(ComActActEvaluateDO::getUserId, userId).eq(ComActActEvaluateDO::getActivityId, activityId));
        List<ComActActEvaluateVO> comActActEvaluateVOS = new ArrayList<>();
        if (!ObjectUtils.isEmpty(comActActEvaluateDOList)) {
            comActActEvaluateDOList.forEach(comActActEvaluateDO -> {
                ComActActEvaluateVO comActActEvaluateVO = new ComActActEvaluateVO();
                BeanUtils.copyProperties(comActActEvaluateDO, comActActEvaluateVO);
                comActActEvaluateVOS.add(comActActEvaluateVO);
            });
        }
        int registCount = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>()
        List<ComActActEvaluateVO> comActActEvaluateVOS = this.baseMapper.selectEvaluateList(activityId, userId);
        int regCount = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>()
                .lambda().eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId));

        MyActivityEvaluateVO evaluateVO = new MyActivityEvaluateVO();
        evaluateVO.setMyEvaluateList(comActActEvaluateVOS);
        boolean needDisplay = registCount > comActActEvaluateVOS.size() &&
        boolean needDisplay = regCount > comActActEvaluateVOS.size() &&
                new Date().before(DateUtils.addDays(comActActivityDO.getEndAt(), 3));
        evaluateVO.setIsDisplay(needDisplay ? 1 : 0);
        return R.ok(evaluateVO);

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActEvaluateMapper.xml

@@ -125,4 +125,11 @@
        order by caae.create_at desc
        limit 1
    </select>
    <select id="selectEvaluateList" 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
    </select>
</mapper>