首页添加组织机构过滤

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

+package com.lyy.admin.DTO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author:yaobaizheng
+ * @version: 1.0
+ * @Date: 2023/11/22 14:36
+ * @Description: 立业人首页参数
+ */
+@Data
+@ApiModel(value = "立业人首页参数", description = "")
+public class LyrHomePageDto {
+    /** 区域 */
+    @ApiModelProperty(value = "区域")
+    private String areaName;
+    /** 组织机构 */
+    @ApiModelProperty(value = "组织机构", notes = "")
+    private String organization;
+
+    @ApiModelProperty(hidden = true)
+    private List<String> organizationList;
+
+}

src/main/java/com/lyy/admin/controller/api/ApiController.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageInfo;
 import com.lyy.admin.DTO.CarrierPageDto;
 import com.lyy.admin.DTO.LandPageDto;
+import com.lyy.admin.DTO.LyrHomePageDto;
 import com.lyy.admin.VO.*;
 import com.lyy.admin.VO.sms.SendPhoneVo;
 import com.lyy.admin.common.anno.Decrypt;
@@ -20,6 +21,7 @@ import com.lyy.admin.domain.parkinfo.ParkInfo;
 import com.lyy.admin.domain.parkinfo.ParkInfoParam;
 import com.lyy.admin.enumerate.DevelopmentStatusEnum;
 import com.lyy.admin.enumerate.ExamineStatusEnum;
+import com.lyy.admin.enumerate.OrganizationEnum;
 import com.lyy.admin.enumerate.ParkInfoEnum;
 import com.lyy.admin.service.carrierinfo.CarrierInfoService;
 import com.lyy.admin.service.developmentinfo.DevelopmentIndustrialLandInfoService;
@@ -37,6 +39,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -185,45 +188,66 @@ public class ApiController extends BaseController {
 
     @GetMapping("/getHomePage")
     @ApiOperation(value = "园区总数、开发区总数、土地总数、载体总数、、热点园区", notes = "")
-    @ApiImplicitParam(name = "area", value = "所选区域名称", type = "String", readOnly = true)
-    public LyrHomePageVo getHomePage(String areaName) {
+    public LyrHomePageVo getHomePage(LyrHomePageDto lyrHomePageDto) {
         LyrHomePageVo homePageVO = new LyrHomePageVo();
+        String areaName = lyrHomePageDto.getAreaName();
+        String organization = lyrHomePageDto.getOrganization();
 
         long parkInfoCount = 91532l;
-        if (StringUtils.isNotBlank(areaName)) {
+        if (StringUtils.isNotBlank(areaName) || StringUtils.isNotBlank(organization)) {
             QueryWrapper<ParkInfo> piQW = new QueryWrapper<>();
-            piQW.and(
-                    w -> w.eq("city_name", areaName)
-                            .or().eq("region_name", areaName)
-                            .or().eq("province_name", areaName)
-            );
+            if (StringUtils.isNotBlank(areaName)) {
+                piQW.and(
+                        w -> w.eq("city_name", areaName)
+                                .or().eq("region_name", areaName)
+                                .or().eq("province_name", areaName)
+                );
+            }
+            if (StringUtils.isNotBlank(organization)) {
+                String nameByCode = OrganizationEnum.getNameByCode(organization);
+                if(organization.equals(OrganizationEnum.SCF.getCode())){
+                    piQW.in("organization", nameByCode.split(";"));
+                }
+            }
             piQW.in("status", ParkInfoEnum.STATUS_YRZ.getCode(),ParkInfoEnum.STATUS_DRZ.getCode());
             parkInfoCount = parkInfoService.count(piQW);
         }
         homePageVO.setParkInfoCount(parkInfoCount);
 
         long developmentInfoCount = 2634l;
-        if (StringUtils.isNotBlank(areaName)) {
+        if (StringUtils.isNotBlank(areaName) || StringUtils.isNotBlank(organization)) {
             QueryWrapper<DevelopmentInfo> diQW = new QueryWrapper<>();
-            diQW.and(
-                    w -> w.eq("city_name", areaName)
-                            .or().eq("region_name", areaName)
-                            .or().eq("province_name", areaName)
-            );
+            if (StringUtils.isNotBlank(areaName)) {
+                diQW.and(
+                        w -> w.eq("city_name", areaName)
+                                .or().eq("region_name", areaName)
+                                .or().eq("province_name", areaName)
+                );
+            }
+            if (StringUtils.isNotBlank(organization)) {
+                String nameByCode = OrganizationEnum.getNameByCode(organization);
+                if(organization.equals(OrganizationEnum.SCF.getCode())){
+                    diQW.in("organization", nameByCode.split(";"));
+                }
+            }
             diQW.in("status", DevelopmentStatusEnum.STATUS_YRZ.getCode(),DevelopmentStatusEnum.STATUS_DRZ.getCode());
             developmentInfoCount = developmentInfoService.count(diQW);
         }
         homePageVO.setDevelopmentInfoCount(developmentInfoCount);
 
         long carrirInfoCount = 11304;
-        if (StringUtils.isNotBlank(areaName)) {
-            carrirInfoCount = carrierInfoService.count(areaName);
+        if (StringUtils.isNotBlank(areaName) || StringUtils.isNotBlank(organization)) {
+            String nameByCode = OrganizationEnum.getNameByCode(organization);
+            if(organization.equals(OrganizationEnum.SCF.getCode())){
+                lyrHomePageDto.setOrganizationList(Arrays.asList(nameByCode.split(";")));
+            }
+            carrirInfoCount = carrierInfoService.count(lyrHomePageDto);
         }
         homePageVO.setCarrirInfoCount(carrirInfoCount);
 
         long landInfoCount = 8657;
-        if (StringUtils.isNotBlank(areaName)) {
-            landInfoCount = landInfoService.count(areaName);
+        if (StringUtils.isNotBlank(areaName)|| StringUtils.isNotBlank(organization)) {
+            landInfoCount = landInfoService.count(lyrHomePageDto);
         }
         homePageVO.setLandInfoCount(landInfoCount);
 

src/main/java/com/lyy/admin/mapper/carrierinfo/CarrierInfoMapper.java

@@ -2,6 +2,7 @@ package com.lyy.admin.mapper.carrierinfo;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.lyy.admin.DTO.CarrierPageDto;
+import com.lyy.admin.DTO.LyrHomePageDto;
 import com.lyy.admin.VO.CarrierPageVo;
 import com.lyy.admin.domain.carrierinfo.CarrierInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -22,7 +23,7 @@ public interface CarrierInfoMapper extends BaseMapper<CarrierInfo> {
 
     List<CarrierPageVo> pageList(@Param("param") CarrierPageDto carrierPageDto);
 
-    Long count(String areaName);
+    Long count(LyrHomePageDto lyrHomePageDto);
 
 }
 

src/main/java/com/lyy/admin/mapper/developmentinfo/DevelopmentIndustrialLandInfoMapper.java

@@ -2,6 +2,7 @@ package com.lyy.admin.mapper.developmentinfo;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.lyy.admin.DTO.LandPageDto;
+import com.lyy.admin.DTO.LyrHomePageDto;
 import com.lyy.admin.VO.LandPageVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.lyy.admin.domain.developmentinfo.LandInfoEntity;
@@ -17,7 +18,7 @@ import java.util.List;
 */
 public interface DevelopmentIndustrialLandInfoMapper extends BaseMapper<LandInfoEntity> {
 
-    Long count(String areaName);
+    Long count(LyrHomePageDto lyrHomePageDto);
 
     List<LandPageVo> pageList( @Param("param") LandPageDto condition);
 }

src/main/java/com/lyy/admin/service/carrierinfo/CarrierInfoService.java

 package com.lyy.admin.service.carrierinfo;
 
 import com.lyy.admin.DTO.CarrierPageDto;
+import com.lyy.admin.DTO.LyrHomePageDto;
 import com.lyy.admin.VO.CarrierDetailVo;
 import com.lyy.admin.VO.CarrierPageVo;
 import com.lyy.admin.domain.carrierinfo.CarrierInfo;
@@ -22,5 +23,5 @@ public interface CarrierInfoService extends IService<CarrierInfo> {
 
     CarrierDetailVo detail(Integer id);
 
-    Long count(String areaName);
+    Long count(LyrHomePageDto lyrHomePageDto);
 }

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

@@ -6,6 +6,7 @@ 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.lyy.admin.DTO.CarrierPageDto;
+import com.lyy.admin.DTO.LyrHomePageDto;
 import com.lyy.admin.VO.*;
 import com.lyy.admin.common.constant.RedisConstants;
 import com.lyy.admin.common.utils.DataUtil;
@@ -164,8 +165,8 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
     }
 
     @Override
-    public Long count(String areaName) {
-        return this.baseMapper.count(areaName);
+    public Long count(LyrHomePageDto lyrHomePageDto) {
+        return this.baseMapper.count(lyrHomePageDto);
     }
 }
 

src/main/java/com/lyy/admin/service/developmentinfo/DevelopmentIndustrialLandInfoService.java

@@ -2,6 +2,7 @@ package com.lyy.admin.service.developmentinfo;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.lyy.admin.DTO.LandPageDto;
+import com.lyy.admin.DTO.LyrHomePageDto;
 import com.lyy.admin.VO.LandDetailVo;
 import com.lyy.admin.VO.LandPageVo;
 import com.lyy.admin.domain.developmentinfo.LandInfoEntity;
@@ -19,7 +20,7 @@ public interface DevelopmentIndustrialLandInfoService extends IService<LandInfoE
 
     List<LandInfoEntity> listByParam(LandInfoParam landInfoParam);
 
-    Long count(String areaName);
+    Long count(LyrHomePageDto lyrHomePageDto);
 
     public List<LandPageVo> pageList(LandPageDto landPageDto);
 

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

@@ -6,6 +6,7 @@ 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.lyy.admin.DTO.LandPageDto;
+import com.lyy.admin.DTO.LyrHomePageDto;
 import com.lyy.admin.VO.CarrierInvestmentVo;
 import com.lyy.admin.VO.LandDetailDevelopment;
 import com.lyy.admin.VO.LandDetailVo;
@@ -67,8 +68,8 @@ public class DevelopmentIndustrialLandInfoServiceImpl extends ServiceImpl<Develo
     }
 
     @Override
-    public Long count(String areaName) {
-        return this.baseMapper.count(areaName);
+    public Long count(LyrHomePageDto lyrHomePageDto) {
+        return this.baseMapper.count(lyrHomePageDto);
     }
 
 

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

@@ -136,7 +136,7 @@
         order by a.create_time desc
     </select>
 
-    <select id="count" resultType="Long">
+    <select id="count" parameterType="com.lyy.admin.DTO.LyrHomePageDto" resultType="Long">
         select count(1) from carrier_info ci left join park_info pi on ci.park_id = pi.id
         <where>
             <if test="areaName != null and areaName != ''">
@@ -144,6 +144,12 @@
                           or pi.city_name=#{areaName}
                           or pi.region_name=#{areaName} )
             </if>
+            <if test="organizationList != null and organizationList.size() > 0">
+                AND pi.organization in
+                <foreach item="item" collection="organizationList" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
     </select>
 </mapper>

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

@@ -46,7 +46,7 @@
         output_value,invest_num,tax_revenue,construction_cycle,energy_require,version,create_by,create_time,update_by,update_time
     </sql>
 
-    <select id="count" resultType="Long">
+    <select id="count" parameterType="com.lyy.admin.DTO.LyrHomePageDto" resultType="Long">
         select count(1) from development_industrial_land_info dili left join development_info di on dili.development_id = di.id
         <where>
             <if test="areaName != null and areaName != ''">
@@ -54,6 +54,12 @@
                 or di.city_name=#{areaName}
                 or di.region_name=#{areaName} )
             </if>
+            <if test="organizationList != null and organizationList.size() > 0">
+                AND di.organization in
+                <foreach item="item" collection="organizationList" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
     </select>