Merge branch 'test' into 'master'

罗元桥

2021-08-05 cc1098fc00a50cb1591d182f04bc37066ff0a9e2

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

@@ -45,6 +45,7 @@
            "p.is_report, " +
            "p.is_publicity, " +
            "p.activity_type, " +
            "p.activity_id, " +
            "p.activity_amount, " +
            "p.examine_at  " +
            "FROM " +
@@ -83,6 +84,15 @@
            "<if test='comActEasyPhotoVO.sponsorId != null and comActEasyPhotoVO.sponsorId != 0'>" +
            "AND p.sponsor_id =#{comActEasyPhotoVO.sponsorId}  " +
            " </if> " +
            "<if test='comActEasyPhotoVO.activityType != null'>" +
            "AND p.activity_type =#{comActEasyPhotoVO.activityType}  " +
            " </if> " +
            "<if test='comActEasyPhotoVO.easyType != null and comActEasyPhotoVO.easyType == 1'>" +
            " AND (p.status = 1 or (p.status > 1 and is_need_feed_back = 0)) " +
            " </if> " +
            "<if test='comActEasyPhotoVO.easyType != null and comActEasyPhotoVO.easyType == 2'>" +
            " AND p.status > 1 and is_need_feed_back = 1 " +
            " </if> " +
            "group by p.id "+

            "union all "+
@@ -105,6 +115,7 @@
            "p.is_publicity, " +
            "p.activity_type, " +
            "p.activity_amount, " +
            "p.activity_id, " +
            "p.examine_at  " +
            "FROM " +
            "com_act_easy_photo p " +
@@ -181,6 +192,7 @@
            "p.handle_result, " +
            "p.photo_path_list, " +
            "p.activity_type, " +
            "p.activity_id, " +
            "p.activity_amount, " +
            "count(pu.id)giveThumbsUpNum, " +
            "p.handle_photo_list " +
@@ -293,13 +305,13 @@

    @Select("SELECT " +
            " count( id ) AS examineNum, " +
            " ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 2 AND community_id = #{communityId} ) AS verificationNum, " +
            " ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 3 AND community_id = #{communityId} ) AS rejectNum, " +
            " ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 4 AND community_id = #{communityId} ) AS completeNum  " +
            " ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 2 AND community_id = #{communityId} and del_tag = 0 ) AS verificationNum, " +
            " ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 3 AND community_id = #{communityId} and del_tag = 0 ) AS rejectNum, " +
            " ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 4 AND community_id = #{communityId} and del_tag = 0 ) AS completeNum  " +
            "FROM " +
            " com_act_easy_photo  " +
            "WHERE " +
            " `status` = 1  " +
            " AND community_id = #{communityId}")
            " AND community_id = #{communityId} and del_tag = 0")
    ComActEasyPhotoStatisticsVO getEasyPhotoStatistics(@Param("communityId")Long communityId);
}