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/.idea/workspace.xml | 56 ++++++++++++++--------------
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java | 32 +++++++++++-----
2 files changed, 50 insertions(+), 38 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml b/springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
index d78239e..3912436 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
@@ -24,7 +24,7 @@
<component name="ChangeListManager">
<list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -390,7 +390,7 @@
<workItem from="1610326930387" duration="5497000" />
<workItem from="1610368400707" duration="771000" />
<workItem from="1610415637750" duration="6485000" />
- <workItem from="1610499071420" duration="16776000" />
+ <workItem from="1610499071420" duration="20138000" />
</task>
<servers />
</component>
@@ -442,54 +442,54 @@
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1610368574903" />
- <state width="1031" height="544" key="GridCell.Tab.0.bottom" timestamp="1610531429595">
+ <state width="1031" height="544" key="GridCell.Tab.0.bottom" timestamp="1610594231149">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="544" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610531429595" />
- <state width="1031" height="544" key="GridCell.Tab.0.center" timestamp="1610531429595">
+ <state width="1031" height="544" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610594231149" />
+ <state width="1031" height="544" key="GridCell.Tab.0.center" timestamp="1610594231148">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="544" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1610531429595" />
- <state width="1031" height="544" key="GridCell.Tab.0.left" timestamp="1610531429595">
+ <state width="1031" height="544" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1610594231148" />
+ <state width="1031" height="544" key="GridCell.Tab.0.left" timestamp="1610594231147">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="544" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1610531429595" />
- <state width="1031" height="544" key="GridCell.Tab.0.right" timestamp="1610531429595">
+ <state width="1031" height="544" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1610594231147" />
+ <state width="1031" height="544" key="GridCell.Tab.0.right" timestamp="1610594231149">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="544" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1610531429595" />
- <state width="1031" height="544" key="GridCell.Tab.1.bottom" timestamp="1610531429596">
+ <state width="1031" height="544" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1610594231149" />
+ <state width="1031" height="544" key="GridCell.Tab.1.bottom" timestamp="1610594231150">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="544" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610531429596" />
- <state width="1031" height="544" key="GridCell.Tab.1.center" timestamp="1610531429596">
+ <state width="1031" height="544" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610594231150" />
+ <state width="1031" height="544" key="GridCell.Tab.1.center" timestamp="1610594231150">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="544" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1610531429596" />
- <state width="1031" height="544" key="GridCell.Tab.1.left" timestamp="1610531429595">
+ <state width="1031" height="544" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1610594231150" />
+ <state width="1031" height="544" key="GridCell.Tab.1.left" timestamp="1610594231149">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="544" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1610531429595" />
- <state width="1031" height="544" key="GridCell.Tab.1.right" timestamp="1610531429596">
+ <state width="1031" height="544" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1610594231149" />
+ <state width="1031" height="544" key="GridCell.Tab.1.right" timestamp="1610594231150">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="544" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1610531429596" />
- <state width="1031" height="544" key="GridCell.Tab.2.bottom" timestamp="1610531429596">
+ <state width="1031" height="544" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1610594231150" />
+ <state width="1031" height="544" key="GridCell.Tab.2.bottom" timestamp="1610594231150">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="544" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610531429596" />
- <state width="1031" height="544" key="GridCell.Tab.2.center" timestamp="1610531429596">
+ <state width="1031" height="544" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610594231150" />
+ <state width="1031" height="544" key="GridCell.Tab.2.center" timestamp="1610594231150">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="544" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1610531429596" />
- <state width="1031" height="544" key="GridCell.Tab.2.left" timestamp="1610531429596">
+ <state width="1031" height="544" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1610594231150" />
+ <state width="1031" height="544" key="GridCell.Tab.2.left" timestamp="1610594231150">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="544" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1610531429596" />
- <state width="1031" height="544" key="GridCell.Tab.2.right" timestamp="1610531429596">
+ <state width="1031" height="544" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1610594231150" />
+ <state width="1031" height="544" key="GridCell.Tab.2.right" timestamp="1610594231150">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="544" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1610531429596" />
+ <state width="1031" height="544" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1610594231150" />
<state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610072873414">
<screen x="0" y="0" width="1536" height="824" />
</state>
@@ -510,10 +510,10 @@
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1609226181026" />
- <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1610590520513">
+ <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1610592858117">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1610590520513" />
+ <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1610592858117" />
<state width="600" height="428" key="javadoc.popup" timestamp="1610005781618">
<screen x="0" y="0" width="1536" height="824" />
</state>
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() != ""'>" +
+ "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() != ""'>" +
- "AND u.`name` = #{comActEasyPhotoVO.sponsorName} \n" +
- " </if> " +
+ "<if test='comActEasyPhotoVO.handlerName == null or comActEasyPhotoVO.handlerName.trim() == ""'>" +
"left JOIN sys_user su ON p.handler_id = su.user_id \n" +
+ " </if> " +
"<if test='comActEasyPhotoVO.handlerName != null and comActEasyPhotoVO.handlerName.trim() != ""'>" +
- "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() != ""'>" +
+ "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() != ""'>" +
- "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() != ""'>" +
+ "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() != ""'>" +
- "AND u.`name` = #{comActEasyPhotoVO.sponsorName} \n" +
- " </if> " +
+ "<if test='comActEasyPhotoVO.handlerName == null or comActEasyPhotoVO.handlerName.trim() == ""'>" +
"left JOIN sys_user su ON p.handler_id = su.user_id \n" +
+ " </if> " +
"<if test='comActEasyPhotoVO.handlerName != null and comActEasyPhotoVO.handlerName.trim() != ""'>" +
- "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() != ""'>" +
+ "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() != ""'>" +
- "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