Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

组织分页添加套餐名称字段

Browse Source
This commit is contained in:
yangsb
2024-04-25 15:48:03 +08:00
parent 6caedb1e81
commit b73028b192
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/OrganController.java
+16 -2
View File
@@ -98,7 +98,10 @@ public class OrganController {
@PreAuthorize("@ss.hasPermission('system:organ:query')")
public CommonResult<OrganRespVO> getOrgan(@RequestParam("id") Long id) {
OrganizationDO organ = organService.getOrgan(id);
return success(BeanUtils.toBean(organ, OrganRespVO.class));
TenantPackageDO tenantPackageDO = tenantPackageMapper.selectById(organ.getPackageId());
OrganRespVO bean = BeanUtils.toBean(organ, OrganRespVO.class);
bean.setPackageName(Objects.isNull(tenantPackageDO)? "": tenantPackageDO.getName());
return success(bean);
}
@GetMapping("/page")
@@ -106,7 +109,18 @@ public class OrganController {
@PreAuthorize("@ss.hasPermission('system:organ:query')")
public CommonResult<PageResult<OrganRespVO>> getOrganPage(@Valid OrganPageReqVO pageVO) {
PageResult<OrganizationDO> pageResult = organService.getOrganPage(pageVO);
return success(BeanUtils.toBean(pageResult, OrganRespVO.class));
PageResult<OrganRespVO> bean = BeanUtils.toBean(pageResult, OrganRespVO.class);
Set<Long> packageIds = bean.getList().stream().map(OrganRespVO::getPackageId).collect(Collectors.toSet());
List<TenantPackageDO> tenantPackageDOS = tenantPackageMapper.selectBatchIds(packageIds);
bean.getList().forEach(e->{
e.setPackageName(tenantPackageDOS.stream()
.filter(f->Objects.equals(f.getId(), e.getPackageId()))
.map(TenantPackageDO::getName)
.findAny()
.orElse("")
);
});
return success(bean);
}
@GetMapping("/export-excel")
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganRespVO.java
+3
View File
@@ -42,6 +42,9 @@ public class OrganRespVO {
@Schema(description = "组织套餐编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Long packageId;
@Schema(description = "组织套餐名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private String packageName;
@Schema(description = "过期时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime expireTime;