From 553dcb863f321e42e64c6c3e3ad565849b5ac5e1 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 26 十一月 2024 17:07:33 +0800
Subject: [PATCH] 开发更新
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProjectServiceImpl.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 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..7c9d35f 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
@@ -13,6 +13,7 @@
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;
@@ -38,6 +39,8 @@
@Autowired
private YwProjectMapper ywProjectMapper;
+ @Autowired
+ private AreasService areasService;
@Autowired
private YwFloorMapper ywFloorMapper;
@@ -171,7 +174,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