From c92c380b8f29ad485024d3d1948d0d0fce56b0d6 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 13 四月 2022 20:48:47 +0800
Subject: [PATCH] 党员双报到，问题清单，需求清单，资源清单接口开发
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java | 50 +++++++++++++++++++++++++++++++-------------------
1 files changed, 31 insertions(+), 19 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 d78c597..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
@@ -77,7 +77,7 @@
" </if> " +
"where p.del_tag = 0 and p.status !=2"+
"<if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>" +
- " and p.community_id = #{comActEasyPhotoVO.communityId} " +
+ " and p.community_id = ${comActEasyPhotoVO.communityId} " +
" </if> " +
"<if test='comActEasyPhotoVO.happenAddr != null and comActEasyPhotoVO.happenAddr.trim() != ""'>" +
"AND p.happen_addr like concat(#{comActEasyPhotoVO.happenAddr},'%') " +
@@ -149,7 +149,7 @@
"and p.handler_id=#{comActEasyPhotoVO.backUserId}"+
" </if> " +
"<if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>" +
- " and p.community_id = #{comActEasyPhotoVO.communityId} " +
+ " and p.community_id = ${comActEasyPhotoVO.communityId} " +
" </if> " +
"<if test='comActEasyPhotoVO.happenAddr != null and comActEasyPhotoVO.happenAddr.trim() != ""'>" +
"AND p.happen_addr like concat(#{comActEasyPhotoVO.happenAddr},'%') " +
@@ -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 " +
@@ -232,7 +236,7 @@
"FROM " +
" com_act_easy_photo p " +
"WHERE " +
- " p.del_tag = 0 and p.community_id = #{communityId} " +
+ " p.del_tag = 0 and p.community_id = ${communityId} " +
"AND p.STATUS = 1 "+
" " +
"union all " +
@@ -242,7 +246,7 @@
"FROM " +
" com_act_easy_photo p " +
"WHERE " +
- " p.del_tag = 0 and p.community_id = #{communityId} " +
+ " p.del_tag = 0 and p.community_id = ${communityId} " +
"AND p.`status` = 2 and p.is_need_feed_back=1 and p.handler_id=#{userId} "
)
List<TodoEventsVO> selectNeedToDo(@Param("communityId") Long communityId, @Param("userId") Long userId);
@@ -283,7 +287,7 @@
" <where>" +
" p.del_tag = 0 " +
"<if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>" +
- " and p.community_id = #{comActEasyPhotoVO.communityId} " +
+ " and p.community_id = ${comActEasyPhotoVO.communityId} " +
" </if> " +
"<if test='comActEasyPhotoVO.status != null and comActEasyPhotoVO.status!=0' >" +
"AND p.`status` = #{comActEasyPhotoVO.status} " +
@@ -305,17 +309,17 @@
IPage<ComActEasyPhotoVO> pageEasyPhotoApplets(Page page, @Param("comActEasyPhotoVO")ComActEasyPhotoVO comActEasyPhotoVO);
@Select("SELECT t.name,COUNT(p.id) as num FROM com_act_easy_photo_type t LEFT JOIN com_act_easy_photo_type_relation r ON t.id = r.easy_type_id " +
- "LEFT JOIN com_act_easy_photo p ON r.easy_id = p.id AND p.handle_status = 1 AND p.community_id = #{communityId} " +
+ "LEFT JOIN com_act_easy_photo p ON r.easy_id = p.id AND p.handle_status = 1 AND p.community_id = ${communityId} " +
"GROUP BY t.name ")
List<EastPhotoTypeVO> countDeal(@Param("communityId")Long communityId);
@Select("SELECT t.name,COUNT(p.id) as num FROM com_act_easy_photo_type t LEFT JOIN com_act_easy_photo_type_relation r ON t.id = r.easy_type_id " +
- "LEFT JOIN com_act_easy_photo p ON r.easy_id = p.id AND p.is_publicity = 1 AND p.community_id = #{communityId} " +
+ "LEFT JOIN com_act_easy_photo p ON r.easy_id = p.id AND p.is_publicity = 1 AND p.community_id = ${communityId} " +
"GROUP BY t.name ")
List<EastPhotoTypeVO> countPub(@Param("communityId")Long communityId);
@Select("SELECT t.name,COUNT(p.id) as num FROM com_act_easy_photo_type t LEFT JOIN com_act_easy_photo_type_relation r ON t.id = r.easy_type_id " +
- "LEFT JOIN com_act_easy_photo p ON r.easy_id = p.id AND p.status = 4 where p.community_id = #{communityId} " +
+ "LEFT JOIN com_act_easy_photo p ON r.easy_id = p.id AND p.status = 4 where p.community_id = ${communityId} " +
"GROUP BY t.name ")
List<EastPhotoTypeVO> countApproved(@Param("communityId")Long communityId);
@@ -324,28 +328,28 @@
"SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = 2 AND create_at LIKE concat(#{nowDate},'%') " +
") AS currentNum," +
"(" +
- "(SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = #{communityId} AND STATUS = 4 AND handle_status = 2)*100/(SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = #{communityId} AND handle_status = 2) " +
+ "(SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND STATUS = 4 AND handle_status = 2)*100/(SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND handle_status = 2) " +
") AS pubPoint," +
- "(SELECT AVG(TIMESTAMPDIFF(HOUR,create_at,feedback_at)) FROM com_act_easy_photo WHERE community_id = #{communityId} and handle_status = 2 ) AS dealTime " +
- "FROM com_act_easy_photo where community_id = #{communityId}")
+ "(SELECT AVG(TIMESTAMPDIFF(HOUR,create_at,feedback_at)) FROM com_act_easy_photo WHERE community_id = ${communityId} and handle_status = 2 ) AS dealTime " +
+ "FROM com_act_easy_photo where community_id = ${communityId}")
Map<String, Object> countByCommunityId(@Param("communityId")Long communityId,@Param("nowDate") String nowDate);
@Select("SELECT COUNT(id) AS total, " +
- "(SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = #{communityId} AND #{start} < create_at and create_at < #{end} ) AS adds, " +
- "(SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id =#{communityId} AND handle_status = 2 AND #{start} < create_at and create_at < #{end}) AS deal " +
- "FROM com_act_easy_photo WHERE community_id = #{communityId} AND #{start} < create_at and create_at < #{end} ")
+ "(SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND #{start} < create_at and create_at < #{end} ) AS adds, " +
+ "(SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND handle_status = 2 AND #{start} < create_at and create_at < #{end}) AS deal " +
+ "FROM com_act_easy_photo WHERE community_id = ${communityId} AND #{start} < create_at and create_at < #{end} ")
EastPhotoVO countByTime(@Param("start")String start, @Param("end")String end, @Param("nowDate")String nowDate, @Param("communityId")Long communityId);
// @Select("SELECT " +
// " count( id ) AS examineNum, " +
-// " ( 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 " +
+// " ( 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 del_tag = 0")
+// " AND community_id = ${communityId} and del_tag = 0")
ComActEasyPhotoStatisticsVO getEasyPhotoStatistics(@Param("communityId")Long communityId);
ComActEasyPhotoCountVO easyPhotoCount(ComActEasyPhotoVO comActEasyPhotoVO);
List<ExportEasyPhotoVO> export(ExportEasyPhotoDTO exportEasyPhotoDTO);
@@ -370,7 +374,7 @@
* @param communityId
* @return
*/
- List<ComActEasyPhotoVO> selectStatisticsList(@Param("communityId") Long communityId);
+ List<StatisticsCommVO> selectStatisticsList(@Param("communityId") Long communityId);
/**
* 获取居民自治统计数据
@@ -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