立业人接口添加筛选项

src/main/java/com/lyy/admin/DTO/CarrierPageDto.java

@@ -71,6 +71,11 @@ public class CarrierPageDto {
   @ApiModelProperty(value = "柱距")
   private String pillarDistance;
 
+  @ApiModelProperty(value = "所属机构:幸福产城  幸福蓝线  深产发")
+  private String organization;
+
+  @ApiModelProperty(hidden = true)
+  private List<String> organizationList;
 
   @ApiModelProperty(hidden = true)
   private Double lowCarrierArea;

src/main/java/com/lyy/admin/DTO/LandPageDto.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
+import java.util.List;
+
 /**
  * @Author:zhouxudong
  * @version: 1.0
@@ -49,6 +51,12 @@ public class LandPageDto {
     @ApiModelProperty("所属开发区id")
     private Integer developmentId;
 
+    @ApiModelProperty(value = "所属机构:幸福产城  幸福蓝线  深产发")
+    private String organization;
+
+    @ApiModelProperty(hidden = true)
+    private List<String> organizationList;
+
     @ApiModelProperty(hidden = true)
     private Double lowPrice;
 

src/main/java/com/lyy/admin/common/config/ResourceConfig.java

@@ -52,9 +52,9 @@ public class ResourceConfig implements WebMvcConfigurer {
             String[] excludePatterns = (String[]) ArrayUtils.addAll(excludeSwagger, excludeUrl);
 
             System.out.println("自定义拦截器#############################################");
-            registry.addInterceptor(loginInterceptor)
-                    .addPathPatterns("/**")
-                    .excludePathPatterns(excludePatterns);
+//            registry.addInterceptor(loginInterceptor)
+//                    .addPathPatterns("/**")
+//                    .excludePathPatterns(excludePatterns);
         }
     }
 

src/main/java/com/lyy/admin/domain/developmentinfo/DevelopmentInfoParam.java

@@ -121,6 +121,9 @@ public class DevelopmentInfoParam implements Serializable {
     @ApiModelProperty(value = "认证状态（1-未认证；2-认证中；3-已认证；4-未通过；5-待认证；9-已作废）")
     private String status;
 
+    @ApiModelProperty(value = "所属机构:幸福产城  幸福蓝线  深产发")
+    private String organization;
+
     @ApiModelProperty(hidden = true)
     private static final long serialVersionUID = 1L;
 

src/main/java/com/lyy/admin/domain/parkinfo/ParkInfoParam.java

@@ -132,6 +132,9 @@ public class ParkInfoParam implements Serializable {
     @ApiModelProperty(hidden = true)
     private Integer type;
 
+    @ApiModelProperty(value = "所属机构:幸福产城  幸福蓝线  深产发")
+    private String organization;
+
     @ApiModelProperty(hidden = true)
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

src/main/java/com/lyy/admin/enumerate/OrganizationEnum.java

+package com.lyy.admin.enumerate;
+
+public enum OrganizationEnum {
+
+    SCF("深产发","华夏幸福,产业新城;华夏幸福,深产发"),
+    XFCC("幸福产城","华夏幸福,幸福产城"),
+    XFLX("幸福蓝线","华夏幸福,幸福蓝线");
+    private String code;
+    private String name;
+
+    OrganizationEnum(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public static String getNameByCode(String code){
+        for (OrganizationEnum bt: values()){
+            if (bt.code.equals(code)){
+                return bt.name;
+            }
+        }
+        return null;
+    }
+    public String getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+}

src/main/java/com/lyy/admin/service/carrierinfo/impl/CarrierInfoServiceImpl.java

@@ -17,6 +17,7 @@ import com.lyy.admin.domain.parkinfo.ParkInfo;
 import com.lyy.admin.domain.system.SysDictDataEntity;
 import com.lyy.admin.enumerate.CarouselTypeEnum;
 import com.lyy.admin.enumerate.DictCodeEnum;
+import com.lyy.admin.enumerate.OrganizationEnum;
 import com.lyy.admin.service.carrierinfo.CarrierInfoService;
 import com.lyy.admin.mapper.carrierinfo.CarrierInfoMapper;
 import com.lyy.admin.service.parkinfo.ParkInfoService;
@@ -101,6 +102,13 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
             }
         }
 
+        if(StringUtils.isNotBlank(carrierPageDto.getOrganization())){
+            String nameByCode = OrganizationEnum.getNameByCode(carrierPageDto.getOrganization());
+            if(carrierPageDto.getOrganization().equals(OrganizationEnum.SCF.getCode())){
+                carrierPageDto.setOrganizationList(Arrays.asList(nameByCode.split(";")));
+            }
+        }
+
         List<CarrierPageVo> records = this.baseMapper.pageList(carrierPageDto);
         if(!CollectionUtils.isEmpty(records)){
             records.forEach(data->{

src/main/java/com/lyy/admin/service/developmentinfo/impl/DevelopmentIndustrialLandInfoServiceImpl.java

@@ -16,6 +16,7 @@ import com.lyy.admin.domain.developmentinfo.DevelopmentInfo;
 import com.lyy.admin.domain.developmentinfo.LandInfoEntity;
 import com.lyy.admin.domain.developmentinfo.LandInfoParam;
 import com.lyy.admin.enumerate.CarouselTypeEnum;
+import com.lyy.admin.enumerate.OrganizationEnum;
 import com.lyy.admin.mapper.developmentinfo.DevelopmentIndustrialLandInfoMapper;
 import com.lyy.admin.service.developmentinfo.DevelopmentIndustrialLandInfoService;
 import com.lyy.admin.service.developmentinfo.DevelopmentInfoService;
@@ -28,6 +29,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.StringJoiner;
 
@@ -89,6 +91,12 @@ public class DevelopmentIndustrialLandInfoServiceImpl extends ServiceImpl<Develo
                 condition.setHighArea(Double.valueOf(split[1]));
             }
         }
+        if(StringUtils.isNotBlank(condition.getOrganization())){
+            String nameByCode = OrganizationEnum.getNameByCode(condition.getOrganization());
+            if(condition.getOrganization().equals(OrganizationEnum.SCF.getCode())){
+                condition.setOrganizationList(Arrays.asList(nameByCode.split(";")));
+            }
+        }
         List<LandPageVo> records = this.baseMapper.pageList(condition);
         records.forEach(
                 data -> {

src/main/java/com/lyy/admin/service/developmentinfo/impl/DevelopmentInfoServiceImpl.java

@@ -160,6 +160,12 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
         if (ObjectUtils.isNotEmpty(developmentInfoParam.getUserId())) {
             developmentInfoQW.in("user_id", developmentInfoParam.getUserId());
         }
+        if (StringUtils.isNotEmpty(developmentInfoParam.getOrganization())) {
+            String nameByCode = OrganizationEnum.getNameByCode(developmentInfoParam.getOrganization());
+            if(developmentInfoParam.getOrganization().equals(OrganizationEnum.SCF.getCode())){
+                developmentInfoQW.in("organization", nameByCode.split(";"));
+            }
+        }
         developmentInfoQW.orderByAsc("status");
 
         List<DevelopmentInfo> developmentInfos = developmentInfoMapper.selectList(developmentInfoQW);

src/main/java/com/lyy/admin/service/parkinfo/impl/ParkInfoServiceImpl.java

@@ -32,6 +32,7 @@ import com.lyy.admin.service.carrierinfo.CarrierOperateInfoService;
 import com.lyy.admin.service.parkinfo.*;
 import com.lyy.admin.service.system.SysCarouselInfoService;
 import com.lyy.admin.service.system.SysMembershipInfoService;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -186,6 +187,12 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
         if (ObjectUtils.isNotEmpty(parkInfoParam.getZoneId())) {
             ParkInfoQW.eq("zone_id", parkInfoParam.getZoneId());
         }
+        if (StringUtils.isNotEmpty(parkInfoParam.getOrganization())) {
+            String nameByCode = OrganizationEnum.getNameByCode(parkInfoParam.getOrganization());
+            if(parkInfoParam.getOrganization().equals(OrganizationEnum.SCF.getCode())){
+                ParkInfoQW.in("organization", nameByCode.split(";"));
+            }
+        }
         ParkInfoQW.orderByAsc("status");
         ParkInfoQW.orderBy(true, true, "convert(name using gbk)");
 

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

@@ -126,6 +126,12 @@
             <if test="param.parkId != null and param.parkId != ''">
                 AND a.park_id = #{param.parkId}
             </if>
+            <if test="param.organizationList != null and param.organizationList.size() > 0">
+                AND b.organization in
+                <foreach item="item" collection="param.organizationList" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         order by a.create_time desc
     </select>

src/main/resources/mapper/developmentinfo/DevelopmentIndustrialLandInfoMapper.xml

@@ -118,6 +118,12 @@
             <if test="param.developmentId != null and param.developmentId != ''">
                 and dili.development_id=#{param.developmentId}
             </if>
+            <if test="param.organizationList != null and param.organizationList.size() > 0">
+                AND di.organization in
+                <foreach item="item" collection="param.organizationList" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         order by dili.create_time desc
     </select>