From 69b0d5adb74d3088ea56666b0d0330be090bcd9e Mon Sep 17 00:00:00 2001 From: zhaochengming <18706295423@163.com> Date: Thu, 24 Mar 2022 16:53:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/pms/ocp/model/dto/PageGroupDto.java | 25 ++++++++++++++++++- .../com/pms/ocp/model/entity/OcpApiGroup.java | 13 ++++++++++ .../service/impl/OcpApiTreeServiceImpl.java | 17 +++++++++++-- .../ocp/service/impl/TenantServiceImpl.java | 23 +++++++++-------- src/main/resources/mapper/OcpTenantGroup.xml | 2 +- 5 files changed, 65 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/pms/ocp/model/dto/PageGroupDto.java b/src/main/java/com/pms/ocp/model/dto/PageGroupDto.java index b48ed5f..fd6d316 100644 --- a/src/main/java/com/pms/ocp/model/dto/PageGroupDto.java +++ b/src/main/java/com/pms/ocp/model/dto/PageGroupDto.java @@ -8,7 +8,7 @@ import java.sql.Timestamp; /** * 分页查询dto */ -public class PageGroupDto extends PageParam { +public class PageGroupDto{ @ApiModelProperty("主键ID") @@ -57,6 +57,29 @@ public class PageGroupDto extends PageParam { @ApiModelProperty("模糊查询字段") private String keyword; + + @ApiModelProperty("分页条数") + private int currentPage; + + @ApiModelProperty("分页树") + private int pageSize; + + public int getCurrentPage() { + return currentPage; + } + + public void setCurrentPage(int currentPage) { + this.currentPage = currentPage; + } + + public int getPageSize() { + return pageSize; + } + + public void setPageSize(int pageSize) { + this.pageSize = pageSize; + } + public String getKeyword() { return keyword; } diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java b/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java index d306c59..29f1e75 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java @@ -60,6 +60,19 @@ public class OcpApiGroup { @ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ") private String apiGroupLevel; + + @ApiModelProperty("上级分类名称") + @TableField(exist = false) + private String classIfy; + + public String getClassIfy() { + return classIfy; + } + + public void setClassIfy(String classIfy) { + this.classIfy = classIfy; + } + public String getApiGroupLevel() { return apiGroupLevel; } diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java index ebcdeed..e63eda1 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java @@ -91,6 +91,9 @@ public class OcpApiTreeServiceImpl extends ServiceImpl getOnePages(PageGroupDto pageGroupDto) { - Page pageInfo = new Page(pageGroupDto.getPageNum(), pageGroupDto.getPageSize()); + Page pageInfo = new Page(pageGroupDto.getCurrentPage(), pageGroupDto.getPageSize()); LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); if (StringUtils.isBlank(pageGroupDto.getKeyword())) { if (StringUtils.isBlank(pageGroupDto.getApiGroupCode())){ @@ -167,8 +170,15 @@ public class OcpApiTreeServiceImpl extends ServiceImpl ocpApiGroups = mapper.selectLists(pageGroupDto.getApiGroupPromotionType(), pageGroupDto.getApiGroupCode()); + qw.eq(OcpApiGroup::getApiGroupPromotionType,pageGroupDto.getApiGroupPromotionType()).and(c->c.eq(OcpApiGroup::getApiGroupPcode,pageGroupDto.getApiGroupCode())); pageInfo.setRecords(ocpApiGroups); - pageInfo.setTotal(ocpApiGroups.size()); + mapper.selectPage(pageInfo,qw); + List records = pageInfo.getRecords(); + for (OcpApiGroup record : records) { + OcpApiGroup ocpApiGroup = mapper.selectCode(record.getApiGroupPcode()); + record.setClassIfy(ocpApiGroup.getApiGroupName()); + } + } } else if(StringUtils.isNotBlank(pageGroupDto.getKeyword())){ @@ -176,6 +186,9 @@ public class OcpApiTreeServiceImpl extends ServiceImplc.eq(OcpApiGroup::getApiGroupPcode, pageGroupDto.getApiGroupCode())); mapper.selectPage(pageInfo, ocpTenantGroupLambdaQueryWrapper); } + + + return pageInfo; } } diff --git a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java index 68648c2..b3cbf9a 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java @@ -173,20 +173,14 @@ public class TenantServiceImpl extends ServiceImpl OcpTenantGroup ocpTenantGroup = tenantMapper.selectGroupCode(tenantGroupCode); Page page = new Page<>(currentPage, pageSize); + if (StringUtils.isBlank(keyword)) { - if ("".equals(lev) || "1".equals(lev)) { + if (StringUtils.isBlank(lev) || "1".equals(lev) ) { LambdaQueryWrapper eq = qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode); tenantMapper.selectPage(page, eq); } else if ("2".equals(lev) || "3".equals(lev)) { - - List ocpTenantGroupList = tenantMapper.selectTenantGroupsList(tenantGroupCode, tenantGroupCompanyCode); - for (OcpTenantGroup tenantGroup : ocpTenantGroupList) { - String tenantGroupCode1 = tenantGroup.getTenantGroupCode(); - OcpTenantGroup ocpTenantGroup1 = tenantMapper.selectGroupName(tenantGroupCode1); - tenantGroup.setClassIfy(ocpTenantGroup1.getTenantGroupName()); - } -// LambdaQueryWrapper eq = qw.or(wq -> wq.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode)).eq(OcpTenantGroup::getTenantGroupPcode, tenantGroupCode); - page.setRecords(ocpTenantGroupList); + LambdaQueryWrapper eq = qw.or(wq -> wq.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode)).eq(OcpTenantGroup::getTenantGroupPcode, tenantGroupCode); + tenantMapper.selectPage(page,eq); } } else if (!(StringUtils.isBlank(keyword))) { LambdaQueryWrapper ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.like(OcpTenantGroup::getTenantGroupCompanyCode, keyword)) @@ -201,7 +195,14 @@ public class TenantServiceImpl extends ServiceImpl // page.setRecords(ocpTenantGroupList); // page.setTotal(ocpTenantGroupList.size()); } - + if (StringUtils.isBlank(page.toString())) { + List records = page.getRecords(); + for (OcpTenantGroup record : records) { + String tenantGroupCode1 = record.getTenantGroupName(); + OcpTenantGroup ocpTenantGroup1 = tenantMapper.selectGroupName(tenantGroupCode1); + record.setClassIfy(ocpTenantGroup1.getTenantGroupName()); + } + } return page; diff --git a/src/main/resources/mapper/OcpTenantGroup.xml b/src/main/resources/mapper/OcpTenantGroup.xml index 9aeb10d..1b48a75 100644 --- a/src/main/resources/mapper/OcpTenantGroup.xml +++ b/src/main/resources/mapper/OcpTenantGroup.xml @@ -25,7 +25,7 @@ -- 2.26.0