wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

部门名

This commit is contained in:
wangliwen 2022-05-24 18:14:52 +08:00
parent 381c32fd30
commit bcf940114c
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
renren-admin/src/main/java/io/renren/common/controller/CensusController.java
View File

@ -7,6 +7,8 @@ import io.renren.common.utils.Result;
import io.renren.modules.processForm.service.TAbilityApplicationService; import io.renren.modules.processForm.service.TAbilityApplicationService;
import io.renren.modules.resource.service.ResourceService; import io.renren.modules.resource.service.ResourceService;
import io.renren.modules.resourceBrowse.service.ResourceBrowseService; import io.renren.modules.resourceBrowse.service.ResourceBrowseService;
import io.renren.modules.sys.dto.SysDeptDTO;
import io.renren.modules.sys.service.SysDeptService;
import io.renren.modules.sys.service.SysUserService; import io.renren.modules.sys.service.SysUserService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@ -39,6 +41,8 @@ public class CensusController {
private TAbilityApplicationService tAbilityApplicationService; private TAbilityApplicationService tAbilityApplicationService;
@Autowired @Autowired
private ResourceBrowseService resourceBrowseService; private ResourceBrowseService resourceBrowseService;
@Autowired
private SysDeptService sysDeptService;
@Value("${census.type}") @Value("${census.type}")
private String[] censusTypes; // 需要进行统计的资源类型 private String[] censusTypes; // 需要进行统计的资源类型
@ -192,10 +196,12 @@ public class CensusController {
db.stream().flatMap(index_ -> Arrays.stream(index_.split(";"))).filter(index_ -> StringUtils.isNotEmpty(index_)).collect(Collectors.toSet()); db.stream().flatMap(index_ -> Arrays.stream(index_.split(";"))).filter(index_ -> StringUtils.isNotEmpty(index_)).collect(Collectors.toSet());
return type; return type;
}).thenAccept(type -> { }).thenAccept(type -> {
SysDeptDTO deptDTO = sysDeptService.get(deptId);
result.add(new HashMap<String, Object>() { result.add(new HashMap<String, Object>() {
{ {
put("provide", type); put("provide", type);
put("deptId", deptId); put("deptId", deptId);
put("deptName", deptDTO.getName());
} }
}); });
}); });
@ -224,10 +230,12 @@ public class CensusController {
db.stream().flatMap(index_ -> Arrays.stream(index_.split(";"))).filter(index_ -> StringUtils.isNotEmpty(index_)).collect(Collectors.toSet()); db.stream().flatMap(index_ -> Arrays.stream(index_.split(";"))).filter(index_ -> StringUtils.isNotEmpty(index_)).collect(Collectors.toSet());
return type; return type;
}).thenAccept(type -> { }).thenAccept(type -> {
SysDeptDTO deptDTO = sysDeptService.get(deptId);
result.add(new HashMap<String, Object>() { result.add(new HashMap<String, Object>() {
{ {
put("provide", type); put("provide", type);
put("deptId", deptId); put("deptId", deptId);
put("deptName", deptDTO.getName());
} }
}); });
}); });