Compare commits
No commits in common. "29c406e2d8c7eb168c78927e80dedbce85ed2d6d" and "9a78f132ae8124d01af70360ce84bf78e5db7c2c" have entirely different histories.
29c406e2d8
...
9a78f132ae
|
@ -26,7 +26,6 @@ import io.renren.modules.processForm.excel.TAbilityApplicationExcel;
|
||||||
import io.renren.modules.processForm.service.TAbilityApplicationService;
|
import io.renren.modules.processForm.service.TAbilityApplicationService;
|
||||||
import io.renren.modules.reminders.service.TRemindersService;
|
import io.renren.modules.reminders.service.TRemindersService;
|
||||||
import io.renren.modules.resource.dto.ResourceDTO;
|
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.CustomCellWriteHeightConfig;
|
||||||
import io.renren.modules.resource.excel.census.config.CustomCellWriteWeightConfig;
|
import io.renren.modules.resource.excel.census.config.CustomCellWriteWeightConfig;
|
||||||
import io.renren.modules.resource.service.ResourceService;
|
import io.renren.modules.resource.service.ResourceService;
|
||||||
|
@ -803,15 +802,6 @@ public class TAbilityApplicationController {
|
||||||
temp.put("createDate", index.getCreateDate());
|
temp.put("createDate", index.getCreateDate());
|
||||||
temp.put("system", index.getSystem());
|
temp.put("system", index.getSystem());
|
||||||
temp.put("resourceId", index.getResourceId());
|
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;
|
return temp;
|
||||||
}).collect(Collectors.toList());
|
}).collect(Collectors.toList());
|
||||||
PageData<Map<String, Object>> pageData = new PageData<>(mapList, page.getTotal());
|
PageData<Map<String, Object>> pageData = new PageData<>(mapList, page.getTotal());
|
||||||
|
|
Loading…
Reference in New Issue