From e9d5fb4b01c383fa5b01bf5e730d4e3da73f266e Mon Sep 17 00:00:00 2001 From: 101captain <237651143@qq.com> Date: 星期四, 30 十二月 2021 11:27:15 +0800 Subject: [PATCH] 12/30 河门口大屏特殊修改 --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 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 5f18e07..3b85647 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 @@ -31,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 " + + " 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'>" @@ -70,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); -- Gitblit v1.7.1