diff --git a/air/src/main/java/com/air/housing/dto/HousingEstatesQuery.java b/air/src/main/java/com/air/housing/dto/HousingEstatesQuery.java index 8a5cef8..6d9fe43 100644 --- a/air/src/main/java/com/air/housing/dto/HousingEstatesQuery.java +++ b/air/src/main/java/com/air/housing/dto/HousingEstatesQuery.java @@ -18,14 +18,20 @@ import java.time.LocalDateTime; @EqualsAndHashCode @ApiModel public class HousingEstatesQuery { - @ApiModelProperty(value = "公告id") + @ApiModelProperty(value = "公告编号") private String annoId; @ApiModelProperty(value = "楼盘名称") private String name; + @ApiModelProperty(value = "业态") + private String format; + @ApiModelProperty(value = "区域") + private String area; @ApiModelProperty(value = "大组团") private String bigGroup; @ApiModelProperty(value = "小组团") private String smallGroup; @ApiModelProperty(value = "日期,格式yyyy-MM-dd") private String createDate; + @ApiModelProperty(value = "开发企业") + private String program; } diff --git a/air/src/main/java/com/air/land/controller/LandListedLonLatController.java b/air/src/main/java/com/air/land/controller/LandListedLonLatController.java index 52c1301..addee80 100644 --- a/air/src/main/java/com/air/land/controller/LandListedLonLatController.java +++ b/air/src/main/java/com/air/land/controller/LandListedLonLatController.java @@ -11,6 +11,7 @@ import com.cinderella.framework.common.core.util.R; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -56,12 +57,12 @@ public class LandListedLonLatController { @ApiOperation(value = "新增已挂牌地块经纬度", notes = "新增已挂牌地块经纬度") @PostMapping public R save(@RequestBody @Validated LandListedLonLatVo landListedLonLatVo) { - List list = landListedLonLatService.list(Wrappers.query().lambda() + /*List list = landListedLonLatService.list(Wrappers.query().lambda() .eq(LandListedLonLat::getLandListedId, landListedLonLatVo.getLandListedId()) .eq(LandListedLonLat::getLandCode, landListedLonLatVo.getLandCode())); if (CollectionUtil.isNotEmpty(list)) { return R.failed("地块编号已存在"); - } + }*/ LandListedLonLat landListedLonLat = new LandListedLonLat(); BeanUtil.copyProperties(landListedLonLatVo, landListedLonLat); return R.ok(landListedLonLatService.save(landListedLonLat), "保存成功"); @@ -76,11 +77,14 @@ public class LandListedLonLatController { @ApiOperation(value = "修改拟挂牌地块经纬度", notes = "修改拟挂牌地块经纬度") @PutMapping public R update(@RequestBody @Validated LandListedLonLatVo landListedLonLatVo) { - List list = landListedLonLatService.list(Wrappers.query().lambda() + /*List list = landListedLonLatService.list(Wrappers.query().lambda() .eq(LandListedLonLat::getLandListedId, landListedLonLatVo.getLandListedId()) .eq(LandListedLonLat::getLandCode, landListedLonLatVo.getLandCode())); if (CollectionUtil.isNotEmpty(list)) { return R.failed("地块编号已存在"); + }*/ + if (landListedLonLatVo.getLatId() == null){ + return R.failed("经纬度id不能为空"); } LandListedLonLat landListedLonLat = new LandListedLonLat(); BeanUtil.copyProperties(landListedLonLatVo, landListedLonLat); diff --git a/air/src/main/java/com/air/land/vo/LandListedLonLatVo.java b/air/src/main/java/com/air/land/vo/LandListedLonLatVo.java index 4d2ac36..c7b6a17 100644 --- a/air/src/main/java/com/air/land/vo/LandListedLonLatVo.java +++ b/air/src/main/java/com/air/land/vo/LandListedLonLatVo.java @@ -17,11 +17,11 @@ import javax.validation.constraints.NotNull; @ApiModel(value = "已挂牌地块经纬度") public class LandListedLonLatVo { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "已挂牌主键", required = true) + @ApiModelProperty(value = "已挂牌地块经纬度主键", required = true) private Long latId; @NotNull(message = "已挂牌标识不能为空") - @ApiModelProperty(value = "已挂牌主键", required = true) + @ApiModelProperty(value = "已挂牌标识", required = true) private String landListedId; @NotBlank(message = "公告序号不能为空")