| | |
| | | .leftJoin(YwRoom.class,YwRoom::getId,YwWorkorder::getRoomId) |
| | | .leftJoin(YwFloor.class,YwFloor::getId,YwWorkorder::getFloorId) |
| | | .leftJoin(YwBuilding.class,YwBuilding::getId,YwWorkorder::getBuildingId) |
| | | .leftJoin(YwProject.class,YwProject::getId,YwRoom::getProjectId) |
| | | .leftJoin(YwProject.class,YwProject::getId,YwWorkorder::getProjectId) |
| | | .leftJoin(" company t9 on t9.id = t1.company_id ") |
| | | .eq(YwWorkorder::getId,id); |
| | | YwWorkorder model = ywWorkorderMapper.selectJoinOne(YwWorkorder.class,queryWrapper); |
| | |
| | | queryWrapper.orderByAsc(sortData.getProperty()); |
| | | } |
| | | } |
| | | if(StringUtils.isNotBlank(pageWrap.getModel().getBuildingName())){ |
| | | queryWrapper.and(rw ->{ |
| | | rw.like(YwBuilding::getName,pageWrap.getModel().getBuildingName()).or() |
| | | .like(YwRoom::getName,pageWrap.getModel().getBuildingName()); |
| | | }); |
| | | } |
| | | queryWrapper.ge(Objects.nonNull(pageWrap.getModel().getQueryStartTime()), YwWorkorder::getCreateDate, pageWrap.getModel().getQueryStartTime()) |
| | | .le(Objects.nonNull(pageWrap.getModel().getQueryEndTime()), YwWorkorder::getCreateDate, pageWrap.getModel().getQueryEndTime()); |
| | | queryWrapper.orderByDesc(YwContract::getCreateDate ); |
| | | return PageData.from(ywWorkorderMapper.selectPage(page, queryWrapper)); |
| | | |
| | | PageData<YwWorkorder> result = PageData.from(ywWorkorderMapper.selectPage(page, queryWrapper)); |
| | | if(result!=null && result.getRecords()!=null){ |
| | | for(YwWorkorder m : result.getRecords()){ |
| | | if(Constants.equalsInteger(m.getAreaType(),Constants.ZERO)){ |
| | | //0室内维修 |
| | | m.setAreaNameInfo(StringUtils.defaultString(m.getBuildingName(),"")+"/"+StringUtils.defaultString(m.getRoomNum(),"")); |
| | | }else{ |
| | | m.setAreaNameInfo(StringUtils.defaultString(m.getBuildingName(),"")+"/"+StringUtils.defaultString(m.getFloorName(),"")); |
| | | } |
| | | } |
| | | } |
| | | return result; |
| | | } |
| | | |
| | | @Override |