12/28 项目活动相关功能修改

101captain

2021-12-28 84f976a3d735296472c82e999a5f7121843ccb13

12/28  项目活动相关功能修改

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java

@@ -244,4 +244,7 @@
    @ApiModelProperty("活动类型")
    @NotBlank(groups = AddGroup.class, message = "活动类型不能为空")
    private String activityType;
    
    @ApiModelProperty("项目Id")
    private Long projectId;
}

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

@@ -66,6 +66,8 @@
        + " </if> "
        + "<if test='comActActivityVO.type != null and comActActivityVO.type==4 '>" + "AND  is_project = 1 "
        + " </if> "
        + "<if test='comActActivityVO.projectId != null'>" + "AND  project_id = #{comActActivityVO.projectId} "
        + " </if> "
        + " group by a.id " + " order by a.status asc,a.publish_at desc " + "</script>")
    IPage<ComActActivityVO> pageActivity(Page page, @Param("comActActivityVO") ComActActivityVO comActActivityVO);


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java

@@ -214,4 +214,9 @@
     * 是否居民活动
     */
    private Integer isProject;

    /**
     * 项目id
     */
    private Long projectId;
}