|
@@ -159,7 +159,19 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringCivil::getEnginType, bo.getEnginType());
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringCivil::getEnginClassification, bo.getEnginClassification());
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getEnginCycle()), ZEngineeringCivil::getEnginCycle, bo.getEnginCycle());
|
|
|
+ lqw.eq(StringUtils.isNotBlank(bo.getAreaId()), ZEngineeringCivil::getAreaId, bo.getAreaId());
|
|
|
+ lqw.eq(StringUtils.isNotBlank(bo.getBuildingId()), ZEngineeringCivil::getBuildingId, bo.getBuildingId());
|
|
|
+ lqw.eq(StringUtils.isNotBlank(bo.getUnitId()), ZEngineeringCivil::getUnitId, bo.getUnitId());
|
|
|
+ lqw.eq(StringUtils.isNotBlank(bo.getDistrict()), ZEngineeringCivil::getDistrict, bo.getDistrict());
|
|
|
lqw.last("limit "+(pageQuery.getPageNum() - 1)+","+(pageQuery.getPageNum()*pageQuery.getPageSize()));
|
|
|
+ LambdaQueryWrapper<ZEngineeringCivil> lqw2 = Wrappers.lambdaQuery();
|
|
|
+ lqw2.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringCivil::getEnginType, bo.getEnginType());
|
|
|
+ lqw2.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringCivil::getEnginClassification, bo.getEnginClassification());
|
|
|
+ lqw2.eq(StringUtils.isNotBlank(bo.getEnginCycle()), ZEngineeringCivil::getEnginCycle, bo.getEnginCycle());
|
|
|
+ lqw2.eq(StringUtils.isNotBlank(bo.getAreaId()), ZEngineeringCivil::getAreaId, bo.getAreaId());
|
|
|
+ lqw2.eq(StringUtils.isNotBlank(bo.getBuildingId()), ZEngineeringCivil::getBuildingId, bo.getBuildingId());
|
|
|
+ lqw2.eq(StringUtils.isNotBlank(bo.getUnitId()), ZEngineeringCivil::getUnitId, bo.getUnitId());
|
|
|
+ lqw2.eq(StringUtils.isNotBlank(bo.getDistrict()), ZEngineeringCivil::getDistrict, bo.getDistrict());
|
|
|
Page<ZEngineeringCivilVo> result=new Page<>();
|
|
|
if (!"".equals(bo.getType())&&!ObjectUtils.isEmpty(bo.getType()))
|
|
|
{
|
|
@@ -169,14 +181,15 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
|
|
|
{
|
|
|
return TableDataInfo.build(result);
|
|
|
}
|
|
|
- result = baseMapper.queryPageIdList(IDList, IDList.size(), page,pageQuery.getPageNum() - 1, pageQuery.getPageSize());
|
|
|
+ result = baseMapper.queryPageIdList(IDList, baseMapper.selectCount(lqw2), page,pageQuery.getPageNum() - 1, pageQuery.getPageSize());
|
|
|
Map<String,Object> ReviewList=zEngineeringNodeService.ReViewList(result.getRecords());
|
|
|
result.getRecords().forEach(item->{
|
|
|
item.setNodeReViewStateList(ReviewList.get(item.getId()));
|
|
|
});
|
|
|
+ page.setTotal(!ObjectUtils.isEmpty(result.getRecords()) ? result.getRecords().get(0).getTotal() : 0);
|
|
|
return TableDataInfo.build(result);
|
|
|
}
|
|
|
- result = baseMapper.queryPageList(bo, page, pageQuery.getPageNum() - 1, pageQuery.getPageSize());
|
|
|
+ result = baseMapper.queryPageList(bo, page, (pageQuery.getPageNum()-1)*pageQuery.getPageSize() , pageQuery.getPageSize());
|
|
|
Map<String,Object> ReviewList=zEngineeringNodeService.ReViewList(result.getRecords());
|
|
|
result.getRecords().forEach(item->{
|
|
|
item.setNodeReViewStateList(ReviewList.get(item.getId()));
|