bug修改

101captain

2022-07-24 c02e4e8ebd88f2d277935111ca16f2119adbac23

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

@@ -56,9 +56,12 @@

        "<if test='comActActivityVO.communityId != null and comActActivityVO.communityId!=0'>" + "AND a.community_id = ${comActActivityVO.communityId} " + " </if> "
        +
            "<if test='comActActivityVO.phone != null and comActActivityVO.phone!=&quot;&quot;'>" + "AND a.phone = ${comActActivityVO.phone} " + " </if> "
            +
        "<if test='comActActivityVO.areaCode !=null '>" + "AND ca.area_code = ${comActActivityVO.areaCode} " + " </if> "
        +

        "<if test='comActActivityVO.checkUnitId !=null '>" + "AND a.check_unit_id = #{comActActivityVO.checkUnitId} " + " </if> "
        +
        "<if test='comActActivityVO.activityName != null and comActActivityVO.activityName.trim() != &quot;&quot;'>"
        + " and a.activity_name like concat(#{comActActivityVO.activityName},'%')   " + " </if> "
        + "<if test='comActActivityVO.status != null and comActActivityVO.status !=0 and comActActivityVO.isIng==null'>"
@@ -284,10 +287,10 @@
    /**
     * 根据社工id查询活动列表
     * @param page
     * @param id
     * @param commonPage
     * @return
     */
    IPage<ActActivityListVO> selectActivityBySocialWorker(Page page,@Param("id")Long id);
    IPage<ComActActivityVO> selectActivityBySocialWorker(Page page,@Param("commonPage") CommonPage commonPage);

    /**
     * [方法描述] 根据社区ID查询所属城市所在区区域代码，
@@ -337,4 +340,21 @@
     * @return
     */
    List<PartyMemberDetailExcelVO> exportPartyMemberDetail(@Param("commonPage") CommonPage commonPage);

    List<ComActActivityVO> selectListByRelationId(@Param("relationId") Long relationId,@Param("date")String date);

    /**
     * 查询进行中活动
     * @param communityId 社区id
     * @return 活动列表
     */
    List<ComActActivityVO> selectListByCommunityId(@Param("communityId") Long communityId,@Param("date") String date,@Param("phone")String phone);

    /**
     * 获取项目活动
     * @param page
     * @param comActActivityVO
     * @return
     */
    IPage<ComActActivityVO> pageProjectActivity(@Param("page") Page page, @Param("comActActivityVO") ComActActivityVO comActActivityVO);
}