From 35ed9cd31d7b675082425361a9f08bec40aa1292 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 03 十二月 2024 18:23:01 +0800
Subject: [PATCH] ll
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwBuildingServiceImpl.java | 76 +++++++++++++++++++++++++-------------
1 files changed, 50 insertions(+), 26 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 0c13b18..612f09e 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
@@ -8,14 +8,17 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.YwBuildingMapper;
+import com.doumee.dao.business.YwFloorMapper;
import com.doumee.dao.business.YwProjectMapper;
import com.doumee.dao.business.model.YwBuilding;
+import com.doumee.dao.business.model.YwFloor;
import com.doumee.dao.business.model.YwProject;
import com.doumee.service.business.YwBuildingService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -35,6 +38,8 @@
private YwBuildingMapper ywBuildingMapper;
@Autowired
private YwProjectMapper ywProjectMapper;
+ @Autowired
+ private YwFloorMapper ywFloorMapper;
@Override
public Integer create(YwBuilding model) {
@@ -57,6 +62,12 @@
@Override
public void deleteById(Integer id, LoginUserInfo user) {
+ //鏌ヨ妤煎畤涓嬬殑鏁版嵁
+ if(ywFloorMapper.selectCount(new QueryWrapper<YwFloor>().lambda().eq(YwFloor::getIsdeleted,Constants.ZERO)
+ .eq(YwFloor::getBuildingId,id))>Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"妤煎畤涓瓨鍦ㄦゼ灞傛暟鎹�!");
+ };
+
YwBuilding model = new YwBuilding();
model.setId(id);
model.setEditDate(new Date());
@@ -100,7 +111,17 @@
@Override
public YwBuilding findById(Integer id) {
- return ywBuildingMapper.selectById(id);
+
+
+ MPJLambdaWrapper<YwBuilding> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAll(YwBuilding.class )
+ .selectAs(YwProject::getName,YwBuilding::getProjectName)
+ .leftJoin(YwProject.class,YwProject::getId,YwBuilding::getProjectId)
+ .eq(YwBuilding::getId,id)
+ .last(" limit 1 ")
+ ;
+
+ return ywBuildingMapper.selectJoinOne(YwBuilding.class, queryWrapper);
}
@Override
@@ -119,69 +140,72 @@
@Override
public PageData<YwBuilding> findPage(PageWrap<YwBuilding> pageWrap) {
IPage<YwBuilding> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<YwBuilding> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<YwBuilding> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAll(YwBuilding.class )
+ .selectAs(YwProject::getName,YwBuilding::getProjectName)
+ .leftJoin(YwProject.class,YwProject::getId,YwBuilding::getProjectId);
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");
+ queryWrapper.select(" (select count(1) from yw_room a where a.isdeleted=0 and a.BUILDING_ID=t.id) as roomNum "+
+ ",(select count(1) from yw_room a where a.isdeleted=0 and a.BUILDING_ID=t.id and a.IS_INVESTMENT=1) as roomRentNum");
if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(YwBuilding::getId, pageWrap.getModel().getId());
+ queryWrapper.eq(YwBuilding::getId, pageWrap.getModel().getId());
}
if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(YwBuilding::getCreator, pageWrap.getModel().getCreator());
+ queryWrapper.eq(YwBuilding::getCreator, pageWrap.getModel().getCreator());
}
if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(YwBuilding::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(YwBuilding::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+ queryWrapper.ge(YwBuilding::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+ queryWrapper.le(YwBuilding::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
}
if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(YwBuilding::getEditor, pageWrap.getModel().getEditor());
+ queryWrapper.eq(YwBuilding::getEditor, pageWrap.getModel().getEditor());
}
if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(YwBuilding::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(YwBuilding::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+ queryWrapper.ge(YwBuilding::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+ queryWrapper.le(YwBuilding::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
}
if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(YwBuilding::getIsdeleted, pageWrap.getModel().getIsdeleted());
+ queryWrapper.eq(YwBuilding::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(YwBuilding::getName, pageWrap.getModel().getName());
+ queryWrapper.eq(YwBuilding::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(YwBuilding::getRemark, pageWrap.getModel().getRemark());
+ queryWrapper.eq(YwBuilding::getRemark, pageWrap.getModel().getRemark());
}
if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(YwBuilding::getStatus, pageWrap.getModel().getStatus());
+ queryWrapper.eq(YwBuilding::getStatus, pageWrap.getModel().getStatus());
}
if (pageWrap.getModel().getSortnum() != null) {
- queryWrapper.lambda().eq(YwBuilding::getSortnum, pageWrap.getModel().getSortnum());
+ queryWrapper.eq(YwBuilding::getSortnum, pageWrap.getModel().getSortnum());
}
if (pageWrap.getModel().getImgurl() != null) {
- queryWrapper.lambda().eq(YwBuilding::getImgurl, pageWrap.getModel().getImgurl());
+ queryWrapper.eq(YwBuilding::getImgurl, pageWrap.getModel().getImgurl());
}
if (pageWrap.getModel().getCode() != null) {
- queryWrapper.lambda().eq(YwBuilding::getCode, pageWrap.getModel().getCode());
+ queryWrapper.eq(YwBuilding::getCode, pageWrap.getModel().getCode());
}
if (pageWrap.getModel().getAddr() != null) {
- queryWrapper.lambda().eq(YwBuilding::getAddr, pageWrap.getModel().getAddr());
+ queryWrapper.eq(YwBuilding::getAddr, pageWrap.getModel().getAddr());
}
if (pageWrap.getModel().getArea() != null) {
- queryWrapper.lambda().eq(YwBuilding::getArea, pageWrap.getModel().getArea());
+ queryWrapper.eq(YwBuilding::getArea, pageWrap.getModel().getArea());
}
if (pageWrap.getModel().getCqArea() != null) {
- queryWrapper.lambda().eq(YwBuilding::getCqArea, pageWrap.getModel().getCqArea());
+ queryWrapper.eq(YwBuilding::getCqArea, pageWrap.getModel().getCqArea());
}
if (pageWrap.getModel().getRentArea() != null) {
- queryWrapper.lambda().eq(YwBuilding::getRentArea, pageWrap.getModel().getRentArea());
+ queryWrapper.eq(YwBuilding::getRentArea, pageWrap.getModel().getRentArea());
}
if (pageWrap.getModel().getOnFloor() != null) {
- queryWrapper.lambda().eq(YwBuilding::getOnFloor, pageWrap.getModel().getOnFloor());
+ queryWrapper.eq(YwBuilding::getOnFloor, pageWrap.getModel().getOnFloor());
}
if (pageWrap.getModel().getUnderFloor() != null) {
- queryWrapper.lambda().eq(YwBuilding::getUnderFloor, pageWrap.getModel().getUnderFloor());
+ queryWrapper.eq(YwBuilding::getUnderFloor, pageWrap.getModel().getUnderFloor());
}
if (pageWrap.getModel().getProjectId() != null) {
- queryWrapper.lambda().eq(YwBuilding::getProjectId, pageWrap.getModel().getProjectId());
+ queryWrapper.eq(YwBuilding::getProjectId, pageWrap.getModel().getProjectId());
}
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
@@ -190,7 +214,7 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
- return PageData.from(ywBuildingMapper.selectPage(page, queryWrapper));
+ return PageData.from(ywBuildingMapper.selectJoinPage(page,YwBuilding.class, queryWrapper));
}
@Override
--
Gitblit v1.9.3