|
@@ -3,8 +3,8 @@ package com.ruoyi.gas.service.impl;
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
|
|
|
-import com.ruoyi.common.core.page.PagePlus;
|
|
|
import com.ruoyi.common.core.page.TableDataInfo;
|
|
|
import com.ruoyi.common.utils.PageUtils;
|
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
@@ -12,6 +12,7 @@ import com.ruoyi.gas.domain.GValveWellInspection;
|
|
|
import com.ruoyi.gas.domain.bo.GValveWellInspectionBo;
|
|
|
import com.ruoyi.gas.domain.bo.GValveWellInspectionPhotoBo;
|
|
|
import com.ruoyi.gas.domain.vo.GValveWellInspectionVo;
|
|
|
+import com.ruoyi.gas.domain.vo.GValveWellInspectionVos;
|
|
|
import com.ruoyi.gas.mapper.GValveWellInspectionMapper;
|
|
|
import com.ruoyi.gas.mapper.GValveWellPositionMapper;
|
|
|
import com.ruoyi.gas.service.IGValveWellInspectionPhotoService;
|
|
@@ -46,15 +47,12 @@ public class GValveWellInspectionServiceImpl extends ServicePlusImpl<GValveWellI
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public TableDataInfo<GValveWellInspectionVo> queryPageList(GValveWellInspectionBo bo) {
|
|
|
- PagePlus<GValveWellInspection, GValveWellInspectionVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
|
|
|
- TableDataInfo<GValveWellInspectionVo> tableDataInfo = PageUtils.buildDataInfo(result);
|
|
|
- tableDataInfo.getRows().forEach(item -> {
|
|
|
- item.setCreateByName(baseMapper.getName(item.getCreateBy()));
|
|
|
- item.setPhotoList(baseMapper.getPhoto(item.getId()));
|
|
|
- item.setPosition(positionMapper.selectById(item.getPositionId()));
|
|
|
- });
|
|
|
- return tableDataInfo;
|
|
|
+ public TableDataInfo<GValveWellInspectionVos> queryPageList(GValveWellInspectionBo bo) {
|
|
|
+ Page<GValveWellInspectionVos> page = new Page<>(bo.getPageNum(), bo.getPageSize());
|
|
|
+ Page<GValveWellInspectionVos> list = baseMapper.getList(bo, page);
|
|
|
+ list.getRecords().forEach(item -> item.setPhotoList(baseMapper.getPhoto(item.getId())));
|
|
|
+ return PageUtils.buildDataInfo(list);
|
|
|
+
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -66,6 +64,7 @@ public class GValveWellInspectionServiceImpl extends ServicePlusImpl<GValveWellI
|
|
|
Map<String, Object> params = bo.getParams();
|
|
|
LambdaQueryWrapper<GValveWellInspection> lqw = Wrappers.lambdaQuery();
|
|
|
lqw.eq(bo.getPositionId() != null, GValveWellInspection::getPositionId, bo.getPositionId());
|
|
|
+ lqw.eq(bo.getValveWellName() != null, GValveWellInspection::getPositionId, bo.getValveWellName());
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getDiscoverProblems()), GValveWellInspection::getDiscoverProblems, bo.getDiscoverProblems());
|
|
|
lqw.eq(bo.getDiscoverTime() != null, GValveWellInspection::getDiscoverTime, bo.getDiscoverTime());
|
|
|
return lqw;
|