修改bug

huanghongfa

2021-07-07 843e5b6f52c938d8a68657b710ab2285d7211ab5

修改bug

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

@@ -61,6 +61,43 @@

    @Select("<script> " +
            "SELECT " +
            "u.user_id id, " +
            "u.image_url, " +
            "u.name, " +
            "u.nick_name, " +
            "case WHEN u.is_partymember = 1 THEN '党员' WHEN a.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity, " +
            "u.phone, " +
            "a.create_at,  " +
            "a.is_volunteer  " +
            "FROM " +
            "com_act_act_sign a " +
            "JOIN sys_user u ON a.user_id = u.user_id  " +
            "WHERE " +
            "a.activity_id = #{activitySignVO.activityId}  " +
            "<if test='activitySignVO.phone != null and activitySignVO.phone != &quot;&quot;'>" +
            "AND u.phone = #{activitySignVO.phone}  " +
            " </if> " +
            "<if test='activitySignVO.name != null and activitySignVO.name != &quot;&quot;'>" +
            "AND u.`name` = #{activitySignVO.name}  " +
            " </if> " +
            "<if test='activitySignVO.identity != null and activitySignVO.identity != &quot;&quot; and activitySignVO.identity==1'>" +
            "AND u.is_partymember = 0 and a.is_volunteer=0  " +
            " </if> " +
            "<if test='activitySignVO.identity != null and activitySignVO.identity != &quot;&quot; and activitySignVO.identity==2'>" +
            "AND u.is_partymember = 1    " +
            " </if> " +
            "<if test='activitySignVO.identity != null and activitySignVO.identity != &quot;&quot; and activitySignVO.identity==3'>" +
            "AND a.is_volunteer=1   " +
            " </if> " +
            "<if test='activitySignVO.type != null and activitySignVO.type != 0'>" +
            "AND a.is_volunteer=#{activitySignVO.type}-1   " +
            " </if> " +
            " order by a.create_at desc "+
            "</script>")
    List<ActivitySignVO> listActivitySigns(@Param("activitySignVO") ActivitySignVO activitySignVO);

    @Select("<script> " +
            "SELECT " +
            " caas.user_id, " +
            " su.NAME, " +
            "CASE " +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java

@@ -58,12 +58,18 @@
     */
    ComActActivityVO inforActivity(Long id, Long userId);
    /**
     * 活动报名名单
     * 分页活动报名名单
     * @param activitySignVO 查询参数
     * @return 报名人员集合
     */
    R listActivitySign(ActivitySignVO activitySignVO);
    /**
     * 活动报名名单
     * @param activitySignVO 查询参数
     * @return 报名人员集合
     */
    R listActivitySigns(ActivitySignVO activitySignVO);
    /**
     * 分页展示我的所有活动 时间倒序排列
     * @param comActActivityVO 分页参数
     * @return 分页集合

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

@@ -214,6 +214,12 @@
        return R.ok(activitySignVOS);
    }

    @Override
    public R listActivitySigns(ActivitySignVO activitySignVO) {
        List<ActivitySignVO> activitySignVOS = comActActSignDAO.listActivitySigns(activitySignVO);
        return R.ok(activitySignVOS);
    }

    /**
     * 分页展示我的所有活动 时间倒序排列
     *