From cabbe790ba8b58507a39a007e3bcf273bab1bbe4 Mon Sep 17 00:00:00 2001
From: Null <281575458@qq.com>
Date: 星期三, 17 三月 2021 14:21:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsHouseDAO.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 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..0a65e04 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
@@ -36,6 +36,26 @@
"<if test='pageComOpsHouseDTO.communityId != null '>" +
"AND d.community_id=#{pageComOpsHouseDTO.communityId} \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> " +
@@ -49,7 +69,14 @@
"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