From 179c4d64313c9b7572778da4aaaf6c6584fe457d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:48:08 +0800
Subject: [PATCH] 修改文件上传类型限制

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoActivityMapper.java |   40 +++++++++++++++++++++++++---------------
 1 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoActivityMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoActivityMapper.java
index 3ee00ea..89cfae1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoActivityMapper.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoActivityMapper.java
@@ -1,5 +1,8 @@
 package com.panzhihua.service_community.dao;
 
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,10 +11,6 @@
 import com.panzhihua.common.model.vos.community.ComActEasyPhotoActivityVO;
 import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoActivityUserVO;
 import com.panzhihua.service_community.model.dos.ComActEasyPhotoActivityDO;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.Date;
 
 /**
  * @auther lyq
@@ -23,25 +22,36 @@
 
     /**
      * 社区后台-分页查询随手拍活动列表
-     * @param page  分页参数
-     * @param pageEasyPhotoActivityDTO  请求参数
-     * @return  随手拍活动列表
+     * 
+     * @param page
+     *            分页参数
+     * @param pageEasyPhotoActivityDTO
+     *            请求参数
+     * @return 随手拍活动列表
      */
-    IPage<ComActEasyPhotoActivityVO> pageActivity(Page page, @Param("pageEasyPhotoActivityDTO") PageEasyPhotoActivityDTO pageEasyPhotoActivityDTO);
+    IPage<ComActEasyPhotoActivityVO> pageActivity(Page page,
+        @Param("pageEasyPhotoActivityDTO") PageEasyPhotoActivityDTO pageEasyPhotoActivityDTO);
 
     /**
      * 判断当前活动时间是否与其他时间有冲突
-     * @param startTime     活动开始时间
-     * @param endTime   活动结束时间
-     * @return  返回冲突的活动数量
+     * 
+     * @param startTime
+     *            活动开始时间
+     * @param endTime
+     *            活动结束时间
+     * @return 返回冲突的活动数量
      */
-    Integer getEasyPhotoActivityTimeConflict(@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("activityId") Long activityId);
+    Integer getEasyPhotoActivityTimeConflict(@Param("startTime") String startTime, @Param("endTime") String endTime,
+        @Param("activityId") Long activityId, @Param("communityId") Long communityId);
 
     /**
      * 分页查询随手拍活动下居民参与记录
-     * @param pageEasyPhotoActivityUserDTO  请求参数
-     * @return  居民参与记录
+     * 
+     * @param pageEasyPhotoActivityUserDTO
+     *            请求参数
+     * @return 居民参与记录
      */
-    IPage<ComActEasyPhotoActivityUserVO> pageActivityUser(Page page, @Param("pageEasyPhotoActivityUserDTO") PageEasyPhotoActivityUserDTO pageEasyPhotoActivityUserDTO);
+    IPage<ComActEasyPhotoActivityUserVO> pageActivityUser(Page page,
+        @Param("pageEasyPhotoActivityUserDTO") PageEasyPhotoActivityUserDTO pageEasyPhotoActivityUserDTO);
 
 }

--
Gitblit v1.7.1