|
|
@@ -59,7 +59,7 @@ public class SysGeographyPositionServiceImpl extends ServiceImpl<SysGeographyPos
|
|
|
.eq(StringUtils.isNotEmpty(sysGeographyPositionDto.getDistrict()), SysGeographyPosition::getDistrict, sysGeographyPositionDto.getDistrict())
|
|
|
.in(SysGeographyPosition::getSource, Arrays.asList("1", "2"))
|
|
|
.eq(StringUtils.isNotEmpty(sysGeographyPositionDto.getSource()), SysGeographyPosition::getSource, sysGeographyPositionDto.getSource())
|
|
|
- .eq(sysGeographyPositionDto.getSource() != null, SysGeographyPosition::getStatus, sysGeographyPositionDto.getStatus())
|
|
|
+ .eq(sysGeographyPositionDto.getStatus() != null, SysGeographyPosition::getStatus, sysGeographyPositionDto.getStatus())
|
|
|
.orderByDesc(SysGeographyPosition::getCreateTime));
|
|
|
if (list.size() == 0) return new SysGeographyPositionVo();
|
|
|
|
|
|
@@ -107,26 +107,26 @@ public class SysGeographyPositionServiceImpl extends ServiceImpl<SysGeographyPos
|
|
|
.eq(StringUtils.isNotEmpty(sysGeographyPositionDto.getCity()), SysGeographyPosition::getCity, sysGeographyPositionDto.getCity())
|
|
|
.eq(StringUtils.isNotEmpty(sysGeographyPositionDto.getDistrict()), SysGeographyPosition::getDistrict, sysGeographyPositionDto.getDistrict())
|
|
|
.in(SysGeographyPosition::getSource, Arrays.asList("1", "2"))
|
|
|
- .eq(sysGeographyPositionDto.getSource() != null, SysGeographyPosition::getStatus, sysGeographyPositionDto.getStatus()));
|
|
|
+ .eq(sysGeographyPositionDto.getStatus() != null, SysGeographyPosition::getStatus, sysGeographyPositionDto.getStatus()));
|
|
|
Long channelNum = sysGeographyPositionMapper.selectCount(new LambdaQueryWrapper<SysGeographyPosition>()
|
|
|
.eq(StringUtils.isNotEmpty(sysGeographyPositionDto.getProvince()), SysGeographyPosition::getProvince, sysGeographyPositionDto.getProvince())
|
|
|
.eq(StringUtils.isNotEmpty(sysGeographyPositionDto.getCity()), SysGeographyPosition::getCity, sysGeographyPositionDto.getCity())
|
|
|
.eq(StringUtils.isNotEmpty(sysGeographyPositionDto.getDistrict()), SysGeographyPosition::getDistrict, sysGeographyPositionDto.getDistrict())
|
|
|
.eq(SysGeographyPosition::getSource, 1)
|
|
|
- .eq(sysGeographyPositionDto.getSource() != null, SysGeographyPosition::getStatus, sysGeographyPositionDto.getStatus()));
|
|
|
+ .eq(sysGeographyPositionDto.getStatus() != null, SysGeographyPosition::getStatus, sysGeographyPositionDto.getStatus()));
|
|
|
Long proxyNum = sysGeographyPositionMapper.selectCount(new LambdaQueryWrapper<SysGeographyPosition>()
|
|
|
.eq(StringUtils.isNotEmpty(sysGeographyPositionDto.getProvince()), SysGeographyPosition::getProvince, sysGeographyPositionDto.getProvince())
|
|
|
.eq(StringUtils.isNotEmpty(sysGeographyPositionDto.getCity()), SysGeographyPosition::getCity, sysGeographyPositionDto.getCity())
|
|
|
.eq(StringUtils.isNotEmpty(sysGeographyPositionDto.getDistrict()), SysGeographyPosition::getDistrict, sysGeographyPositionDto.getDistrict())
|
|
|
.eq(SysGeographyPosition::getSource, 2)
|
|
|
- .eq(sysGeographyPositionDto.getSource() != null, SysGeographyPosition::getStatus, sysGeographyPositionDto.getStatus()));
|
|
|
+ .eq(sysGeographyPositionDto.getStatus() != null, SysGeographyPosition::getStatus, sysGeographyPositionDto.getStatus()));
|
|
|
Long onlineNum = sysGeographyPositionMapper.selectCount(new LambdaQueryWrapper<SysGeographyPosition>()
|
|
|
.eq(StringUtils.isNotEmpty(sysGeographyPositionDto.getProvince()), SysGeographyPosition::getProvince, sysGeographyPositionDto.getProvince())
|
|
|
.eq(StringUtils.isNotEmpty(sysGeographyPositionDto.getCity()), SysGeographyPosition::getCity, sysGeographyPositionDto.getCity())
|
|
|
.eq(StringUtils.isNotEmpty(sysGeographyPositionDto.getDistrict()), SysGeographyPosition::getDistrict, sysGeographyPositionDto.getDistrict())
|
|
|
.in(SysGeographyPosition::getSource, Arrays.asList("1", "2"))
|
|
|
- .eq(sysGeographyPositionDto.getSource() == null, SysGeographyPosition::getStatus, 1)
|
|
|
- .eq(sysGeographyPositionDto.getSource() != null, SysGeographyPosition::getStatus, sysGeographyPositionDto.getStatus()));
|
|
|
+ .eq(sysGeographyPositionDto.getStatus() == null, SysGeographyPosition::getStatus, 1)
|
|
|
+ .eq(sysGeographyPositionDto.getStatus() != null, SysGeographyPosition::getStatus, sysGeographyPositionDto.getStatus()));
|
|
|
sysPcAddressNumVo.setAllNum(all);
|
|
|
sysPcAddressNumVo.setProxyNum(proxyNum);
|
|
|
sysPcAddressNumVo.setChannelNum(channelNum);
|
|
|
@@ -146,7 +146,7 @@ public class SysGeographyPositionServiceImpl extends ServiceImpl<SysGeographyPos
|
|
|
.eq(StringUtils.isNotEmpty(sysGeographyPositionDto.getDistrict()), SysGeographyPosition::getDistrict, sysGeographyPositionDto.getDistrict())
|
|
|
.in(SysGeographyPosition::getSource, Arrays.asList("1", "2"))
|
|
|
.eq(StringUtils.isNotEmpty(sysGeographyPositionDto.getSource()), SysGeographyPosition::getSource, sysGeographyPositionDto.getSource())
|
|
|
- .eq(sysGeographyPositionDto.getSource() != null, SysGeographyPosition::getStatus, sysGeographyPositionDto.getStatus()));
|
|
|
+ .eq(sysGeographyPositionDto.getStatus() != null, SysGeographyPosition::getStatus, sysGeographyPositionDto.getStatus()));
|
|
|
|
|
|
if (CollectionUtil.isEmpty(sysGeographyPositionList)) return regionInfoVos;
|
|
|
|