From 6af3a9c58565a5616105d8c76b1cf91bae36d38a Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 16 六月 2021 21:25:41 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 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 41b5667..eec7ae4 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
@@ -5,12 +5,17 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;
+import com.panzhihua.common.model.vos.screen.EastPhotoTypeVO;
+import com.panzhihua.common.model.vos.screen.EastPhotoVO;
+import com.panzhihua.common.model.vos.screen.EasyPhotoDataVO;
+import com.panzhihua.common.model.vos.screen.PbWorkVO;
import com.panzhihua.service_community.model.dos.ComActEasyPhotoDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
+import java.util.Map;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -36,6 +41,8 @@
"p.`photo_path_list`,\n" +
"p.create_at,\n" +
"p.feedback_at,\n" +
+ "p.is_report,\n" +
+ "p.is_publicity,\n" +
"p.examine_at \n" +
"FROM\n" +
"com_act_easy_photo p\n" +
@@ -91,6 +98,8 @@
"p.`photo_path_list`,\n" +
"p.create_at,\n" +
"p.feedback_at,\n" +
+ "p.is_report,\n" +
+ "p.is_publicity,\n" +
"p.examine_at \n" +
"FROM\n" +
"com_act_easy_photo p\n" +
@@ -179,7 +188,7 @@
"SELECT\n" +
"'1' type\n" +
"FROM\n" +
- " p.del_tag = 0 and com_act_easy_photo p \n" +
+ " com_act_easy_photo p \n" +
"WHERE\n" +
" p.del_tag = 0 and p.community_id = #{communityId} \n" +
"AND p.`status` = 2 and p.is_need_feed_back=1 and p.handler_id=#{userId}\n"
@@ -190,7 +199,7 @@
"SELECT\n" +
"p.id,\n" +
"u.`name` sponsor_name,\n" +
- "u.nick_name userNickName,\n" +
+ "u.`nick_name` userNickName,\n" +
"u.phone sponsor_phone,\n" +
"count(DISTINCT pu.id)giveThumbsUpNum,\n" +
"count(DISTINCT c.id)commentNum,\n" +
@@ -231,4 +240,36 @@
"</script>"
)
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} " +
+ "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} " +
+ "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 and p.community_id = #{communityId} " +
+ "GROUP BY t.name ")
+ List<EastPhotoTypeVO> countApproved(@Param("communityId")Long communityId);
+
+ @Select("SELECT COUNT(id) AS noneDeal," +
+ "(" +
+ "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) " +
+ ") 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}")
+ 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} ")
+ EastPhotoVO countByTime(@Param("start")String start, @Param("end")String end, @Param("nowDate")String nowDate, @Param("communityId")Long communityId);
}
--
Gitblit v1.7.1