From dd959e56bb59f0b933acdd8ba905416aa632ff3c Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期四, 14 一月 2021 11:23:33 +0800
Subject: [PATCH] 社区后台随手拍查询给为模糊查询

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java |   32 ++++++++++++++++++++++----------
 1 files changed, 22 insertions(+), 10 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 c3513ca..0f45dfa 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
@@ -37,23 +37,28 @@
             "FROM\n" +
             "com_act_easy_photo p\n" +
             "JOIN sys_user u ON p.sponsor_id = u.user_id \n" +
+            "<if test='comActEasyPhotoVO.sponsorName != null and comActEasyPhotoVO.sponsorName.trim() != &quot;&quot;'>" +
+            "AND u.`name` like concat(#{comActEasyPhotoVO.sponsorName},'%')  \n" +
+            " </if> " +
             "<if test='comActEasyPhotoVO.userId != null and comActEasyPhotoVO.userId != 0'>" +
             "AND u.`user_id` = #{comActEasyPhotoVO.userId} \n" +
             " </if> " +
             "left join  com_act_easy_photo_user pu ON p.id = pu.easy_photo_id \n" +
-            "<if test='comActEasyPhotoVO.sponsorName != null and comActEasyPhotoVO.sponsorName.trim() != &quot;&quot;'>" +
-            "AND u.`name` = #{comActEasyPhotoVO.sponsorName} \n" +
-            " </if> " +
+            "<if test='comActEasyPhotoVO.handlerName == null or comActEasyPhotoVO.handlerName.trim() == &quot;&quot;'>" +
             "left JOIN sys_user su ON p.handler_id = su.user_id \n" +
+            " </if> " +
             "<if test='comActEasyPhotoVO.handlerName != null and comActEasyPhotoVO.handlerName.trim() != &quot;&quot;'>" +
-            "AND su.`name` = #{comActEasyPhotoVO.handlerName} \n" +
+            " JOIN sys_user su ON p.handler_id = su.user_id \n" +
+            " </if> " +
+            "<if test='comActEasyPhotoVO.handlerName != null and comActEasyPhotoVO.handlerName.trim() != &quot;&quot;'>" +
+            "AND su.`name` like concat(#{comActEasyPhotoVO.handlerName},'%')  \n" +
             " </if> " +
             "where p.status !=2"+
             "<if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>" +
             "  and p.community_id=#{comActEasyPhotoVO.communityId} " +
             " </if> " +
             "<if test='comActEasyPhotoVO.happenAddr != null and comActEasyPhotoVO.happenAddr.trim() != &quot;&quot;'>" +
-            "AND p.happen_addr = #{comActEasyPhotoVO.happenAddr} \n" +
+            "AND p.happen_addr like concat(#{comActEasyPhotoVO.happenAddr},'%')  \n" +
             " </if> " +
             "<if test='comActEasyPhotoVO.status != null and comActEasyPhotoVO.status!=0' >" +
             "AND p.`status` = #{comActEasyPhotoVO.status} \n" +
@@ -85,16 +90,21 @@
             "FROM\n" +
             "com_act_easy_photo p\n" +
             "JOIN sys_user u ON p.sponsor_id = u.user_id \n" +
+            "<if test='comActEasyPhotoVO.sponsorName != null and comActEasyPhotoVO.sponsorName.trim() != &quot;&quot;'>" +
+            "AND u.`name` like concat(#{comActEasyPhotoVO.sponsorName},'%')  \n" +
+            " </if> " +
             "<if test='comActEasyPhotoVO.userId != null and comActEasyPhotoVO.userId != 0'>" +
             "AND u.`user_id` = #{comActEasyPhotoVO.userId} \n" +
             " </if> " +
             "left join  com_act_easy_photo_user pu ON p.id = pu.easy_photo_id \n" +
-            "<if test='comActEasyPhotoVO.sponsorName != null and comActEasyPhotoVO.sponsorName.trim() != &quot;&quot;'>" +
-            "AND u.`name` = #{comActEasyPhotoVO.sponsorName} \n" +
-            " </if> " +
+            "<if test='comActEasyPhotoVO.handlerName == null or comActEasyPhotoVO.handlerName.trim() == &quot;&quot;'>" +
             "left JOIN sys_user su ON p.handler_id = su.user_id \n" +
+            " </if> " +
             "<if test='comActEasyPhotoVO.handlerName != null and comActEasyPhotoVO.handlerName.trim() != &quot;&quot;'>" +
-            "AND su.`name` = #{comActEasyPhotoVO.handlerName} \n" +
+            " JOIN sys_user su ON p.handler_id = su.user_id \n" +
+            " </if> " +
+            "<if test='comActEasyPhotoVO.handlerName != null and comActEasyPhotoVO.handlerName.trim() != &quot;&quot;'>" +
+            "AND su.`name` like concat(#{comActEasyPhotoVO.handlerName},'%') \n" +
             " </if> " +
             "where  p.status=2 and p.is_need_feed_back=1 " +
             "<if test='comActEasyPhotoVO.backUserId != null and comActEasyPhotoVO.backUserId != 0'>" +
@@ -104,7 +114,7 @@
             "  and p.community_id=#{comActEasyPhotoVO.communityId} " +
             " </if> " +
             "<if test='comActEasyPhotoVO.happenAddr != null and comActEasyPhotoVO.happenAddr.trim() != &quot;&quot;'>" +
-            "AND p.happen_addr = #{comActEasyPhotoVO.happenAddr} \n" +
+            "AND p.happen_addr like concat(#{comActEasyPhotoVO.happenAddr},'%')  \n" +
             " </if> " +
             "<if test='comActEasyPhotoVO.status != null and comActEasyPhotoVO.status!=0' >" +
             "AND p.`status` = #{comActEasyPhotoVO.status} \n" +
@@ -124,11 +134,13 @@
             "p.sponsor_id,\n" +
             "p.create_at,\n" +
             "u.`name` sponsorName,\n" +
+            "su.`name` handlerName,\n" +
             "u.`image_url`,\n" +
             "u.phone,\n" +
             "p.detail,\n" +
             "p.examine_at,\n" +
             "p.status,\n" +
+            "p.reject_reason,\n" +
             "p.is_hide,\n" +
             "p.happen_addr,\n" +
             "su.`name`,\n" +

--
Gitblit v1.7.1