From 02f8fa00344f77c121fcad5ead5ca97dd390a4f8 Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 26 十一月 2024 16:29:05 +0800
Subject: [PATCH] 客户资料 巡检任务业务
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProjectServiceImpl.java | 107 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 98 insertions(+), 9 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 4634b2e..47c6138 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
@@ -5,18 +5,26 @@
import com.doumee.core.model.PageWrap;
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.Company;
-import com.doumee.dao.business.model.YwProject;
+import com.doumee.dao.business.YwRoomMapper;
+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.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.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.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -30,6 +38,15 @@
@Autowired
private YwProjectMapper ywProjectMapper;
+
+ @Autowired
+ private YwFloorMapper ywFloorMapper;
+
+ @Autowired
+ private YwRoomMapper ywRoomMapper;
+
+ @Autowired
+ private YwBuildingMapper ywBuildingMapper;
@Override
public Integer create(YwProject model) {
@@ -99,6 +116,7 @@
@Override
public List<YwProject> findList(YwProject ywProject) {
+ ywProject.setIsdeleted(Constants.ZERO);
QueryWrapper<YwProject> wrapper = new QueryWrapper<>(ywProject);
return ywProjectMapper.selectList(wrapper);
}
@@ -108,6 +126,9 @@
IPage<YwProject> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
QueryWrapper<YwProject> 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.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");
if (pageWrap.getModel().getId() != null) {
queryWrapper.lambda().eq(YwProject::getId, pageWrap.getModel().getId());
}
@@ -149,13 +170,7 @@
if (pageWrap.getModel().getAddr() != null) {
queryWrapper.lambda().eq(YwProject::getAddr, pageWrap.getModel().getAddr());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
+ queryWrapper.lambda().orderByDesc(YwProject::getCreateDate);
return PageData.from(ywProjectMapper.selectPage(page, queryWrapper));
}
@@ -164,4 +179,78 @@
QueryWrapper<YwProject> wrapper = new QueryWrapper<>(ywProject);
return ywProjectMapper.selectCount(wrapper);
}
+
+
+ @Override
+ public List<ProjectDataVO> projectTree(){
+ List<ProjectDataVO> projectDataVOList = new ArrayList<>();
+ List<YwProject> ywProjectList = ywProjectMapper.selectList(new QueryWrapper<YwProject>().lambda()
+ .eq(YwProject::getIsdeleted,Constants.ZERO)
+ .eq(YwProject::getStatus,Constants.ZERO)
+ .orderByAsc(YwProject::getSortnum)
+ );
+ for (YwProject ywProject:ywProjectList) {
+ ProjectDataVO projectDataVO = new ProjectDataVO();
+ BeanUtils.copyProperties(ywProject,projectDataVO);
+ projectDataVO.setLv(Constants.ZERO);
+ projectDataVOList.add(projectDataVO);
+ }
+
+ List<YwBuilding> ywBuildingList = ywBuildingMapper.selectList(new QueryWrapper<YwBuilding>().lambda()
+ .eq(YwBuilding::getIsdeleted,Constants.ZERO)
+ .eq(YwBuilding::getStatus,Constants.ZERO)
+ .orderByAsc(YwBuilding::getSortnum)
+ );
+
+ for (YwBuilding data:ywBuildingList) {
+ ProjectDataVO projectDataVO = new ProjectDataVO();
+ BeanUtils.copyProperties(data,projectDataVO);
+ projectDataVO.setPId(data.getProjectId());
+ projectDataVO.setLv(Constants.ONE);
+ projectDataVOList.add(projectDataVO);
+ }
+
+
+ List<YwFloor> ywFloorList = ywFloorMapper.selectList(new QueryWrapper<YwFloor>().lambda()
+ .eq(YwFloor::getIsdeleted,Constants.ZERO)
+ .eq(YwFloor::getStatus,Constants.ZERO)
+ .orderByAsc(YwFloor::getSortnum)
+ );
+
+ for (YwFloor data:ywFloorList) {
+ ProjectDataVO projectDataVO = new ProjectDataVO();
+ BeanUtils.copyProperties(data,projectDataVO);
+ projectDataVO.setPId(data.getBuildingId());
+ projectDataVO.setLv(Constants.TWO);
+ 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)
+ );
+
+
+ for (YwRoom data:ywRoomList) {
+ ProjectDataVO projectDataVO = new ProjectDataVO();
+ BeanUtils.copyProperties(data,projectDataVO);
+ projectDataVO.setName(data.getCode());
+ projectDataVO.setPId(data.getFloor());
+ projectDataVO.setLv(Constants.THREE);
+ projectDataVOList.add(projectDataVO);
+ }
+
+ ProjectTree treeBuild = new ProjectTree(projectDataVOList);
+ projectDataVOList = treeBuild.buildTree();
+ return projectDataVOList;
+
+ }
+
+
+
+
+
}
--
Gitblit v1.9.3