From 3d750b927a96e91867ddb7034376123adaa657bf Mon Sep 17 00:00:00 2001 From: peihao <1280253838@qq.com> Date: Fri, 25 Jun 2021 17:55:26 +0800 Subject: [PATCH] =?UTF-8?q?1.0.0=20=E4=BF=AE=E6=94=B9=E5=B7=B2=E6=8C=82?= =?UTF-8?q?=E7=89=8C=E5=9C=B0=E5=9D=97=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../land/controller/LandListedController.java | 37 ++++++++++++- .../land/controller/LandToListController.java | 34 ++++++++++-- .../service/impl/LandListedServiceImpl.java | 19 ------- .../com/air/land/vo/AuctionRecordPageVo.java | 45 ++++++++++++++++ .../com/air/land/vo/LandListedPageVo.java | 42 +++++++++++---- .../com/air/land/vo/LandToListPageVo.java | 53 +++++++++++++++++++ 6 files changed, 196 insertions(+), 34 deletions(-) create mode 100644 air/src/main/java/com/air/land/vo/AuctionRecordPageVo.java create mode 100644 air/src/main/java/com/air/land/vo/LandToListPageVo.java diff --git a/air/src/main/java/com/air/land/controller/LandListedController.java b/air/src/main/java/com/air/land/controller/LandListedController.java index 247fe73..02a795b 100644 --- a/air/src/main/java/com/air/land/controller/LandListedController.java +++ b/air/src/main/java/com/air/land/controller/LandListedController.java @@ -67,13 +67,48 @@ public class LandListedController { @GetMapping public R> getLandListedPage(QueryPage page, LandListedPageVo pageVo) { Page result = landListedService.page(page.toPage(), Wrappers.query().lambda() + //公告序号 .like(StringUtils.isNotEmpty(pageVo.getAnnoId()), LandListed::getAnnoId, pageVo.getAnnoId()) + //地块编号 .like(StringUtils.isNotEmpty(pageVo.getLandCode()), LandListed::getLandCode, pageVo.getLandCode()) + //土地用途 .eq(StringUtils.isNotEmpty(pageVo.getLandUsage()), LandListed::getLandUsage, pageVo.getLandUsage()) + //公告日期 .eq(ObjectUtil.isNotEmpty(pageVo.getAnnoDate()), LandListed::getAnnoDate, pageVo.getAnnoDate()) + //拍卖日期 + .eq(ObjectUtil.isNotEmpty(pageVo.getAuctionDate()), LandListed::getAuctionDate, pageVo.getAuctionDate()) + //地质灾害 + .eq(StringUtils.isNotEmpty(pageVo.getGeologicHazard()), LandListed::getGeologicHazard, pageVo.getGeologicHazard()) + //人防还建 + .eq(ObjectUtil.isNotEmpty(pageVo.getCivilAirDefence()), LandListed::getCivilAirDefence, pageVo.getCivilAirDefence()) + //特殊规划 + .eq(ObjectUtil.isNotEmpty(pageVo.getSpecialPlan()), LandListed::getSpecialPlan, pageVo.getSpecialPlan()) + //勾地形式 + .eq(StringUtils.isNotEmpty(pageVo.getHookForm()), LandListed::getHookForm, pageVo.getHookForm()) + //勾地企业 + .eq(ObjectUtil.isNotEmpty(pageVo.getLandEnterprises()), LandListed::getLandEnterprises, pageVo.getLandEnterprises()) + //城市 + .eq(ObjectUtil.isNotEmpty(pageVo.getCity()), LandListed::getCity, pageVo.getCity()) + //行政区 + .eq(StringUtils.isNotEmpty(pageVo.getCanton()), LandListed::getCanton, pageVo.getCanton()) + //大组团 .like(StringUtils.isNotEmpty(pageVo.getBigGroup()), LandListed::getBigGroup, pageVo.getBigGroup()) + //小组团 .like(StringUtils.isNotEmpty(pageVo.getSmallGroup()), LandListed::getSmallGroup, pageVo.getSmallGroup()) - .eq(StringUtils.isNotEmpty(pageVo.getCanton()), LandListed::getCanton, pageVo.getCanton()) + //受让单位 + .eq(StringUtils.isNotEmpty(pageVo.getAssignee()), LandListed::getAssignee, pageVo.getAssignee()) + //拿地企业 + .eq(ObjectUtil.isNotEmpty(pageVo.getLandEnterpriseShort()), LandListed::getLandEnterpriseShort, pageVo.getLandEnterpriseShort()) + //参拍企业 + .eq(ObjectUtil.isNotEmpty(pageVo.getParticipatingEnterprises()), LandListed::getParticipatingEnterprises, pageVo.getParticipatingEnterprises()) + //项目状态 + .eq(StringUtils.isNotEmpty(pageVo.getProjectStatus()), LandListed::getProjectStatus, pageVo.getProjectStatus()) + //楼盘名称 + .eq(ObjectUtil.isNotEmpty(pageVo.getBuildingName()), LandListed::getBuildingName, pageVo.getBuildingName()) + //操盘企业 + .eq(ObjectUtil.isNotEmpty(pageVo.getTradingEnterprises()), LandListed::getTradingEnterprises, pageVo.getTradingEnterprises()) + //经营企业 + .eq(StringUtils.isNotEmpty(pageVo.getConductEnterprise()), LandListed::getConductEnterprise, pageVo.getConductEnterprise()) .orderByDesc(LandListed::getUpdateDate)); return R.ok(result, "查询成功"); } diff --git a/air/src/main/java/com/air/land/controller/LandToListController.java b/air/src/main/java/com/air/land/controller/LandToListController.java index 92ec7b9..23f99e8 100644 --- a/air/src/main/java/com/air/land/controller/LandToListController.java +++ b/air/src/main/java/com/air/land/controller/LandToListController.java @@ -6,6 +6,7 @@ import com.air.common.Constant; import com.air.land.entity.LandToList; import com.air.land.service.LandToListService; import com.air.land.vo.LandListedPageVo; +import com.air.land.vo.LandToListPageVo; import com.air.land.vo.LandToListVo; import com.air.utils.DateUtil; import com.air.utils.ExcelUtil; @@ -60,15 +61,38 @@ public class LandToListController { */ @ApiOperation(value = "分页查询", notes = "分页查询") @GetMapping - public R> getLandToListPage(QueryPage page, LandListedPageVo pageVo) { + public R> getLandToListPage(QueryPage page, LandToListPageVo pageVo) { Page result = landToListService.page(page.toPage(), Wrappers.query().lambda() - .like(StringUtils.isNotEmpty(pageVo.getAnnoId()), LandToList::getAnnoId, pageVo.getAnnoId()) - .like(StringUtils.isNotEmpty(pageVo.getLandCode()), LandToList::getLandCode, pageVo.getLandCode()) + //地块名称 + .eq(StringUtils.isNotEmpty(pageVo.getLandName()), LandToList::getLandName, pageVo.getLandName()) + //供地状态 + .eq(StringUtils.isNotEmpty(pageVo.getSupplyStatus()), LandToList::getSupplyStatus, pageVo.getSupplyStatus()) + //预计挂牌时间 + .eq(StringUtils.isNotEmpty(pageVo.getEstimatedListingTime()), LandToList::getEstimatedListingTime, pageVo.getEstimatedListingTime()) + //地块编号 + .eq(StringUtils.isNotEmpty(pageVo.getLandCode()), LandToList::getLandCode, pageVo.getLandCode()) + //土地用途 .eq(StringUtils.isNotEmpty(pageVo.getLandUsage()), LandToList::getLandUsage, pageVo.getLandUsage()) - .eq(ObjectUtil.isNotEmpty(pageVo.getAnnoDate()), LandToList::getAnnoDate, pageVo.getAnnoDate()) + //地质灾害 + .eq(ObjectUtil.isNotEmpty(pageVo.getGeologicHazard()), LandToList::getGeologicHazard, pageVo.getGeologicHazard()) + //人防还建 + .eq(StringUtils.isNotEmpty(pageVo.getCivilAirDefence()), LandToList::getCivilAirDefence, pageVo.getCivilAirDefence()) + //特殊规划 + .eq(StringUtils.isNotEmpty(pageVo.getSpecialPlan()), LandToList::getSpecialPlan, pageVo.getSpecialPlan()) + //勾地形式 + .eq(StringUtils.isNotEmpty(pageVo.getHookForm()), LandToList::getHookForm, pageVo.getHookForm()) + //勾地企业 + .eq(StringUtils.isNotEmpty(pageVo.getLandEnterprises()), LandToList::getLandEnterprises, pageVo.getLandEnterprises()) + //出让人 + .eq(StringUtils.isNotEmpty(pageVo.getBargainor()), LandToList::getBargainor, pageVo.getBargainor()) + //城市 + .eq(StringUtils.isNotEmpty(pageVo.getCity()), LandToList::getCity, pageVo.getCity()) + //行政区 + .eq(StringUtils.isNotEmpty(pageVo.getCanton()), LandToList::getCanton, pageVo.getCanton()) + //大组团 .like(StringUtils.isNotEmpty(pageVo.getBigGroup()), LandToList::getBigGroup, pageVo.getBigGroup()) + //小组团 .like(StringUtils.isNotEmpty(pageVo.getSmallGroup()), LandToList::getSmallGroup, pageVo.getSmallGroup()) - .eq(StringUtils.isNotEmpty(pageVo.getCanton()), LandToList::getCanton, pageVo.getCanton()) .orderByDesc(LandToList::getUpdateDate)); return R.ok(result, "查询成功"); } diff --git a/air/src/main/java/com/air/land/service/impl/LandListedServiceImpl.java b/air/src/main/java/com/air/land/service/impl/LandListedServiceImpl.java index 02827e7..fa10906 100644 --- a/air/src/main/java/com/air/land/service/impl/LandListedServiceImpl.java +++ b/air/src/main/java/com/air/land/service/impl/LandListedServiceImpl.java @@ -345,24 +345,5 @@ public class LandListedServiceImpl extends ServiceImpl clazz = listedDto.getClass(); - Method[] md = clazz.getDeclaredMethods(); - for (int i = 0; i < md.length; i++) { - if (md[i].getName().indexOf("get") == 0) { - try { - Object obj = md[i].invoke(listedDto, new Object[0]); - list.add(String.valueOf(obj)); - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } catch (InvocationTargetException e) { - e.printStackTrace(); - } - } - }*/ - } } diff --git a/air/src/main/java/com/air/land/vo/AuctionRecordPageVo.java b/air/src/main/java/com/air/land/vo/AuctionRecordPageVo.java new file mode 100644 index 0000000..b7de34a --- /dev/null +++ b/air/src/main/java/com/air/land/vo/AuctionRecordPageVo.java @@ -0,0 +1,45 @@ +package com.air.land.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + + +/** + * 参拍记录分页查询参数 + * + * @author peihao + * @date 2021/5/18 + **/ +@Data +@ApiModel(value = "参拍记录分页查询参数") +public class AuctionRecordPageVo { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private Long auctionRecordId; + + @NotNull(message = "已挂牌地块标识不能为空") + private String landListedId; + + @ApiModelProperty(value = "公告id") + private String annoId; + + @ApiModelProperty(value = "城市") + private String city; + + @ApiModelProperty(value = "地块名称") + private String landName; + + @ApiModelProperty(value = "地块位置") + private String ranking; + + @ApiModelProperty(value = "举牌企业") + private String raiseEnterprise; + + @ApiModelProperty(value = "竞得企业") + private String winnerEnterprises; +} diff --git a/air/src/main/java/com/air/land/vo/LandListedPageVo.java b/air/src/main/java/com/air/land/vo/LandListedPageVo.java index afef2ed..d348b16 100644 --- a/air/src/main/java/com/air/land/vo/LandListedPageVo.java +++ b/air/src/main/java/com/air/land/vo/LandListedPageVo.java @@ -4,9 +4,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.time.LocalDate; -import java.time.LocalDateTime; - /** * 已挂牌地块分页查询参数。 * @@ -20,23 +17,50 @@ public class LandListedPageVo { @ApiModelProperty(value = "公告序号") private String annoId; - @ApiModelProperty(value = "地块编号") private String landCode; - @ApiModelProperty(value = "土地用途") private String landUsage; - @ApiModelProperty(value = "公告日期") private String annoDate; + @ApiModelProperty(value = "拍卖日期") + private String auctionDate; + + @ApiModelProperty(value = "地质灾害") + private String geologicHazard; + @ApiModelProperty(value = "人防还建（㎡)") + private String civilAirDefence; + @ApiModelProperty(value = "特殊规划") + private String specialPlan; + + @ApiModelProperty(value = "勾地形式") + private String hookForm; + @ApiModelProperty(value = "勾地企业") + private String landEnterprises; + @ApiModelProperty(value = "城市") + private String city; + @ApiModelProperty(value = "行政区") + private String canton; @ApiModelProperty(value = "大组团") private String bigGroup; - @ApiModelProperty(value = "小组团") private String smallGroup; - @ApiModelProperty(value = "行政区") - private String canton; + @ApiModelProperty(value = "受让单位") + private String assignee; + @ApiModelProperty(value = "拿地企业-简称") + private String landEnterpriseShort; + @ApiModelProperty(value = "参拍企业") + private String participatingEnterprises; + + @ApiModelProperty(value = "项目状态") + private String projectStatus; + @ApiModelProperty(value = "楼盘名称") + private String buildingName; + @ApiModelProperty(value = "操盘企业") + private String tradingEnterprises; + @ApiModelProperty(value = "经营企业") + private String conductEnterprise; } diff --git a/air/src/main/java/com/air/land/vo/LandToListPageVo.java b/air/src/main/java/com/air/land/vo/LandToListPageVo.java new file mode 100644 index 0000000..a0abd8a --- /dev/null +++ b/air/src/main/java/com/air/land/vo/LandToListPageVo.java @@ -0,0 +1,53 @@ +package com.air.land.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 拟挂牌地块分页查询参数。 + * + * @author peihao + * @date 2021/5/18 + **/ +@Data +@ApiModel(value = "拟挂牌地块分页查询参数") +public class LandToListPageVo { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "地块名称") + private String landName; + @ApiModelProperty(value = "供地状态") + private String supplyStatus; + @ApiModelProperty(value = "预计挂牌时间") + private String estimatedListingTime; + + @ApiModelProperty(value = "地块编号") + private String landCode; + @ApiModelProperty(value = "土地用途") + private String landUsage; + + @ApiModelProperty(value = "地质灾害") + private String geologicHazard; + @ApiModelProperty(value = "人防还建（㎡)") + private String civilAirDefence; + @ApiModelProperty(value = "特殊规划") + private String specialPlan; + + @ApiModelProperty(value = "勾地形式") + private String hookForm; + @ApiModelProperty(value = "勾地企业") + private String landEnterprises; + @ApiModelProperty(value = "出让人") + private String bargainor; + + @ApiModelProperty(value = "城市") + private String city; + @ApiModelProperty(value = "行政区") + private String canton; + @ApiModelProperty(value = "大组团") + private String bigGroup; + @ApiModelProperty(value = "小组团") + private String smallGroup; + +}