From 85cf42314fc04a637f1a44e78c1e476a445bf0f3 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 14 三月 2022 13:29:18 +0800
Subject: [PATCH] Merge branch 'dev'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 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 ac91e2b..cf9652f 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
@@ -216,6 +216,9 @@
             "p.urban_status, " +
             "p.img_width, " +
             "p.img_height, " +
+            "p.evaluate_date, " +
+            "caepe.score," +
+            "caepe.`content`, " +
             "p.handle_photo_list " +
             "FROM " +
             "com_act_easy_photo p " +
@@ -225,6 +228,7 @@
             "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 " +
+            "left join com_act_easy_photo_evaluate as caepe on caepe.service_id = p.id and caepe.service_type = 1 " +
             "WHERE p.del_tag = 0 and p.id=#{id}")
     ComActEasyPhotoVO detailEasyPhoto(Long id);
     @Select("SELECT " +
@@ -409,4 +413,12 @@
      * @return
      */
     IPage<ComActEasyPhotoVO> indexEasyPhotoList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
+
+    /**
+     * 随手拍治安防控记录列表
+     * @param communityId
+     * @param pageSize
+     * @return
+     */
+    List<ComActEasyPhotoVO> getPartyBuildIngRecord(@Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);
 }

--
Gitblit v1.7.1