添加排序字段，返回联系人联系电话，修改筛选项

src/main/java/com/postcard/service/moudle/carrier/dto/CarrierPageDto.java

@@ -28,10 +28,10 @@ public class CarrierPageDto {
   private String carrierArea;
 
   @ApiModelProperty(value = "载体类型")
-  private String typeInfo;
+  private String carrierType;
 
   @ApiModelProperty(value = "建筑结构")
-  private String structure;
+  private String carrierConstruction;
 
   @ApiModelProperty(hidden = true)
   private Double lowCarrierArea;
@@ -41,7 +41,7 @@ public class CarrierPageDto {
 
   //数据库映射字段
   @ApiModelProperty(hidden = true)
-  private List<String> carrierType;
+  private List<String> carrierTypeList;
   @ApiModelProperty(hidden = true)
   private Integer developmentId;
   @ApiModelProperty(hidden = true)

src/main/java/com/postcard/service/moudle/carrier/service/impl/CarrierInfoServiceImpl.java

@@ -5,7 +5,9 @@ import cn.hutool.core.util.NumberUtil;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.postcard.service.domain.Direction;
 import com.postcard.service.domain.ParamEntity;
+import com.postcard.service.domain.Sort;
 import com.postcard.service.enums.CarouselTypeEnum;
 import com.postcard.service.enums.DictCodeEnum;
 import com.postcard.service.moudle.carrier.dto.CarrierPageDto;
@@ -62,6 +64,7 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
   @Override
   public Page<CarrierPageVo> pageList(ParamEntity<CarrierPageDto> paramEntity) {
     CarrierPageDto carrierPageDto = paramEntity.getCondition();
+    carrierPageDto.setDevelopmentId(developMentId);
     String carrierArea = carrierPageDto.getCarrierArea();
     if (StringUtils.isNotBlank(carrierArea)) {
       String[] split = carrierArea.split("-");
@@ -71,14 +74,14 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
       }
     }
     // 映射字段
-    String carrierType = carrierPageDto.getTypeInfo();
+    String carrierType = carrierPageDto.getCarrierType();
     if (StringUtils.isNotBlank(carrierType)) {
       Map<String, SysDictDataEntity> dictDataEntityMap =
           this.sysDictDataService.listByCode(DictCodeEnum.CARRIER_TYPE.getCode());
       SysDictDataEntity sysDictDataEntity = dictDataEntityMap.get(carrierType);
       if (ObjectUtils.isNotEmpty(sysDictDataEntity)) {
         String detail = sysDictDataEntity.getDetail();
-        carrierPageDto.setCarrierType(Arrays.asList(detail.split(",")));
+        carrierPageDto.setCarrierTypeList(Arrays.asList(detail.split(",")));
       }
     }
     //主导产业
@@ -87,8 +90,12 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
       String[] split = name.split("、");
       carrierPageDto.setPrimaryIndustryList(Arrays.asList(split));
     }
+
+    List<Sort> sortList = new ArrayList<>();
+    sortList.add(new Sort(Direction.DESC,"-a.sort_park"));
+    sortList.add(new Sort(Direction.DESC,"a.create_time"));
+    paramEntity.setSorts(sortList);
     Page page = CommonUtil.getPageFromEntity(paramEntity);
-    carrierPageDto.setDevelopmentId(developMentId);
     Page<CarrierPageVo> result = this.baseMapper.pageList(page, carrierPageDto);
     List<CarrierPageVo> records = result.getRecords();
     if (!CollectionUtils.isEmpty(records)) {
@@ -132,14 +139,14 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
       }
     }
     // 映射字段
-    String carrierType = carrierPageDto.getTypeInfo();
+    String carrierType = carrierPageDto.getCarrierType();
     if (StringUtils.isNotBlank(carrierType)) {
       Map<String, SysDictDataEntity> dictDataEntityMap =
               this.sysDictDataService.listByCode(DictCodeEnum.CARRIER_TYPE.getCode());
       SysDictDataEntity sysDictDataEntity = dictDataEntityMap.get(carrierType);
       if (ObjectUtils.isNotEmpty(sysDictDataEntity)) {
         String detail = sysDictDataEntity.getDetail();
-        carrierPageDto.setCarrierType(Arrays.asList(detail.split(",")));
+        carrierPageDto.setCarrierTypeList(Arrays.asList(detail.split(",")));
       }
     }
     //主导产业

src/main/java/com/postcard/service/moudle/land/service/impl/LandInfoServiceImpl.java

@@ -5,7 +5,9 @@ import cn.hutool.core.util.NumberUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import com.postcard.service.domain.Direction;
 import com.postcard.service.domain.ParamEntity;
+import com.postcard.service.domain.Sort;
 import com.postcard.service.enums.CarouselTypeEnum;
 import com.postcard.service.moudle.development.entity.DevelopmentInfo;
 import com.postcard.service.moudle.development.service.DevelopmentInfoService;
@@ -27,6 +29,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.StringJoiner;
 
@@ -55,9 +58,14 @@ public class LandInfoServiceImpl extends ServiceImpl<LandInfoMapper, LandInfoEnt
    */
   @Override
   public Page<LandPageVo> pageInfo(ParamEntity<LandPageDto> param) {
-    Page page = CommonUtil.getPageFromEntity(param);
+
     LandPageDto condition = param.getCondition();
     condition.setDevelopmentId(developMentId);
+    List<Sort> sortList = new ArrayList<>();
+    sortList.add(new Sort(Direction.DESC,"-a.sort_development"));
+    sortList.add(new Sort(Direction.DESC,"a.create_time"));
+    param.setSorts(sortList);
+    Page page = CommonUtil.getPageFromEntity(param);
     Page<LandPageVo> pageVoPage = this.baseMapper.pageInfo(page, condition);
     List<LandPageVo> records = pageVoPage.getRecords();
     records.forEach(

src/main/java/com/postcard/service/moudle/park/dto/ParkPageDto.java

@@ -25,7 +25,7 @@ public class ParkPageDto {
 
   /** 占地面积（单位：亩） */
   @ApiModelProperty(value = "面积")
-  private String coverArea;
+  private String parkArea;
 
   /** 占地面积上限（单位：亩） */
   @ApiModelProperty(hidden = true)

src/main/java/com/postcard/service/moudle/park/mapper/ParkInfoMapper.java

@@ -21,7 +21,7 @@ public interface ParkInfoMapper extends BaseMapper<ParkInfo> {
 
     Page<ParkPageVo> pageList(Page pageFromEntity, @Param("param") ParkPageDto parkInfoParam);
 
-    List<ParkPageVo> pageList(@Param("param") ParkPageDto parkInfoParam);
+    List<ParkPageVo> noPageList(@Param("param") ParkPageDto parkInfoParam);
 
 }
 

src/main/java/com/postcard/service/moudle/park/service/impl/ParkInfoServiceImpl.java

@@ -8,7 +8,9 @@ import cn.hutool.core.util.NumberUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.postcard.service.domain.Direction;
 import com.postcard.service.domain.ParamEntity;
+import com.postcard.service.domain.Sort;
 import com.postcard.service.enums.CarouselTypeEnum;
 import com.postcard.service.enums.FacilityEnum;
 import com.postcard.service.enums.ParkStatusEnum;
@@ -83,7 +85,7 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo>
         TimeInterval timer = DateUtil.timer();
         ParkPageDto parkInfoParam = param.getCondition();
         parkInfoParam.setDevelopmentId(developmentId);
-        String coverArea = parkInfoParam.getCoverArea();
+        String coverArea = parkInfoParam.getParkArea();
         if (ObjectUtils.isNotEmpty(coverArea)) {
             String[] split = coverArea.split("-");
             parkInfoParam.setCoverAreaUp(Double.valueOf(split[0]));
@@ -96,6 +98,11 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo>
             String[] split = name.split("、");
             parkInfoParam.setPrimaryIndustryList(Arrays.asList(split));
         }
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort(Direction.ASC,"status"));
+        sortList.add(new Sort(Direction.DESC,"-sort_development"));
+        sortList.add(new Sort(Direction.DESC,"create_time"));
+        param.setSorts(sortList);
         Page page = CommonUtil.getPageFromEntity(param);
         Page<ParkPageVo> pageInfo = this.baseMapper.pageList(page, parkInfoParam);
         log.info("park时间消耗：{}", timer.intervalRestart());
@@ -113,7 +120,7 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo>
     public List<ParkPageVo> noPageList(ParkPageDto parkInfoParam) {
         TimeInterval timer = DateUtil.timer();
         parkInfoParam.setDevelopmentId(developmentId);
-        String coverArea = parkInfoParam.getCoverArea();
+        String coverArea = parkInfoParam.getParkArea();
         if (ObjectUtils.isNotEmpty(coverArea)) {
             String[] split = coverArea.split("-");
             parkInfoParam.setCoverAreaUp(Double.valueOf(split[0]));
@@ -126,7 +133,8 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo>
             String[] split = name.split("、");
             parkInfoParam.setPrimaryIndustryList(Arrays.asList(split));
         }
-        List<ParkPageVo> pageInfo = this.baseMapper.pageList(parkInfoParam);
+
+        List<ParkPageVo> pageInfo = this.baseMapper.noPageList(parkInfoParam);
         log.info("park时间消耗：{}", timer.intervalRestart());
         return pageInfo;
     }

src/main/java/com/postcard/service/moudle/park/vo/ParkDetailVo.java

@@ -88,11 +88,11 @@ public class ParkDetailVo {
   @JsonSerialize(using = DefaultImgUrlList.class)
   List<String> imgUrlList;
 
-//  /** 联系人（区域负责人姓名） */
-//  @ApiModelProperty(value = "联系人（区域负责人姓名）")
-//  private String contactPerson;
-//  @ApiModelProperty(value = "联系人电话")
-//  private String phone;
+  /** 联系人（区域负责人姓名） */
+  @ApiModelProperty(value = "联系人（区域负责人姓名）")
+  private String contactPerson;
+  @ApiModelProperty(value = "联系人电话")
+  private String phone;
 
 
   // -----------基础信息----------------

src/main/resources/mapper/carrier/CarrierInfoMapper.xml

@@ -42,15 +42,15 @@
                 AND CONCAT( REPLACE(b.province_name,'省',''), REPLACE(b.city_name,'市',''),b.region_name,b.name,case when a.area is null then '' else CONCAT(ROUND(a.area,0),'㎡') end ,a.type) LIKE concat('%', #{param.name}, '%')
             </if>
             /*载体类型*/
-            <if test="param.carrierType != null and param.carrierType.size() > 0">
+            <if test="param.carrierTypeList != null and param.carrierTypeList.size() > 0">
                 AND a.type in
-                <foreach item="item" collection="param.carrierType" open="(" separator="," close=")">
+                <foreach item="item" collection="param.carrierTypeList" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>
             /*建筑结构*/
-            <if test="param.structure != null and param.structure != ''">
-                AND a.structure=#{param.structure}
+            <if test="param.carrierConstruction != null and param.carrierConstruction != ''">
+                AND a.structure=#{param.carrierConstruction}
             </if>
             <if test="param.developmentId != null and param.developmentId != ''">
                 AND c.id=#{param.developmentId}
@@ -71,6 +71,6 @@
                 </foreach>
             </if>
         </where>
-        order by a.create_time desc
+--         order by a.create_time desc
     </select>
 </mapper>

src/main/resources/mapper/land/LandInfoMapper.xml

@@ -74,6 +74,6 @@
             case when a.area is null then '' else CONCAT(ROUND(a.area,0),'亩') end ,
             a.type) LIKE concat('%', #{param.name}, '%')
         </if>
-            order by a.create_time desc
+--             order by a.create_time desc
     </select>
 </mapper>

src/main/resources/mapper/park/ParkInfoMapper.xml

@@ -108,7 +108,7 @@
             level_name,cover_area,img_url,longitude,latitude
         from park_info
         <where>
-            1 = 1
+            1=1
             <if test="param.statusList != null and param.statusList.size() > 0 ">
                 AND `status` IN
                 <foreach item="status" collection="param.statusList" open="(" separator="," close=")">
@@ -148,7 +148,44 @@
                 AND zone_id = #{param.developmentId}
             </if>
         </where>
-        order by status asc,create_time desc
+--         order by status asc,create_time desc
+    </select>
+
+    <select id="noPageList" resultType="com.postcard.service.moudle.park.vo.ParkPageVo"
+            parameterType="com.postcard.service.moudle.park.dto.ParkPageDto">
+        select  id ,name,
+        province_code, province_name,city_code,
+        city_name,region_code,region_name,
+        status,primary_industry,level_code,
+        level_name,cover_area,img_url,longitude,latitude
+        from park_info
+        <where>
+            1 = 1
+            <if test="param.statusList != null and param.statusList.size() > 0 ">
+                AND `status` IN
+                <foreach item="status" collection="param.statusList" open="(" separator="," close=")">
+                    #{status}
+                </foreach>
+            </if>
+            <if test="param.primaryIndustryList != null and param.primaryIndustryList.size() > 0 ">
+                <foreach item="primaryIndustry" collection="param.primaryIndustryList" open=" and ( " separator="or" close=")">
+                    primary_industry like concat('%', #{primaryIndustry}, '%')
+                </foreach>
+            </if>
+            <if test="param.name != null and param.name != ''">
+                AND name like concat('%', #{param.name}, '%')
+            </if>
+            <if test="param.coverAreaUp != null and param.coverAreaUp != ''">
+                AND cover_area &gt;= #{param.coverAreaUp}
+            </if>
+            <if test="param.coverAreaUnder != null and param.coverAreaUnder != ''">
+                AND cover_area &lt;= #{param.coverAreaUnder}
+            </if>
+            <if test="param.developmentId != null and param.developmentId != ''">
+                AND zone_id = #{param.developmentId}
+            </if>
+        </where>
+        order by status asc,-sort_development desc,create_time desc
     </select>