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/ComOpsHouseDAO.java |   33 ++++++++++++++++++++++++---------
 1 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsHouseDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsHouseDAO.java
index 0a65e04..feff5a7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsHouseDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsHouseDAO.java
@@ -6,7 +6,6 @@
 import com.panzhihua.common.model.dtos.community.PageComOpsHouseDTO;
 import com.panzhihua.common.model.vos.LoginUserInfoVO;
 import com.panzhihua.common.model.vos.community.ComOpsHouseVO;
-import com.panzhihua.common.model.vos.community.ComActVO;
 import com.panzhihua.service_community.model.dos.ComOpsHouseDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -20,24 +19,29 @@
  **/
 @Mapper
 public interface ComOpsHouseDAO extends BaseMapper<ComOpsHouseDO> {
-	@Select("select name,address from com_act where community_id=#{communityId}")
-	ComActVO selectCommunity(Long communityId);
 
 	@Select("select type,name,phone,image_url from sys_user where user_id=#{userId}")
 	LoginUserInfoVO selectUserByUserId(Long userId);
 
+	@Select("select user_id from sys_user where name like concat('%',#{name},'%')  limit 1")
+	Long selectUserIdByName(String name);
+
 	@Select("<script> " +
 			"SELECT d.*,\n" +
-			"u.name userName\n" +
+			"u.name userName,u.type as userType\n" +
 			"FROM\n" +
 			"com_ops_house d\n" +
-			"JOIN sys_user u ON d.user_id = u.user_id\n" +
+			" LEFT JOIN sys_user u ON d.user_id = u.user_id\n" +
+			" LEFT JOIN com_mng_struct_area sa ON d.house_community_id = sa.id \n" +
 			"where 1=1 " +
 			"<if test='pageComOpsHouseDTO.communityId != null '>" +
-			"AND d.community_id=#{pageComOpsHouseDTO.communityId} \n" +
+			"AND ( d.community_id=#{pageComOpsHouseDTO.communityId} or sa.community_id=#{pageComOpsHouseDTO.communityId} )\n" +
 			" </if> " +
 
 
+			"<if test='pageComOpsHouseDTO.userId != null '>" +
+			"AND d.user_id=#{pageComOpsHouseDTO.userId} \n" +
+			" </if> " +
 			"<if test='pageComOpsHouseDTO.orient != null '>" +
 			"AND d.orient=#{pageComOpsHouseDTO.orient} \n" +
 			" </if> " +
@@ -55,15 +59,26 @@
 			" </if> " +
 
 
-
 			"<if test='pageComOpsHouseDTO.houseCommunityId != null '>" +
 			"AND d.house_community_id=#{pageComOpsHouseDTO.houseCommunityId} \n" +
 			" </if> " +
-			"<if test='pageComOpsHouseDTO.status != null '>" +
+			"<if test='pageComOpsHouseDTO.status != null and pageComOpsHouseDTO.status &lt; 4 '>" +
 			"AND d.status=#{pageComOpsHouseDTO.status} \n" +
 			" </if> " +
+			"<if test='pageComOpsHouseDTO.status != null and pageComOpsHouseDTO.status ==4 '>" +
+			"AND d.status in (0,2) \n" +
+			" </if> " +
+			"<if test='pageComOpsHouseDTO.status != null and pageComOpsHouseDTO.status ==5 '>" +
+			"AND d.status in (1,3) \n" +
+			" </if> " +
 			"<if test='pageComOpsHouseDTO.houseCommunityName != null and pageComOpsHouseDTO.houseCommunityName.trim() != &quot;&quot;'>" +
-			" and d.`house_community_name` LIKE concat( #{pageComOpsHouseDTO.houseCommunityName}, '%' ) \n" +
+			" and (" +
+				" d.`house_community_name` LIKE concat( '%', #{pageComOpsHouseDTO.houseCommunityName}, '%' ) " +
+				" or d.title like concat( '%', #{pageComOpsHouseDTO.houseCommunityName}, '%' ) " +
+			"    )  \n" +
+			" </if> " +
+			"<if test='pageComOpsHouseDTO.mobile != null and pageComOpsHouseDTO.mobile.trim() != &quot;&quot;'>" +
+			" and d.`mobile` LIKE concat( #{pageComOpsHouseDTO.mobile}, '%' ) \n" +
 			" </if> " +
 			"<if test='pageComOpsHouseDTO.begin != null '>" +
 			"AND d.create_at BETWEEN #{pageComOpsHouseDTO.begin} \n" +

--
Gitblit v1.7.1