Commit 69b0d5ad authored by zhaochengming's avatar zhaochengming

应用bug修改

parent 25c925a5
...@@ -8,7 +8,7 @@ import java.sql.Timestamp; ...@@ -8,7 +8,7 @@ import java.sql.Timestamp;
/** /**
* 分页查询dto * 分页查询dto
*/ */
public class PageGroupDto extends PageParam { public class PageGroupDto{
@ApiModelProperty("主键ID") @ApiModelProperty("主键ID")
...@@ -57,6 +57,29 @@ public class PageGroupDto extends PageParam { ...@@ -57,6 +57,29 @@ public class PageGroupDto extends PageParam {
@ApiModelProperty("模糊查询字段") @ApiModelProperty("模糊查询字段")
private String keyword; 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() { public String getKeyword() {
return keyword; return keyword;
} }
......
...@@ -60,6 +60,19 @@ public class OcpApiGroup { ...@@ -60,6 +60,19 @@ public class OcpApiGroup {
@ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ") @ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ")
private String apiGroupLevel; 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() { public String getApiGroupLevel() {
return apiGroupLevel; return apiGroupLevel;
} }
......
...@@ -91,6 +91,9 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper, OcpApiG ...@@ -91,6 +91,9 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper, OcpApiG
if ("sys_center".equals(ocpApiGroup.getApiGroupLevel())) { if ("sys_center".equals(ocpApiGroup.getApiGroupLevel())) {
ocpApiGroup.setApiGroupLevel("api_group"); ocpApiGroup.setApiGroupLevel("api_group");
} }
if (StringUtils.isBlank(ocpApiGroup.getApiGroupLevel())){
ocpApiGroup.setApiGroupLevel("Middleground");
}
mapper.insert(ocpApi); mapper.insert(ocpApi);
} else { } else {
return ocpApi; return ocpApi;
...@@ -158,7 +161,7 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper, OcpApiG ...@@ -158,7 +161,7 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper, OcpApiG
*/ */
@Override @Override
public Page<OcpApiGroup> getOnePages(PageGroupDto pageGroupDto) { public Page<OcpApiGroup> getOnePages(PageGroupDto pageGroupDto) {
Page pageInfo = new Page(pageGroupDto.getPageNum(), pageGroupDto.getPageSize()); Page<OcpApiGroup> pageInfo = new Page(pageGroupDto.getCurrentPage(), pageGroupDto.getPageSize());
LambdaQueryWrapper<OcpApiGroup> qw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OcpApiGroup> qw = new LambdaQueryWrapper<>();
if (StringUtils.isBlank(pageGroupDto.getKeyword())) { if (StringUtils.isBlank(pageGroupDto.getKeyword())) {
if (StringUtils.isBlank(pageGroupDto.getApiGroupCode())){ if (StringUtils.isBlank(pageGroupDto.getApiGroupCode())){
...@@ -167,8 +170,15 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper, OcpApiG ...@@ -167,8 +170,15 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper, OcpApiG
} else if(!(StringUtils.isNotBlank(pageGroupDto.getApiGroupPcode()))){ } else if(!(StringUtils.isNotBlank(pageGroupDto.getApiGroupPcode()))){
List<OcpApiGroup> ocpApiGroups = mapper.selectLists(pageGroupDto.getApiGroupPromotionType(), pageGroupDto.getApiGroupCode()); List<OcpApiGroup> 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.setRecords(ocpApiGroups);
pageInfo.setTotal(ocpApiGroups.size()); mapper.selectPage(pageInfo,qw);
List<OcpApiGroup> records = pageInfo.getRecords();
for (OcpApiGroup record : records) {
OcpApiGroup ocpApiGroup = mapper.selectCode(record.getApiGroupPcode());
record.setClassIfy(ocpApiGroup.getApiGroupName());
}
} }
} else if(StringUtils.isNotBlank(pageGroupDto.getKeyword())){ } else if(StringUtils.isNotBlank(pageGroupDto.getKeyword())){
...@@ -176,6 +186,9 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper, OcpApiG ...@@ -176,6 +186,9 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper, OcpApiG
.and(c->c.eq(OcpApiGroup::getApiGroupPcode, pageGroupDto.getApiGroupCode())); .and(c->c.eq(OcpApiGroup::getApiGroupPcode, pageGroupDto.getApiGroupCode()));
mapper.selectPage(pageInfo, ocpTenantGroupLambdaQueryWrapper); mapper.selectPage(pageInfo, ocpTenantGroupLambdaQueryWrapper);
} }
return pageInfo; return pageInfo;
} }
} }
......
...@@ -173,20 +173,14 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup> ...@@ -173,20 +173,14 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
OcpTenantGroup ocpTenantGroup = tenantMapper.selectGroupCode(tenantGroupCode); OcpTenantGroup ocpTenantGroup = tenantMapper.selectGroupCode(tenantGroupCode);
Page<OcpTenantGroup> page = new Page<>(currentPage, pageSize); Page<OcpTenantGroup> page = new Page<>(currentPage, pageSize);
if (StringUtils.isBlank(keyword)) { if (StringUtils.isBlank(keyword)) {
if ("".equals(lev) || "1".equals(lev)) { if (StringUtils.isBlank(lev) || "1".equals(lev) ) {
LambdaQueryWrapper<OcpTenantGroup> eq = qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode); LambdaQueryWrapper<OcpTenantGroup> eq = qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode);
tenantMapper.selectPage(page, eq); tenantMapper.selectPage(page, eq);
} else if ("2".equals(lev) || "3".equals(lev)) { } else if ("2".equals(lev) || "3".equals(lev)) {
LambdaQueryWrapper<OcpTenantGroup> eq = qw.or(wq -> wq.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode)).eq(OcpTenantGroup::getTenantGroupPcode, tenantGroupCode);
List<OcpTenantGroup> ocpTenantGroupList = tenantMapper.selectTenantGroupsList(tenantGroupCode, tenantGroupCompanyCode); tenantMapper.selectPage(page,eq);
for (OcpTenantGroup tenantGroup : ocpTenantGroupList) {
String tenantGroupCode1 = tenantGroup.getTenantGroupCode();
OcpTenantGroup ocpTenantGroup1 = tenantMapper.selectGroupName(tenantGroupCode1);
tenantGroup.setClassIfy(ocpTenantGroup1.getTenantGroupName());
}
// LambdaQueryWrapper<OcpTenantGroup> eq = qw.or(wq -> wq.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode)).eq(OcpTenantGroup::getTenantGroupPcode, tenantGroupCode);
page.setRecords(ocpTenantGroupList);
} }
} else if (!(StringUtils.isBlank(keyword))) { } else if (!(StringUtils.isBlank(keyword))) {
LambdaQueryWrapper<OcpTenantGroup> ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.like(OcpTenantGroup::getTenantGroupCompanyCode, keyword)) LambdaQueryWrapper<OcpTenantGroup> ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.like(OcpTenantGroup::getTenantGroupCompanyCode, keyword))
...@@ -201,7 +195,14 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup> ...@@ -201,7 +195,14 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
// page.setRecords(ocpTenantGroupList); // page.setRecords(ocpTenantGroupList);
// page.setTotal(ocpTenantGroupList.size()); // page.setTotal(ocpTenantGroupList.size());
} }
if (StringUtils.isBlank(page.toString())) {
List<OcpTenantGroup> records = page.getRecords();
for (OcpTenantGroup record : records) {
String tenantGroupCode1 = record.getTenantGroupName();
OcpTenantGroup ocpTenantGroup1 = tenantMapper.selectGroupName(tenantGroupCode1);
record.setClassIfy(ocpTenantGroup1.getTenantGroupName());
}
}
return page; return page;
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<select id="selectGroups" resultType="com.pms.ocp.model.entity.OcpTenantGroup"> <select id="selectGroups" resultType="com.pms.ocp.model.entity.OcpTenantGroup">
SELECT * FROM ocp_tenant_group WHERE tenant_group_company_code = #{tenantGroupCompanyCode}; SELECT * FROM ocp_tenant_group WHERE tenant_group_company_code = #{tenantGroupCompanyCode} and tenant_group_pcode = '';
</select> </select>
<!-- 根据创建公司和分类名称获取集合--> <!-- 根据创建公司和分类名称获取集合-->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment