huanghongfa
2021-06-25 8f2a208fb5c4c3a5414b6c111dfac48b77a5ef5e
修改社区活动报名列表无分页bug
3个文件已修改
30 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ActivitySignVO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActSignDAO.java 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ActivitySignVO.java
@@ -36,4 +36,8 @@
    private Integer type;
    @ApiModelProperty("人员主键")
    private Long userId;
    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum = 1L;
    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize = 10L;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActSignDAO.java
@@ -36,28 +36,28 @@
            "com_act_act_sign a " +
            "JOIN sys_user u ON a.user_id = u.user_id  " +
            "WHERE " +
            "a.activity_id = #{activityId}  " +
            "<if test='phone != null and phone.trim() != &quot;&quot;'>" +
            "AND u.phone = #{phone}  " +
            "a.activity_id = #{activitySignVO.activityId}  " +
            "<if test='activitySignVO.phone != null and activitySignVO.phone != &quot;&quot;'>" +
            "AND u.phone = #{activitySignVO.phone}  " +
            " </if> " +
            "<if test='name != null and name.trim() != &quot;&quot;'>" +
            "AND u.`name` = #{name}  " +
            "<if test='activitySignVO.name != null and activitySignVO.name != &quot;&quot;'>" +
            "AND u.`name` = #{activitySignVO.name}  " +
            " </if> " +
            "<if test='identity != null and identity.trim() != &quot;&quot; and identity==1'>" +
            "<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='identity != null and identity.trim() != &quot;&quot; and identity==2'>" +
            "<if test='activitySignVO.identity != null and activitySignVO.identity != &quot;&quot; and activitySignVO.identity==2'>" +
            "AND u.is_partymember = 1    " +
            " </if> " +
            "<if test='identity != null and identity.trim() != &quot;&quot; and identity==3'>" +
            "<if test='activitySignVO.identity != null and activitySignVO.identity != &quot;&quot; and activitySignVO.identity==3'>" +
            "AND a.is_volunteer=1   " +
            " </if> " +
            "<if test='type != null and type != 0'>" +
            "AND a.is_volunteer=#{type}-1   " +
            "<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> listActivitySign(ActivitySignVO activitySignVO);
    IPage<ActivitySignVO> listActivitySign(Page page,@Param("activitySignVO") ActivitySignVO activitySignVO);
    @Select("<script> " +
            "SELECT " +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -208,7 +208,9 @@
     */
    @Override
    public R listActivitySign(ActivitySignVO activitySignVO) {
        List<ActivitySignVO> activitySignVOS = comActActSignDAO.listActivitySign(activitySignVO);
        IPage<ActivitySignVO> activitySignVOS = comActActSignDAO.listActivitySign(new Page(activitySignVO.getPageNum(),activitySignVO.getPageSize()),activitySignVO);
//        List<ActivitySignVO> activitySignVOS = comActActSignDAO.listActivitySign(activitySignVO);
        return R.ok(activitySignVOS);
    }