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/ComActQuestnaireDAO.java | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java
index fc9b17c..626165c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java
@@ -2,6 +2,10 @@
import java.util.List;
+import com.panzhihua.common.model.dtos.PageBaseDTO;
+import com.panzhihua.common.model.vos.community.ComActQuestnaireVO;
+import com.panzhihua.common.model.vos.community.StatisticsCommVO;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenQuestionnaireStatisticsInfo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -27,14 +31,14 @@
+ " if(caqua.id is not null,1,2) isAnswer, " + " caq.view_num " + "FROM " + " com_act_questnaire as caq "
+ " left join com_act_questnaire_user_answer as caqua on caqua.questnaire_id = caq.id and caqua.user_id = #{pageQuestnaireDTO.userId} "
+ "WHERE " + " caq.state IN ( 2, 3 ) "
- + " AND caq.community_id = #{pageQuestnaireDTO.communityId} and caq.is_hide = 0 " + "ORDER BY "
- + " caq.state ASC, " + " isAnswer desc, " + " caq.create_at DESC" + "</script>")
+ + " AND caq.community_id = ${pageQuestnaireDTO.communityId} and caq.is_hide = 0 " + "ORDER BY "
+ + " caq.state ASC, " + " isAnswer ASC, " + " caq.create_at DESC" + "</script>")
IPage<QuestnaireListVo> selectPageList(Page page, @Param("pageQuestnaireDTO") PageQuestnaireDTO pageQuestnaireDTO);
@Select("<script>"
+ "select id,title,view_num,join_count,for_masses,for_party,for_volunteer,adver_position_top,adver_position_popup"
+ ",adver_position_application,create_at,start_time,end_time,publish_time,state,is_cover,project_key,count"
- + " from com_act_questnaire as caq where community_id = #{pageQuestnaireDTO.communityId} and is_hide = 0 "
+ + " from com_act_questnaire as caq where community_id = ${pageQuestnaireDTO.communityId} and is_hide = 0 "
+ "<if test='pageQuestnaireDTO.identity != null and pageQuestnaireDTO.identity == 1'>"
+ " and caq.for_masses = 1 " + " </if> "
+ "<if test='pageQuestnaireDTO.identity != null and pageQuestnaireDTO.identity == 2'>"
@@ -66,14 +70,14 @@
@Select("SELECT " + " id, " + " title, " + " remark, " + " is_cover, " + " for_masses, " + " for_party, "
+ " for_volunteer, " + " is_force, " + " adver_position_popup, " + " adver_position_top, "
+ " adver_position_application, " + " project_key " + "FROM " + " com_act_questnaire " + "WHERE "
- + " end_time >= now() " + " AND now() >= start_time " + " and community_id = #{communityId} "
+ + " end_time >= now() " + " AND now() >= start_time " + " and community_id = ${communityId} "
+ " and adver_position_top = 1 " + " and state = 2")
List<ComActQuestnaireAppVO> getIndexTopQuestnaireList(@Param("communityId") Long communityId);
@Select("SELECT " + " id, " + " title, " + " remark, " + " for_masses, " + " for_party, " + " for_volunteer, "
+ " is_cover, " + " is_force, " + " adver_position_popup, " + " adver_position_top, "
+ " adver_position_application, " + " project_key " + "FROM " + " com_act_questnaire " + "WHERE "
- + " end_time >= now() " + " AND now() >= start_time " + " and community_id = #{communityId} "
+ + " end_time >= now() " + " AND now() >= start_time " + " and community_id = ${communityId} "
+ " and adver_position_application = 1 " + " and state = 2")
List<ComActQuestnaireAppVO> getIndexApplicationQuestnaireList(@Param("communityId") Long communityId);
@@ -81,6 +85,8 @@
@Param("endTime") String endTime, @Param("id") Long id);
void deleteQuesSubAll(@Param("queId") Long queId);
+
+ void deleteQuesSubAll2(@Param("queId") Long queId);
QuestnaireDetailAdminVO getQuesDetailAdmin(@Param("queId") Long queId);
@@ -125,4 +131,23 @@
@Param("communityId") Long communityId);
void addNoNotice(@Param("questId") Long questId, @Param("userId") Long userId);
+
+ /**
+ * 首页大屏二级页面-社区问卷基础数据
+ * @param communityId
+ * @return
+ */
+ BigScreenQuestionnaireStatisticsInfo getIndexQuestionnaireBaseData(@Param("communityId") Long communityId);
+
+ List<StatisticsCommVO> getQuestionnaireAddPolylineData(@Param("communityId") Long communityId);
+
+ StatisticsCommVO getQuestionnaireTotalPolylineDate(@Param("communityId") Long communityId, @Param("date") String date);
+
+ /**
+ * 大屏问卷展示列表
+ * @param page
+ * @param pageBaseDTO
+ * @return
+ */
+ IPage<ComActQuestnaireVO> selectQuestionnaireDisplayList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
}
--
Gitblit v1.7.1