Merge remote-tracking branch 'origin/huacheng_test' into huacheng_zts

张天森

2022-07-11 8ef6cc463ec3e1c7f7164bcfe19c383214cb5db4

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

@@ -60,7 +60,8 @@
            +
        "<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'>"
@@ -347,6 +348,5 @@
     * @param communityId 社区id
     * @return 活动列表
     */
    List<ComActActivityVO> selectListByCommunityId(@Param("communityId") Long communityId,@Param("date") String date);

    List<ComActActivityVO> selectListByCommunityId(@Param("communityId") Long communityId,@Param("date") String date,@Param("phone")String phone);
}