Merge branch 'master' into docker_package

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<AttrEntity> 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<Map<String, Object>> pageData = new PageData<>(mapList, page.getTotal());