From de91c84954157bb9f8b6d938cbe0b1b51fb6e65d Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 07 五月 2021 15:23:57 +0800
Subject: [PATCH] bugfixed：新增便民服务商家 报错

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsHouseDAO.java |   55 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 48 insertions(+), 7 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 2ec69bd..e18010f 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,15 +19,16 @@
  **/
 @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" +
@@ -36,20 +36,61 @@
 			"<if test='pageComOpsHouseDTO.communityId != null '>" +
 			"AND d.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> " +
+			"<if test='pageComOpsHouseDTO.houseType != null '>" +
+			"AND d.house_type=#{pageComOpsHouseDTO.houseType} \n" +
+			" </if> " +
+			"<if test='pageComOpsHouseDTO.rentType != null '>" +
+			"AND d.rent_type=#{pageComOpsHouseDTO.rentType} \n" +
+			" </if> " +
+			"<if test='pageComOpsHouseDTO.brn != null and pageComOpsHouseDTO.brn !=4 '>" +
+			"AND d.brn=#{pageComOpsHouseDTO.brn} \n" +
+			" </if> " +
+			"<if test='pageComOpsHouseDTO.brn != null and pageComOpsHouseDTO.brn ==4 '>" +
+			"AND d.brn <![CDATA[ >= ]]> 4 \n" +
+			" </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" +
 			"AND #{pageComOpsHouseDTO.end} \n" +
 			" </if> " +
-			" order by d.id desc "+
+			" order by " +
+			"<if test='pageComOpsHouseDTO.priceOrder != null and pageComOpsHouseDTO.priceOrder ==1 '>" +
+			"d.amount asc," +
+			" </if> " +
+			"<if test='pageComOpsHouseDTO.priceOrder != null and pageComOpsHouseDTO.priceOrder ==2 '>" +
+			"d.amount desc," +
+			" </if> " +
+			"d.id desc "+
 			"</script>")
 	IPage<ComOpsHouseVO> pageHouse(Page page, @Param("pageComOpsHouseDTO") PageComOpsHouseDTO pageComOpsHouseDTO);
 

--
Gitblit v1.7.1