From 54333ea1d31722d769e4bf2f07a3cc35b4e0d08e Mon Sep 17 00:00:00 2001 From: wangliwen Date: Tue, 10 Jan 2023 14:53:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E8=B5=84=E6=BA=90=E5=88=86?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TAbilityApplicationController.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java index e86cc3c0..f137fb45 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java @@ -26,6 +26,7 @@ import io.renren.modules.processForm.excel.TAbilityApplicationExcel; import io.renren.modules.processForm.service.TAbilityApplicationService; import io.renren.modules.reminders.service.TRemindersService; import io.renren.modules.resource.dto.ResourceDTO; +import io.renren.modules.resource.entity.AttrEntity; import io.renren.modules.resource.excel.census.config.CustomCellWriteHeightConfig; import io.renren.modules.resource.excel.census.config.CustomCellWriteWeightConfig; import io.renren.modules.resource.service.ResourceService; @@ -802,6 +803,15 @@ public class TAbilityApplicationController { temp.put("createDate", index.getCreateDate()); temp.put("system", index.getSystem()); temp.put("resourceId", index.getResourceId()); + ResourceDTO resourceDTO = resourceService.get(Long.parseLong(index.getResourceId())); + if ("应用资源".equals(resourceDTO.getType())) { + temp.put("resourceTYpe", "应用资源"); + } else if ("组件服务".equals(resourceDTO.getType())) { + Optional optional = resourceDTO.getInfoList().stream().filter(index_ -> "组件类型".equals(index_.getAttrType())).findFirst(); + if (optional.isPresent()) { + temp.put("resourceTYpe", optional.get().getAttrValue()); + } + } return temp; }).collect(Collectors.toList()); PageData> pageData = new PageData<>(mapList, page.getTotal());