From a40e6a45b2207a9b172b7687ce6e4fe7da8b9ac6 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 03 十二月 2024 16:46:49 +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/YwProjectServiceImpl.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 50 insertions(+), 2 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..b5dfdb8 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,5 +1,7 @@
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;
@@ -13,11 +15,13 @@
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;
@@ -27,6 +31,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
* 杩愮淮椤圭洰淇℃伅琛⊿ervice瀹炵幇
@@ -38,6 +43,8 @@
@Autowired
private YwProjectMapper ywProjectMapper;
+ @Autowired
+ private AreasService areasService;
@Autowired
private YwFloorMapper ywFloorMapper;
@@ -50,6 +57,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 +78,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 +109,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 +160,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 +204,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
--
Gitblit v1.9.3