From cc661b2aedd6c7c80e85c45c9ffb90381370d047 Mon Sep 17 00:00:00 2001 From: zhuyulei <1843199800@qq.com> Date: Mon, 15 Jan 2024 16:18:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E7=94=A8=E5=B9=B3=E5=8F=B0=E5=85=AC?= =?UTF-8?q?=E5=BC=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enterprise/domain/dto/DisclosureDto.java | 4 +++ .../mapper/BsSgcYxjdQualificationsMapper.java | 10 +++++- .../BsSgcYxjdEnterpriseInfoService.java | 14 ++++++-- .../BsSgcYxjdQualificationsMapper.xml | 35 +++++++++++++++++-- 4 files changed, 58 insertions(+), 5 deletions(-) diff --git a/jwtech-system/src/main/java/com/kms/enterprise/domain/dto/DisclosureDto.java b/jwtech-system/src/main/java/com/kms/enterprise/domain/dto/DisclosureDto.java index 061784a9..cf05cdcd 100644 --- a/jwtech-system/src/main/java/com/kms/enterprise/domain/dto/DisclosureDto.java +++ b/jwtech-system/src/main/java/com/kms/enterprise/domain/dto/DisclosureDto.java @@ -15,4 +15,8 @@ public class DisclosureDto implements Serializable { private int pageSize; + private String enterpriseName; + + private String adcd; + } diff --git a/jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdQualificationsMapper.java b/jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdQualificationsMapper.java index 3a3babb9..48065223 100644 --- a/jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdQualificationsMapper.java +++ b/jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdQualificationsMapper.java @@ -24,5 +24,13 @@ public interface BsSgcYxjdQualificationsMapper extends BaseMapper listTwo(@Param("pageNum") int pageNum, @Param("pageSize") int pageSize, - @Param("qualificationCategory") String qualificationCategory); + @Param("qualificationCategory") String qualificationCategory, + @Param("enterpriseName") String enterpriseName, + @Param("adcd") String adcd); + + List listThree(@Param("pageNum") int pageNum, + @Param("pageSize") int pageSize, + @Param("qualificationCategory") String qualificationCategory, + @Param("enterpriseName") String enterpriseName, + @Param("adcd") String adcd); } diff --git a/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java b/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java index 5a9d6a18..97417e01 100644 --- a/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java +++ b/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java @@ -1,5 +1,6 @@ package com.kms.enterprise.service; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -84,8 +85,17 @@ public class BsSgcYxjdEnterpriseInfoService extends BaseService list = bsSgcYxjdQualificationsMapper.listByOne(); return AjaxResult.success(list); } else { - List page = bsSgcYxjdQualificationsMapper.listTwo(dto.getPageNum(),dto.getPageSize(),dto.getQualificationCategory()); - return AjaxResult.success(page); + if (dto.getAdcd()!=null && dto.equals("省外")) { + dto.setAdcd("44"); + List page = bsSgcYxjdQualificationsMapper.listThree(dto.getPageNum(),dto.getPageSize(),dto.getQualificationCategory(), + dto.getEnterpriseName(),dto.getAdcd()); + return AjaxResult.success(page); + }else { + List page = bsSgcYxjdQualificationsMapper.listTwo(dto.getPageNum(),dto.getPageSize(),dto.getQualificationCategory(), + dto.getEnterpriseName(),dto.getAdcd()); + return AjaxResult.success(page); + } + } } } diff --git a/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdQualificationsMapper.xml b/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdQualificationsMapper.xml index ae9d59e5..98c704e2 100644 --- a/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdQualificationsMapper.xml +++ b/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdQualificationsMapper.xml @@ -53,8 +53,39 @@ FROM bs_sgc_yxjd_qualifications q LEFT JOIN bs_sgc_yxjd_enterprise_info i ON q.enterprise_id = i.id - WHERE - ISNULL( q.parent_id ) + + ISNULL( q.parent_id ) + + AND enterprise_name like concat('%',#{enterpriseName},'%') + + + AND adcd =#{adcd} + + + AND q.qualification_category = #{qualificationCategory} + ORDER BY + CAST( dynamic_credit_score AS UNSIGNED ) DESC LIMIT #{pageNum},#{pageSize}; + +