From a529164b6a9bbc8e456387ba3b3f76323f9b0208 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 29 Dec 2023 09:46:48 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java | 17 ++++++++---------
src/main/java/org/springblade/modules/checkInRecords/mapper/CheckInRecordsMapper.xml | 3 ++-
src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml | 3 ++-
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/springblade/modules/checkInRecords/mapper/CheckInRecordsMapper.xml b/src/main/java/org/springblade/modules/checkInRecords/mapper/CheckInRecordsMapper.xml
index 9cea11c..c7f5d51 100644
--- a/src/main/java/org/springblade/modules/checkInRecords/mapper/CheckInRecordsMapper.xml
+++ b/src/main/java/org/springblade/modules/checkInRecords/mapper/CheckInRecordsMapper.xml
@@ -41,8 +41,9 @@
<if test="checkInRecords.endTime!=null and checkInRecords.endTime!=''">
AND date_format(jcir.create_time,'%Y-%m-%d')<= #{checkInRecords.endTime}
</if>
- order by jcir.create_time desc
+
</where>
+ order by jcir.create_time desc
</select>
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
index a12938a..fd70ca7 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
@@ -134,7 +134,8 @@
select
jh.*,
concat(jh.building," ",jh.unit," ",jh.room) as address,
- br.town_name as townStreetName,br.name as neiName
+ br.town_name as townStreetName,br.name as neiName,
+ jg.grid_name
from jczz_house jh
left join jczz_grid_range jgr on jgr.house_code = jh.house_code
left join jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
index 292bda7..fcd5ae3 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
@@ -31,7 +31,6 @@
import org.springblade.modules.grid.entity.GridRangeEntity;
import org.springblade.modules.grid.service.IGridRangeService;
import org.springblade.modules.grid.service.IGridService;
-import org.springblade.modules.grid.vo.GridVO;
import org.springblade.modules.house.entity.HouseEntity;
import org.springblade.modules.house.entity.HouseholdEntity;
import org.springblade.modules.house.entity.UserHouseLabelEntity;
@@ -85,18 +84,18 @@
@Override
public IPage<HouseVO> selectHousePage(IPage<HouseVO> page, HouseVO house) {
Dept dept = deptService.getById(AuthUtil.getDeptId());
- if (null!=dept){
+ if (null != dept) {
house.setRegionCode(dept.getRegionCode());
}
List<HouseVO> houseVOS = baseMapper.selectHousePage(page, house);
// 遍历查询网格
- for (HouseVO houseVO : houseVOS) {
- // 设置对应的网格名称
- GridVO gridVO = gridService.getGridDetailByHouseCode(houseVO.getHouseCode());
- if (null!= gridVO){
- houseVO.setGridName(gridVO.getGridName());
- }
- }
+// for (HouseVO houseVO : houseVOS) {
+// // 设置对应的网格名称
+// GridVO gridVO = gridService.getGridDetailByHouseCode(houseVO.getHouseCode());
+// if (null!= gridVO){
+// houseVO.setGridName(gridVO.getGridName());
+// }
+// }
return page.setRecords(houseVOS);
}
--
Gitblit v1.9.3