删除
This commit is contained in:
@@ -76,10 +76,10 @@ public class TbBuilding extends TenantEntity {
|
|||||||
*/
|
*/
|
||||||
private Date completionDate;
|
private Date completionDate;
|
||||||
|
|
||||||
/**
|
// /**
|
||||||
* 地址
|
// * 地址
|
||||||
*/
|
// */
|
||||||
private String addr;
|
// private String addr;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 经度
|
* 经度
|
||||||
|
@@ -58,10 +58,10 @@ public class TbCommunity extends TenantEntity {
|
|||||||
*/
|
*/
|
||||||
private String district;
|
private String district;
|
||||||
|
|
||||||
// /**
|
/**
|
||||||
// * 地址
|
* 地址
|
||||||
// */
|
*/
|
||||||
// private String addr;
|
private String addr;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 经度
|
* 经度
|
||||||
|
@@ -77,11 +77,11 @@ public class TbBuildingBo extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private Date completionDate;
|
private Date completionDate;
|
||||||
|
|
||||||
/**
|
// /**
|
||||||
* 地址
|
// * 地址
|
||||||
*/
|
// */
|
||||||
@NotBlank(message = "地址不能为空", groups = {AddGroup.class, EditGroup.class})
|
// @NotBlank(message = "地址不能为空", groups = {AddGroup.class, EditGroup.class})
|
||||||
private String addr;
|
// private String addr;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 经度
|
* 经度
|
||||||
|
@@ -61,11 +61,11 @@ public class TbCommunityBo extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private String district;
|
private String district;
|
||||||
|
|
||||||
// /**
|
/**
|
||||||
// * 地址
|
* 地址
|
||||||
// */
|
*/
|
||||||
// @NotBlank(message = "地址不能为空", groups = {AddGroup.class, EditGroup.class})
|
@NotBlank(message = "地址不能为空", groups = {AddGroup.class, EditGroup.class})
|
||||||
// private String addr;
|
private String addr;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 经度
|
* 经度
|
||||||
|
@@ -89,11 +89,11 @@ public class TbBuildingVo implements Serializable {
|
|||||||
@ExcelProperty(value = "竣工日期")
|
@ExcelProperty(value = "竣工日期")
|
||||||
private Date completionDate;
|
private Date completionDate;
|
||||||
|
|
||||||
/**
|
// /**
|
||||||
* 地址
|
// * 地址
|
||||||
*/
|
// */
|
||||||
@ExcelProperty(value = "地址")
|
// @ExcelProperty(value = "地址")
|
||||||
private String addr;
|
// private String addr;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 经度
|
* 经度
|
||||||
|
@@ -65,11 +65,11 @@ public class TbCommunityVo implements Serializable {
|
|||||||
@ExcelProperty(value = "区")
|
@ExcelProperty(value = "区")
|
||||||
private String district;
|
private String district;
|
||||||
|
|
||||||
// /**
|
/**
|
||||||
// * 地址
|
* 地址
|
||||||
// */
|
*/
|
||||||
// @ExcelProperty(value = "地址")
|
@ExcelProperty(value = "地址")
|
||||||
// private String addr;
|
private String addr;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 经度
|
* 经度
|
||||||
|
@@ -95,7 +95,7 @@ public class TbBuildingServiceImpl implements ITbBuildingService {
|
|||||||
lqw.eq(bo.getBuildType() != null, TbBuilding::getBuildType, bo.getBuildType());
|
lqw.eq(bo.getBuildType() != null, TbBuilding::getBuildType, bo.getBuildType());
|
||||||
lqw.eq(bo.getElevatorCount() != null, TbBuilding::getElevatorCount, bo.getElevatorCount());
|
lqw.eq(bo.getElevatorCount() != null, TbBuilding::getElevatorCount, bo.getElevatorCount());
|
||||||
lqw.eq(bo.getCompletionDate() != null, TbBuilding::getCompletionDate, bo.getCompletionDate());
|
lqw.eq(bo.getCompletionDate() != null, TbBuilding::getCompletionDate, bo.getCompletionDate());
|
||||||
lqw.eq(StringUtils.isNotBlank(bo.getAddr()), TbBuilding::getAddr, bo.getAddr());
|
// lqw.eq(StringUtils.isNotBlank(bo.getAddr()), TbBuilding::getAddr, bo.getAddr());
|
||||||
lqw.eq(StringUtils.isNotBlank(bo.getLon()), TbBuilding::getLon, bo.getLon());
|
lqw.eq(StringUtils.isNotBlank(bo.getLon()), TbBuilding::getLon, bo.getLon());
|
||||||
lqw.eq(StringUtils.isNotBlank(bo.getLat()), TbBuilding::getLat, bo.getLat());
|
lqw.eq(StringUtils.isNotBlank(bo.getLat()), TbBuilding::getLat, bo.getLat());
|
||||||
lqw.eq(bo.getSort() != null, TbBuilding::getSort, bo.getSort());
|
lqw.eq(bo.getSort() != null, TbBuilding::getSort, bo.getSort());
|
||||||
|
@@ -178,7 +178,7 @@ public class TbCommunityServiceImpl implements ITbCommunityService {
|
|||||||
lqw.eq(StringUtils.isNotBlank(bo.getProvince()), TbCommunity::getProvince, bo.getProvince());
|
lqw.eq(StringUtils.isNotBlank(bo.getProvince()), TbCommunity::getProvince, bo.getProvince());
|
||||||
lqw.eq(StringUtils.isNotBlank(bo.getCity()), TbCommunity::getCity, bo.getCity());
|
lqw.eq(StringUtils.isNotBlank(bo.getCity()), TbCommunity::getCity, bo.getCity());
|
||||||
lqw.eq(StringUtils.isNotBlank(bo.getDistrict()), TbCommunity::getDistrict, bo.getDistrict());
|
lqw.eq(StringUtils.isNotBlank(bo.getDistrict()), TbCommunity::getDistrict, bo.getDistrict());
|
||||||
// lqw.eq(StringUtils.isNotBlank(bo.getAddr()), TbCommunity::getAddr, bo.getAddr());
|
lqw.eq(StringUtils.isNotBlank(bo.getAddr()), TbCommunity::getAddr, bo.getAddr());
|
||||||
lqw.eq(StringUtils.isNotBlank(bo.getLon()), TbCommunity::getLon, bo.getLon());
|
lqw.eq(StringUtils.isNotBlank(bo.getLon()), TbCommunity::getLon, bo.getLon());
|
||||||
lqw.eq(StringUtils.isNotBlank(bo.getLat()), TbCommunity::getLat, bo.getLat());
|
lqw.eq(StringUtils.isNotBlank(bo.getLat()), TbCommunity::getLat, bo.getLat());
|
||||||
lqw.eq(bo.getArea() != null, TbCommunity::getArea, bo.getArea());
|
lqw.eq(bo.getArea() != null, TbCommunity::getArea, bo.getArea());
|
||||||
|
Reference in New Issue
Block a user