From 2e64c232ab6b51b2cecf1ee96e1e9b709234f326 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 21 八月 2021 16:35:14 +0800
Subject: [PATCH] 随手拍改版接口开发
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
index b8eff85..f676401 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
@@ -54,10 +54,10 @@
"AND u.name like concat(#{comActMicroWishVO.sponsorName},'%') " +
" </if> " +
"<if test='comActMicroWishVO.responsibleName == null or comActMicroWishVO.responsibleName.trim() == ""'>" +
- "LEFT JOIN sys_user su ON w.responsible_id = su.user_id " +
+ "LEFT JOIN com_pb_service_team su ON w.responsible_id = su.id " +
" </if> " +
"<if test='comActMicroWishVO.responsibleName != null and comActMicroWishVO.responsibleName.trim() != ""'>" +
- " JOIN sys_user su ON w.responsible_id = su.user_id " +
+ " JOIN com_pb_service_team su ON w.responsible_id = su.id " +
"AND su.`name` like concat(#{comActMicroWishVO.responsibleName},'%') " +
" </if> " +
" <where>" +
@@ -71,7 +71,7 @@
"AND w.`status` = #{comActMicroWishVO.status} " +
" </if> " +
"<if test='comActMicroWishVO.status == 3 and comActMicroWishVO.isPageMyWish==null'>" +
- "AND ( w.`status` = 3 or w.`status` = 5 ) " +
+ "AND w.`status` = 3 " +
" </if> " +
"<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 and comActMicroWishVO.isPageMyWish!=null and comActMicroWishVO.status==1'>" +
"AND w.`status` =1 " +
@@ -130,7 +130,7 @@
"FROM " +
"com_act_micro_wish w " +
"JOIN sys_user u ON w.sponsor_id = u.user_id " +
- "LEFT JOIN sys_user su ON w.responsible_id = su.user_id " +
+ "LEFT JOIN com_pb_service_team su ON w.responsible_id = su.id " +
"LEFT JOIN com_act_micro_wish_user wu ON w.id = wu.micro_wish_id " +
"WHERE " +
"w.id =#{id}"+
@@ -165,8 +165,8 @@
int updateStatusAutoConfirm();
@Select("SELECT COUNT(id) AS completedNum," +
- "(SELECT COUNT(id) FROM com_act_micro_wish WHERE community_id = #{communityId} AND (status =1 OR status =2 OR status = 3 OR status = 4 OR status = 5)) AS willNum ," +
- "(SELECT COUNT(id) FROM com_act_micro_wish WHERE community_id = #{communityId} AND create_at LIKE CONCAT(#{nowDate},'%')) AS currentNum " +
+ "(SELECT COUNT(id) FROM com_act_micro_wish WHERE community_id = #{communityId} AND (status =1 OR status =2 OR status = 3 OR status = 5)) AS willNum ," +
+ "(SELECT COUNT(id) FROM com_act_micro_wish WHERE community_id = #{communityId} AND (status =1 OR status =2 OR status = 3 OR status = 5 OR status = 6) AND create_at LIKE CONCAT(#{nowDate},'%')) AS currentNum " +
"FROM com_act_micro_wish WHERE community_id = #{communityId} AND status = 6 ")
Map<String, Long> countByCommunityId(@Param("communityId") Long communityId,@Param("nowDate") String nowDate);
@@ -195,7 +195,7 @@
"FROM " +
" com_act_micro_wish AS camw " +
" LEFT JOIN sys_user AS su ON su.user_id = camw.sponsor_id " +
- " LEFT JOIN sys_user AS su1 ON su1.user_id = camw.responsible_id " +
+ " LEFT JOIN com_pb_service_team AS su1 ON su1.id = camw.responsible_id " +
" <where> " +
"<if test='microListDTO.status != null'>" +
"AND camw.`status` =#{microListDTO.status} " +
--
Gitblit v1.7.1