From 78d1c9ee9b0c49f77c29d0535cb93c6d62c42f3a Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 11 十一月 2021 13:58:25 +0800
Subject: [PATCH] 1111修改提交

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java
index 5ddca14..8809de5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java
@@ -6,6 +6,7 @@
 import com.panzhihua.common.model.dtos.community.easyPhoto.ExportEasyPhotoDTO;
 import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
 import com.panzhihua.common.model.vos.community.TodoEventsVO;
+import com.panzhihua.common.model.vos.community.easyPhoto.BannerVO;
 import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoCountVO;
 import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoStatisticsVO;
 import com.panzhihua.common.model.vos.community.easyPhoto.ExportEasyPhotoVO;
@@ -176,6 +177,7 @@
             "p.id, " +
             "p.sponsor_id, " +
             "p.feedback_at, " +
+            "p.is_publicity, " +
             "p.examine_at, " +
             "p.create_at, " +
             "u.`name` sponsorName, " +
@@ -185,6 +187,7 @@
             "u.`image_url`, " +
             "u.phone, " +
             "p.detail, " +
+            "p.lng_lat, " +
             "p.is_need_feed_back, " +
             "p.examine_at, " +
             "p.status, " +
@@ -199,12 +202,15 @@
             "p.activity_id, " +
             "p.activity_amount, " +
             "count(pu.id)giveThumbsUpNum, " +
-            "p.handle_photo_list," +
             "c.name communityName," +
             "p.transfer_time," +
             "p.is_report_urban," +
             "p.transfer_reason," +
-            "p.urban_status " +
+            "ca.`name` as classifyName," +
+            "p.urban_status, " +
+            "p.img_width, " +
+            "p.img_height, " +
+            "p.handle_photo_list " +
             "FROM " +
             "com_act_easy_photo p " +
             "JOIN sys_user u on p.sponsor_id=u.user_id " +
@@ -212,6 +218,7 @@
             "LEFT JOIN sys_user su1 on p.complete_id=su1.user_id " +
             "LEFT JOIN com_act_easy_photo_user pu on p.id=pu.easy_photo_id " +
             "LEFT JOIN com_act c on p.community_id=c.community_id " +
+            "left join com_act_easy_photo_classify ca on ca.id = p.classify_id " +
             "WHERE p.del_tag = 0 and p.id=#{id}")
     ComActEasyPhotoVO detailEasyPhoto(Long id);
     @Select("SELECT " +
@@ -244,6 +251,7 @@
             "count(DISTINCT c.id)commentNum, " +
             "u.image_url, " +
             "p.happen_addr, " +
+            "p.addr_remark, " +
             "su.`name` handler_name, " +
             "p.`status`, " +
             "p.`is_hide`, " +
@@ -256,6 +264,8 @@
             "p.activity_amount, " +
             "p.classify_id, " +
             "class.`name` as classifyName, " +
+            "p.img_width, " +
+            "p.img_height, " +
             "p.examine_at  " +
             "FROM " +
             "com_act_easy_photo p " +
@@ -265,7 +275,7 @@
             "left JOIN com_act_easy_photo_comment c ON p.id = c.easy_photo_id  " +
             "left JOIN com_act_easy_photo_classify class ON p.classify_id = class.id  " +
             " <where>" +
-            " p.del_tag = 0 and p.is_publicity = 1 "  +
+            " p.del_tag = 0 "  +
             "<if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>" +
             "  and p.community_id=#{comActEasyPhotoVO.communityId} " +
             " </if> " +
@@ -276,7 +286,7 @@
             "AND p.sponsor_id =#{comActEasyPhotoVO.sponsorId}  " +
             " </if> " +
             "<if test='comActEasyPhotoVO.sponsorId == null or comActEasyPhotoVO.sponsorId==0'>" +
-            "AND p.`status` in (2,4)  " +
+            "AND p.`status` in (2,4) and p.is_publicity = 1 " +
             " </if> " +
             "<if test='comActEasyPhotoVO.keyWord != null and comActEasyPhotoVO.keyWord != &quot;&quot;'>" +
             "AND (class.`name` like concat(#{comActEasyPhotoVO.keyWord},'%') or p.detail like concat(#{comActEasyPhotoVO.keyWord},'%'))   " +
@@ -341,4 +351,11 @@
      * @return  社区待处理随手拍id集合
      */
     List<Long> easyPhotoNoHandleIds(@Param("communityId")Long communityId);
+
+    /**
+     *  查询banner
+     * @param communityId
+     * @return
+     */
+    List<BannerVO>  banner(@Param("communityId") Long communityId);
 }

--
Gitblit v1.7.1