1.0.0 修改已挂牌地块分页查询条件

4 years ago · 3d750b927a
6 changed files with 196 additions and 34 deletions
--- 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<Page<LandListed>> getLandListedPage(QueryPage page, LandListedPageVo pageVo) {
        Page<LandListed> result = landListedService.page(page.toPage(), Wrappers.<LandListed>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, "查询成功");
    }
--- 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<Page<LandToList>> getLandToListPage(QueryPage page, LandListedPageVo pageVo) {
+    public R<Page<LandToList>> getLandToListPage(QueryPage page, LandToListPageVo pageVo) {
        Page<LandToList> result = landToListService.page(page.toPage(), Wrappers.<LandToList>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, "查询成功");
    }
--- 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<LandListedMapper, LandLis
        list.add(data.getConductEnterprise());
        list.add(DateUtil.fromString(data.getFirstOpenTime(), "yyyy-MM-dd"));
        return list;
-        /*ExportLandListedDto listedDto = new ExportLandListedDto();
-        BeanUtil.copyProperties(data,listedDto);
-        Class<? extends ExportLandListedDto> 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();
-                }
-            }
-        }*/
-
    }
 }
--- a/air/src/main/java/com/air/land/vo/AuctionRecordPageVo.java
+++ 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;
+}
--- 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;

 }
--- a/air/src/main/java/com/air/land/vo/LandToListPageVo.java
+++ 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;
+
+}