From 90bc1a2f92d89ca8a614edb1a7957ed94becd0b7 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 20 十一月 2024 18:31:15 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwBuildingServiceImpl.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwBuildingServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwBuildingServiceImpl.java
index dcd8fa4..3a3071e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwBuildingServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwBuildingServiceImpl.java
@@ -99,6 +99,7 @@
@Override
public List<YwBuilding> findList(YwBuilding ywBuilding) {
+ ywBuilding.setIsdeleted(Constants.ZERO);
QueryWrapper<YwBuilding> wrapper = new QueryWrapper<>(ywBuilding);
return ywBuildingMapper.selectList(wrapper);
}
@@ -108,6 +109,9 @@
IPage<YwBuilding> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
QueryWrapper<YwBuilding> queryWrapper = new QueryWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
+ pageWrap.getModel().setIsdeleted(Constants.ZERO);
+ queryWrapper.select("*,(select count(1) from yw_room a where a.isdeleted=0 and a.BUILDING_ID=yw_building.id) as roomNum"+
+ ",(select count(1) from yw_room a where a.isdeleted=0 and a.BUILDING_ID=yw_building.id and a.IS_INVESTMENT=1) as roomRentNum");
if (pageWrap.getModel().getId() != null) {
queryWrapper.lambda().eq(YwBuilding::getId, pageWrap.getModel().getId());
}
--
Gitblit v1.9.3