From d7dca690cedd12e271f0ee0b9050679d73796f5c Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期一, 06 一月 2025 09:28:10 +0800 Subject: [PATCH] 1 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProjectServiceImpl.java | 78 +++++++++++++++++++++++++++++++++++---- 1 files changed, 70 insertions(+), 8 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProjectServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProjectServiceImpl.java index 47c6138..2e0587a 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProjectServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProjectServiceImpl.java @@ -1,32 +1,40 @@ package com.doumee.service.business.impl; +import com.doumee.core.constants.ResponseStatus; +import com.doumee.core.exception.BusinessException; import com.doumee.core.model.LoginUserInfo; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Constants; +import com.doumee.core.utils.DateUtil; 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.YwRoomMapper; +import com.doumee.dao.business.dto.DataDTO; import com.doumee.dao.business.model.*; import com.doumee.dao.business.vo.CompanyTree; import com.doumee.dao.business.vo.ProjectDataVO; import com.doumee.dao.business.vo.ProjectTree; +import com.doumee.service.business.AreasService; import com.doumee.service.business.YwProjectService; 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 org.apache.commons.lang3.StringUtils; import org.checkerframework.checker.units.qual.A; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Objects; /** * 杩愮淮椤圭洰淇℃伅琛⊿ervice瀹炵幇 @@ -38,6 +46,8 @@ @Autowired private YwProjectMapper ywProjectMapper; + @Autowired + private AreasService areasService; @Autowired private YwFloorMapper ywFloorMapper; @@ -50,6 +60,15 @@ @Override public Integer create(YwProject model) { + if(Objects.isNull(model) + || StringUtils.isBlank(model.getName())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST); + } + if(ywProjectMapper.selectCount(new QueryWrapper<YwProject>().lambda() + .eq(YwProject::getName,model.getName()) + .eq(YwProject::getIsdeleted,Constants.ZERO))>Constants.ZERO){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆�"+model.getName()+"銆戝凡瀛樺湪!"); + } model.setCreator(model.getLoginUserInfo().getId()); model.setIsdeleted(Constants.ZERO); model.setCreateDate(new Date()); @@ -62,6 +81,11 @@ @Override public void deleteById(Integer id, LoginUserInfo user) { + //鏌ヨ椤圭洰涓嬬殑鏁版嵁 + if(ywBuildingMapper.selectCount(new QueryWrapper<YwBuilding>().lambda().eq(YwBuilding::getIsdeleted,Constants.ZERO) + .eq(YwBuilding::getProjectId,id))>Constants.ZERO){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"椤圭洰涓嬪瓨鍦ㄦゼ瀹囨暟鎹�!"); + }; YwProject model = new YwProject(); model.setId(id); model.setEditDate(new Date()); @@ -88,6 +112,17 @@ @Override public void updateById(YwProject model) { + if(Objects.isNull(model) + || Objects.isNull(model.getId()) + || StringUtils.isBlank(model.getName())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST); + } + if(ywProjectMapper.selectCount(new QueryWrapper<YwProject>().lambda() + .eq(YwProject::getName,model.getName()) + .ne(YwProject::getId,model.getId()) + .eq(YwProject::getIsdeleted,Constants.ZERO))>Constants.ZERO){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆�"+model.getName()+"銆戝凡瀛樺湪!"); + } model.setEditDate(new Date()); model.setEditor(model.getLoginUserInfo().getId()); ywProjectMapper.updateById(model); @@ -128,7 +163,8 @@ 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.PROJECT_ID=yw_project.id) as roomNum"+ - ",(select count(1) from yw_room a where a.isdeleted=0 and a.PROJECT_ID=yw_project.id and a.IS_INVESTMENT=1) as roomRentNum"); + ",(select count(1) from yw_room a where a.isdeleted=0 and a.PROJECT_ID=yw_project.id and a.IS_INVESTMENT=1) as roomRentNum," + + "( select ifnull(sum(a.RENT_AREA),0) from yw_room a where a.isdeleted=0 and a.PROJECT_ID=yw_project.id ) as area"); if (pageWrap.getModel().getId() != null) { queryWrapper.lambda().eq(YwProject::getId, pageWrap.getModel().getId()); } @@ -171,7 +207,22 @@ queryWrapper.lambda().eq(YwProject::getAddr, pageWrap.getModel().getAddr()); } queryWrapper.lambda().orderByDesc(YwProject::getCreateDate); - return PageData.from(ywProjectMapper.selectPage(page, queryWrapper)); + PageData<YwProject> data = PageData.from(ywProjectMapper.selectPage(page, queryWrapper)); + if(data!=null && data.getRecords()!=null){ + for(YwProject model :data.getRecords()){ + if(model.getAreaId()!=null){ + Areas a = areasService.findById(model.getAreaId(),Constants.TWO); + if(a != null){ + model.setAreaName(a.getName()); + model.setCityId(a.getCityId()); + model.setCityName(a.getCityName()); + model.setProvinceId(a.getProvinceId()); + model.setProvinceName(a.getProvinceName()); + } + } + } + } + return data; } @Override @@ -182,11 +233,12 @@ @Override - public List<ProjectDataVO> projectTree(){ + public List<ProjectDataVO> projectTree(DataDTO dataDTO){ List<ProjectDataVO> projectDataVOList = new ArrayList<>(); List<YwProject> ywProjectList = ywProjectMapper.selectList(new QueryWrapper<YwProject>().lambda() .eq(YwProject::getIsdeleted,Constants.ZERO) .eq(YwProject::getStatus,Constants.ZERO) + .eq(Objects.nonNull(dataDTO.getProjectId()),YwProject::getId,dataDTO.getProjectId()) .orderByAsc(YwProject::getSortnum) ); for (YwProject ywProject:ywProjectList) { @@ -199,6 +251,7 @@ List<YwBuilding> ywBuildingList = ywBuildingMapper.selectList(new QueryWrapper<YwBuilding>().lambda() .eq(YwBuilding::getIsdeleted,Constants.ZERO) .eq(YwBuilding::getStatus,Constants.ZERO) + .eq(Objects.nonNull(dataDTO.getProjectId()),YwBuilding::getProjectId,dataDTO.getProjectId()) .orderByAsc(YwBuilding::getSortnum) ); @@ -214,6 +267,7 @@ List<YwFloor> ywFloorList = ywFloorMapper.selectList(new QueryWrapper<YwFloor>().lambda() .eq(YwFloor::getIsdeleted,Constants.ZERO) .eq(YwFloor::getStatus,Constants.ZERO) + .eq(Objects.nonNull(dataDTO.getProjectId()),YwFloor::getProjectId,dataDTO.getProjectId()) .orderByAsc(YwFloor::getSortnum) ); @@ -225,19 +279,27 @@ projectDataVOList.add(projectDataVO); } - - List<YwRoom> ywRoomList = ywRoomMapper.selectList(new QueryWrapper<YwRoom>().lambda() .eq(YwRoom::getIsdeleted,Constants.ZERO) .eq(YwRoom::getStatus,Constants.ZERO) - .orderByAsc(YwRoom::getSortnum) + .eq(YwRoom::getIsInvestment,Constants.ONE) + .eq(Objects.nonNull(dataDTO.getProjectId()),YwRoom::getProjectId,dataDTO.getProjectId()) + .apply(Objects.nonNull(dataDTO)&&Objects.nonNull(dataDTO.getStartDate())&&Objects.nonNull(dataDTO.getEndDate())," id not in (" + + " SELECT y2.room_id FROM yw_contract y1 left join yw_contract_room y2 on y1.id = y2.contract_id where 1 = 1 and y1.`STATUS` in( 0,1,2) " + + " and y1.START_DATE < '"+dataDTO.getEndDate()+" 00:00:00' and y1.END_DATE > '"+ dataDTO.getStartDate() +" 00:00:00' " + + " ) ") + .apply(Objects.nonNull(dataDTO)&&Objects.nonNull(dataDTO.getStartDate())&&Objects.nonNull(dataDTO.getEndDate())," id not in (" + + " SELECT y2.room_id FROM yw_contract y1 left join yw_contract_room y2 on y1.id = y2.contract_id where 1 = 1 and y1.`STATUS` = 3 " + + " and y1.START_DATE < '"+dataDTO.getEndDate()+" 00:00:00' and y1.BT_DATE > '"+ dataDTO.getStartDate() +" 00:00:00' " + + " ) ") + .orderByAsc(YwRoom::getRoomNum) ); - for (YwRoom data:ywRoomList) { ProjectDataVO projectDataVO = new ProjectDataVO(); BeanUtils.copyProperties(data,projectDataVO); - projectDataVO.setName(data.getCode()); + projectDataVO.setName(data.getRoomNum()); + projectDataVO.setArea(data.getRentArea().setScale(2, BigDecimal.ROUND_HALF_UP)); projectDataVO.setPId(data.getFloor()); projectDataVO.setLv(Constants.THREE); projectDataVOList.add(projectDataVO); -- Gitblit v1.9.3