12/29 河门口大屏特殊修改

101captain

2021-12-29 60daae4c3f216bc9af6b9efa38450d44413de8ff

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

@@ -50,7 +50,7 @@
        + "left join sys_user u on a.sponsor_id=u.user_id " + "left join (select * from com_act_act_sign where `status` = 1) s on a.id=s.activity_id  "
        + "left join com_act ca on a.community_id=ca.community_id  " + " where 1=1 " +

        "<if test='comActActivityVO.choice == 0 '>" + "AND a.community_id=#{comActActivityVO.communityId} " + " </if> "
        "<if test='comActActivityVO.choice == 0 '>" + "AND a.community_id = #{comActActivityVO.communityId} " + " </if> "
        +

        "<if test='comActActivityVO.activityName != null and comActActivityVO.activityName.trim() != &quot;&quot;'>"
@@ -119,7 +119,7 @@
//        + "a.publish_at, " + "a.is_qr_code, " + "a.begin_at, " + "a.end_at, " + "a.sign_up_begin, " + "a.sign_up_end " + "FROM "
//        + " com_act_activity a  " + " LEFT JOIN sys_user u on a.sponsor_id=u.user_id "
//        + " LEFT JOIN com_act_act_sign s on a.id=s.activity_id " + "WHERE "
//        + "  a.`status` = 1 and a.community_id=#{comActActivityVO.communityId} "
//        + "  a.`status` = 1 and a.community_id = #{comActActivityVO.communityId} "
//        + "<if test='comActActivityVO.activityName != null and comActActivityVO.activityName !=&quot;&quot;'>"
//        + " and a.activity_name LIKE concat( #{comActActivityVO.activityName}, '%' )  " + " </if> "
//        + "<if test='comActActivityVO.status != null and comActActivityVO.status !=0 and comActActivityVO.status !=1'>"
@@ -131,7 +131,7 @@
//        + "count(if(s.is_volunteer=1,s.id,null))volunteer_now, " + "a.`status`, " + "a.publish_at, " + "a.is_qr_code, " + "a.begin_at, "
//        + "a.end_at, " + "a.sign_up_begin, " + "a.sign_up_end " + "FROM " + " com_act_activity a  "
//        + " LEFT JOIN sys_user u on a.sponsor_id=u.user_id " + " LEFT JOIN com_act_act_sign s on a.id=s.activity_id "
//        + "WHERE " + "  a.`status` != 1 and a.community_id=#{comActActivityVO.communityId} "
//        + "WHERE " + "  a.`status` != 1 and a.community_id = #{comActActivityVO.communityId} "
//        + "<if test='comActActivityVO.activityName != null and comActActivityVO.activityName !=&quot;&quot;'>"
//        + " and a.activity_name LIKE concat( #{comActActivityVO.activityName}, '%' )  " + " </if> "
//        + "<if test='comActActivityVO.status != null and comActActivityVO.status !=0 '>"
@@ -153,17 +153,17 @@
    int updateStatusToBeginAfterSingEnd();

    @Select("select GROUP_CONCAT(t.x1,',',t.x2,',',t.x3,',',t.x4) from ( " + "SELECT "
        + "(select COUNT(d.id) from com_act_discuss d where  d.community_id=#{communityId})x1, "
        + "(select COUNT(w.id) from com_act_micro_wish w where  w.community_id=#{communityId})x2, "
        + "(select COUNT(p.id) from com_act_easy_photo p where  p.community_id=#{communityId})x3, "
        + "(select COUNT(d.id) from com_act_discuss d where  d.community_id = #{communityId})x1, "
        + "(select COUNT(w.id) from com_act_micro_wish w where  w.community_id = #{communityId})x2, "
        + "(select COUNT(p.id) from com_act_easy_photo p where  p.community_id = #{communityId})x3, "
        + " COUNT( a.id ) x4 " + "FROM " + " com_pb_activity a  " + "WHERE " + "  a.community_id =#{communityId})t")
    String selectCommunityGovernanceTrendsVO(Long communityId);

    @Select(" " + " SELECT "
        + " (select COUNT(d.id) from com_act_discuss d where DATE_FORMAT(d.create_at,'%Y-%m-%d')=DATE_FORMAT(#{date},'%Y-%m-%d') and d.community_id=#{communityId})discuss, "
        + " (select COUNT(w.id) from com_act_micro_wish w where DATE_FORMAT(w.create_at,'%Y-%m-%d')=DATE_FORMAT(#{date},'%Y-%m-%d') and w.community_id=#{communityId})microWish, "
        + " (select COUNT(p.id) from com_act_easy_photo p where DATE_FORMAT(p.create_at,'%Y-%m-%d')=DATE_FORMAT(#{date},'%Y-%m-%d') and p.community_id=#{communityId})eashPhoto, "
        + " (select COUNT(pa.id) from com_pb_activity pa where DATE_FORMAT(pa.create_at,'%Y-%m-%d')=DATE_FORMAT(#{date},'%Y-%m-%d') and pa.community_id=#{communityId})pbActivity, "
        + " (select COUNT(d.id) from com_act_discuss d where DATE_FORMAT(d.create_at,'%Y-%m-%d')=DATE_FORMAT(#{date},'%Y-%m-%d') and d.community_id = #{communityId})discuss, "
        + " (select COUNT(w.id) from com_act_micro_wish w where DATE_FORMAT(w.create_at,'%Y-%m-%d')=DATE_FORMAT(#{date},'%Y-%m-%d') and w.community_id = #{communityId})microWish, "
        + " (select COUNT(p.id) from com_act_easy_photo p where DATE_FORMAT(p.create_at,'%Y-%m-%d')=DATE_FORMAT(#{date},'%Y-%m-%d') and p.community_id = #{communityId})eashPhoto, "
        + " (select COUNT(pa.id) from com_pb_activity pa where DATE_FORMAT(pa.create_at,'%Y-%m-%d')=DATE_FORMAT(#{date},'%Y-%m-%d') and pa.community_id = #{communityId})pbActivity, "
        + "  COUNT( a.id ) actActivity " + " FROM " + "  com_pb_activity a  " + " WHERE "
        + "  DATE_FORMAT( a.create_at, '%Y-%m-%d' )=DATE_FORMAT(#{date},'%Y-%m-%d')  "
        + "  AND a.community_id =#{communityId}")