bug修复

zhongrj

2023-12-29 a529164b6a9bbc8e456387ba3b3f76323f9b0208

bug修复

 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')&lt;= #{checkInRecords.endTime}
            </if>
            order by jcir.create_time desc

        </where>
        order by jcir.create_time desc

    </select>


 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

 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);
    }