From d7ea73196c8eb7df71c20b4fdccbc1ef9eff96fe Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 14 十二月 2021 16:14:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 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 646463c..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
@@ -3,10 +3,13 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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;
import com.panzhihua.common.model.vos.screen.EastPhotoTypeVO;
import com.panzhihua.common.model.vos.screen.EastPhotoVO;
import com.panzhihua.service_community.model.dos.ComActEasyPhotoDO;
@@ -174,6 +177,7 @@
"p.id, " +
"p.sponsor_id, " +
"p.feedback_at, " +
+ "p.is_publicity, " +
"p.examine_at, " +
"p.create_at, " +
"u.`name` sponsorName, " +
@@ -183,6 +187,7 @@
"u.`image_url`, " +
"u.phone, " +
"p.detail, " +
+ "p.lng_lat, " +
"p.is_need_feed_back, " +
"p.examine_at, " +
"p.status, " +
@@ -197,11 +202,15 @@
"p.activity_id, " +
"p.activity_amount, " +
"count(pu.id)giveThumbsUpNum, " +
+ "c.name communityName," +
+ "p.transfer_time," +
+ "p.is_report_urban," +
+ "p.transfer_reason," +
+ "ca.`name` as classifyName," +
+ "p.urban_status, " +
+ "p.img_width, " +
+ "p.img_height, " +
"p.handle_photo_list " +
- "c.name communityName " +
- "p.transfer_time" +
- "p.transfer_reason" +
- "p.urban_status" +
"FROM " +
"com_act_easy_photo p " +
"JOIN sys_user u on p.sponsor_id=u.user_id " +
@@ -209,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 " +
@@ -241,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`, " +
@@ -251,6 +262,10 @@
"p.feedback_at, " +
"p.activity_type, " +
"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 " +
@@ -258,8 +273,9 @@
"left join com_act_easy_photo_user pu ON p.id = pu.easy_photo_id " +
"left JOIN sys_user su ON p.handler_id = su.user_id " +
"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 " +
+ " p.del_tag = 0 " +
"<if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>" +
" and p.community_id=#{comActEasyPhotoVO.communityId} " +
" </if> " +
@@ -270,7 +286,10 @@
"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 != ""'>" +
+ "AND (class.`name` like concat(#{comActEasyPhotoVO.keyWord},'%') or p.detail like concat(#{comActEasyPhotoVO.keyWord},'%')) " +
" </if> " +
"group by p.id "+
"order by p.create_at desc "+
@@ -323,4 +342,20 @@
// " AND community_id = #{communityId} and del_tag = 0")
ComActEasyPhotoStatisticsVO getEasyPhotoStatistics(@Param("communityId")Long communityId);
ComActEasyPhotoCountVO easyPhotoCount(ComActEasyPhotoVO comActEasyPhotoVO);
+ List<ExportEasyPhotoVO> export(ExportEasyPhotoDTO exportEasyPhotoDTO);
+ List<ExportEasyPhotoVO> exportByIds(List<Integer> ids);
+
+ /**
+ * 查询社区待处理随手拍id集合
+ * @param communityId 社区id
+ * @return 社区待处理随手拍id集合
+ */
+ List<Long> easyPhotoNoHandleIds(@Param("communityId")Long communityId);
+
+ /**
+ * 查询banner
+ * @param communityId
+ * @return
+ */
+ List<BannerVO> banner(@Param("communityId") Long communityId);
}
--
Gitblit v1.7.1