白蚁-防治点-防治部位
parent
063acde4fe
commit
b7fff4283c
|
|
@ -14,8 +14,10 @@ public class PrePlacePageSo {
|
||||||
@Schema(description = "分页参数")
|
@Schema(description = "分页参数")
|
||||||
private PageSo pageSo;
|
private PageSo pageSo;
|
||||||
|
|
||||||
private String preId;
|
|
||||||
|
|
||||||
private String preName;
|
private String preName;
|
||||||
|
|
||||||
|
private String preDetailName;
|
||||||
|
|
||||||
|
private String preId;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@ public class PrePlaceDetailService extends ServiceImpl<PrePlaceDetailMapper, Pre
|
||||||
|
|
||||||
public Page<PrePlaceDetail> pageQuery(PrePlacePageSo pageSo) {
|
public Page<PrePlaceDetail> pageQuery(PrePlacePageSo pageSo) {
|
||||||
if(StringUtils.isBlank(pageSo.getPreId())) {
|
if(StringUtils.isBlank(pageSo.getPreId())) {
|
||||||
throw new RuntimeException("请选择防治点");
|
throw new IllegalArgumentException("请选择防治点");
|
||||||
}
|
}
|
||||||
LambdaQueryWrapper<PrePlaceDetail> query = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<PrePlaceDetail> query = new LambdaQueryWrapper<>();
|
||||||
query.eq(PrePlaceDetail::getPreId, pageSo.getPreId());
|
query.eq(PrePlaceDetail::getPreId, pageSo.getPreId());
|
||||||
|
|
|
||||||
|
|
@ -42,8 +42,8 @@ public class PrePlaceService extends ServiceImpl<PrePlaceMapper, PrePlace> {
|
||||||
|
|
||||||
public List<PrePlace> tree(PrePlacePageSo dto) {
|
public List<PrePlace> tree(PrePlacePageSo dto) {
|
||||||
LambdaQueryWrapper<PrePlace> wrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<PrePlace> wrapper = new LambdaQueryWrapper<>();
|
||||||
if(!StringUtils.isBlank(dto.getPreId())){
|
if(!StringUtils.isBlank(dto.getPreName())){
|
||||||
wrapper.eq(PrePlace::getId, dto.getPreId());
|
wrapper.like(PrePlace::getId, dto.getPreName());
|
||||||
}
|
}
|
||||||
List<PrePlace> prePlaces = prePlaceMapper.selectList(wrapper);
|
List<PrePlace> prePlaces = prePlaceMapper.selectList(wrapper);
|
||||||
Iterator<PrePlace> iterator = prePlaces.iterator();
|
Iterator<PrePlace> iterator = prePlaces.iterator();
|
||||||
|
|
@ -51,7 +51,7 @@ public class PrePlaceService extends ServiceImpl<PrePlaceMapper, PrePlace> {
|
||||||
PrePlace prePlace = iterator.next();
|
PrePlace prePlace = iterator.next();
|
||||||
LambdaQueryWrapper<PrePlaceDetail> queryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<PrePlaceDetail> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
if(!StringUtils.isBlank(dto.getPreName())){
|
if(!StringUtils.isBlank(dto.getPreName())){
|
||||||
queryWrapper.like(PrePlaceDetail::getDetailName, dto.getPreName());
|
queryWrapper.like(PrePlaceDetail::getDetailName, dto.getPreDetailName());
|
||||||
}
|
}
|
||||||
queryWrapper.eq(PrePlaceDetail::getPreId, prePlace.getId());
|
queryWrapper.eq(PrePlaceDetail::getPreId, prePlace.getId());
|
||||||
List<PrePlaceDetail> prePlaceDetails = prePlaceDetailMapper.selectList(queryWrapper);
|
List<PrePlaceDetail> prePlaceDetails = prePlaceDetailMapper.selectList(queryWrapper);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue