by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

删除

Browse Source
This commit is contained in:
dy
2025-09-06 12:52:48 +08:00
parent 0b0103ea07
commit 22c6efea63
8 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbBuilding.java
View File

@@ -76,10 +76,10 @@ public class TbBuilding extends TenantEntity {
*/
private Date completionDate;
/**
* 地址
*/
private String addr;
// /**
// * 地址
// */
// private String addr;
/**
* 经度

8
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbCommunity.java
View File

@@ -58,10 +58,10 @@ public class TbCommunity extends TenantEntity {
*/
private String district;
// /**
// * 地址
// */
// private String addr;
/**
* 地址
*/
private String addr;
/**
* 经度

10
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbBuildingBo.java
View File

@@ -77,11 +77,11 @@ public class TbBuildingBo extends BaseEntity {
*/
private Date completionDate;
/**
* 地址
*/
@NotBlank(message = "地址不能为空", groups = {AddGroup.class, EditGroup.class})
private String addr;
// /**
// * 地址
// */
// @NotBlank(message = "地址不能为空", groups = {AddGroup.class, EditGroup.class})
// private String addr;
/**
* 经度

10
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbCommunityBo.java
View File

@@ -61,11 +61,11 @@ public class TbCommunityBo extends BaseEntity {
*/
private String district;
// /**
// * 地址
// */
// @NotBlank(message = "地址不能为空", groups = {AddGroup.class, EditGroup.class})
// private String addr;
/**
* 地址
*/
@NotBlank(message = "地址不能为空", groups = {AddGroup.class, EditGroup.class})
private String addr;
/**
* 经度

10
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbBuildingVo.java
View File

@@ -89,11 +89,11 @@ public class TbBuildingVo implements Serializable {
@ExcelProperty(value = "竣工日期")
private Date completionDate;
/**
* 地址
*/
@ExcelProperty(value = "地址")
private String addr;
// /**
// * 地址
// */
// @ExcelProperty(value = "地址")
// private String addr;
/**
* 经度

10
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbCommunityVo.java
View File

@@ -65,11 +65,11 @@ public class TbCommunityVo implements Serializable {
@ExcelProperty(value = "区")
private String district;
// /**
// * 地址
// */
// @ExcelProperty(value = "地址")
// private String addr;
/**
* 地址
*/
@ExcelProperty(value = "地址")
private String addr;
/**
* 经度

2
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbBuildingServiceImpl.java
View File

@@ -95,7 +95,7 @@ public class TbBuildingServiceImpl implements ITbBuildingService {
lqw.eq(bo.getBuildType() != null, TbBuilding::getBuildType, bo.getBuildType());
lqw.eq(bo.getElevatorCount() != null, TbBuilding::getElevatorCount, bo.getElevatorCount());
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.getLat()), TbBuilding::getLat, bo.getLat());
lqw.eq(bo.getSort() != null, TbBuilding::getSort, bo.getSort());

2
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCommunityServiceImpl.java
View File

@@ -178,7 +178,7 @@ public class TbCommunityServiceImpl implements ITbCommunityService {
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.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.getLat()), TbCommunity::getLat, bo.getLat());
lqw.eq(bo.getArea() != null, TbCommunity::getArea, bo.getArea());