From 04c96f26282f021fcc59b40d6f11f172fc070af8 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期五, 22 一月 2021 17:31:41 +0800
Subject: [PATCH] 新增接口一起议

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java |   78 ++++++--------------------------------
 1 files changed, 13 insertions(+), 65 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 400afb6..eb5ddb4 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
@@ -22,7 +22,6 @@
 public interface ComActMicroWishDAO extends BaseMapper<ComActMicroWishDO> {
 
     @Select("<script> " +
-            "select * from ( "+
             "SELECT\n" +
             "w.id,\n" +
             "u.name sponsor_name,\n" +
@@ -56,15 +55,18 @@
             " JOIN sys_user su ON w.responsible_id = su.user_id \n" +
             "AND su.`name` like concat(#{comActMicroWishVO.responsibleName},'%')  \n" +
             " </if> " +
-            "where w.status!=3 " +
+            " <where>" +
             "<if test='comActMicroWishVO.communityId != null and comActMicroWishVO.communityId != 0'>" +
             " and w.community_id=#{comActMicroWishVO.communityId} \n" +
             " </if> " +
             "<if test='comActMicroWishVO.sponsorPhone != null and comActMicroWishVO.sponsorPhone.trim() != &quot;&quot;'>" +
             "AND w.sponsor_phone like concat(#{comActMicroWishVO.sponsorPhone},'%')  \n" +
             " </if> " +
-            "<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 '>" +
+            "<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 and comActMicroWishVO.isPageMyWish==null'>" +
             "AND w.`status` = #{comActMicroWishVO.status} \n" +
+            " </if> " +
+            "<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 and comActMicroWishVO.isPageMyWish!=null and comActMicroWishVO.status==1'>" +
+            "AND w.`status` in (1,2) \n" +
             " </if> " +
             "<if test='comActMicroWishVO.createBegin != null '>" +
             "AND w.create_at BETWEEN #{comActMicroWishVO.createBegin} \n" +
@@ -76,69 +78,15 @@
             "<if test='comActMicroWishVO.userId != null and comActMicroWishVO.userId != 0'>" +
             "AND w.sponsor_id  =#{comActMicroWishVO.userId} \n" +
             " </if> " +
+            "<if test='comActMicroWishVO.backUserId != null and comActMicroWishVO.backUserId != 0 and  comActMicroWishVO.status==3 '>" +
+            "AND w.responsible_id  =#{comActMicroWishVO.backUserId} \n" +
+            " </if> " +
+            "<if test='comActMicroWishVO.backUserId != null and comActMicroWishVO.backUserId != 0 and  comActMicroWishVO.status==0 '>" +
+            "and (w.status in(1,2,4,5,6) or (w.status=3 and w.responsible_id  =#{comActMicroWishVO.backUserId}))\n" +
+            " </if> " +
+            " </where>" +
             " group by w.id  \n"+
-
-
-            "union all "+
-
-            "SELECT\n" +
-            "w.id,\n" +
-            "u.name sponsor_name,\n" +
-            "u.image_url ,\n" +
-            "w.sponsor_phone,\n" +
-            "w.wish_name,\n" +
-            "w.`status`,\n" +
-            "w.`feedback_at`,\n" +
-            "w.`examine_at`,\n" +
-            "w.`distribution_at`,\n" +
-            "w.`evaluate_at`,\n" +
-            "w.`photo_path_list`,\n" +
-            "count(wu.id)star_num,\n" +
-            "w.`detail`,\n" +
-            "w.form,\n" +
-            "w.reject_reason,\n" +
-            "su.`name` responsible_name,\n" +
-            "w.score,\n" +
-            "w.create_at \n" +
-            "FROM\n" +
-            "com_act_micro_wish w\n" +
-            "left join com_act_micro_wish_user wu on w.id=wu.micro_wish_id "+
-            "JOIN sys_user u ON w.sponsor_id = u.user_id \n" +
-            "<if test='comActMicroWishVO.sponsorName != null and comActMicroWishVO.sponsorName.trim() != &quot;&quot;'>" +
-            "AND u.name like concat(#{comActMicroWishVO.sponsorName},'%')  \n" +
-            " </if> " +
-            "<if test='comActMicroWishVO.responsibleName == null or comActMicroWishVO.responsibleName.trim() == &quot;&quot;'>" +
-            "LEFT JOIN sys_user su ON w.responsible_id = su.user_id \n" +
-            " </if> " +
-            "<if test='comActMicroWishVO.responsibleName != null and comActMicroWishVO.responsibleName.trim() != &quot;&quot;'>" +
-            " JOIN sys_user su ON w.responsible_id = su.user_id \n" +
-            "AND su.`name` like concat(#{comActMicroWishVO.responsibleName},'%')  \n" +
-            " </if> " +
-            "where w.status=3 and w.form=1 \n" +
-            "<if test='comActMicroWishVO.backUserId != null and comActMicroWishVO.backUserId != 0'>" +
-            "and w.responsible_id=#{comActMicroWishVO.backUserId} \n"+
-            " </if> " +
-            "<if test='comActMicroWishVO.communityId != null and comActMicroWishVO.communityId != 0'>" +
-            " and w.community_id=#{comActMicroWishVO.communityId} \n" +
-            " </if> " +
-            "<if test='comActMicroWishVO.sponsorPhone != null and comActMicroWishVO.sponsorPhone.trim() != &quot;&quot;'>" +
-            "AND w.sponsor_phone like concat(#{comActMicroWishVO.sponsorPhone},'%')  \n" +
-            " </if> " +
-            "<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 '>" +
-            "AND w.`status` = #{comActMicroWishVO.status} \n" +
-            " </if> " +
-            "<if test='comActMicroWishVO.createBegin != null '>" +
-            "AND w.create_at BETWEEN #{comActMicroWishVO.createBegin} \n" +
-            "AND #{comActMicroWishVO.createEnd}" +
-            " </if> " +
-            "<if test='comActMicroWishVO.isApplets != null and comActMicroWishVO.isApplets != 0'>" +
-            "AND w.status  in (3,6) \n" +
-            " </if> " +
-            "<if test='comActMicroWishVO.userId != null and comActMicroWishVO.userId != 0'>" +
-            "AND w.sponsor_id  =#{comActMicroWishVO.userId} \n" +
-            " </if> " +
-            " group by w.id  )t\n"+
-            "ORDER BY t.`status` asc, t.create_at desc "+
+            "ORDER BY w.`status` asc, w.create_at desc "+
             "</script>")
     IPage<ComActMicroWishVO> pageMicroWish(Page page, @Param("comActMicroWishVO") ComActMicroWishVO comActMicroWishVO);
     @Select("SELECT\n" +

--
Gitblit v1.7.1