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

Merge branch 'dev'

This commit is contained in:
wangliwen 2022-12-19 10:08:52 +08:00
parent 1a7f647145 9a5daeab88
commit b4c934e3c6
2 changed files with 61 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -570,7 +570,6 @@ public class CensusController {
SysDeptDTO sysDeptDTO = sysDeptService.get(user.getDeptId()); SysDeptDTO sysDeptDTO = sysDeptService.get(user.getDeptId());
//2022-11-21 修改为只有大数据局部门和admin账号能查看所有 //2022-11-21 修改为只有大数据局部门和admin账号能查看所有
if (SuperAdminEnum.YES.value() != user.getSuperAdmin() && !bigDataDeptName.equals(sysDeptDTO.getName())) { if (SuperAdminEnum.YES.value() != user.getSuperAdmin() && !bigDataDeptName.equals(sysDeptDTO.getName())) {
params.put("region", sysDeptDTO.getDistrict()); // 管理员只出本部门区域 params.put("region", sysDeptDTO.getDistrict()); // 管理员只出本部门区域
} }
return new Result().ok(resourceService.selectCensusApplyTable(params)); return new Result().ok(resourceService.selectCensusApplyTable(params));

61
renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
View File

@ -2983,6 +2983,67 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
List<Map<String, Object>> list = new ArrayList<>(); List<Map<String, Object>> list = new ArrayList<>();
try { try {
list = lcJdbcTemplate.queryForList(sb.toString()); list = lcJdbcTemplate.queryForList(sb.toString());
list = list.stream().map(index -> {
switch (index.get("type").toString()) { // 根据类型填充其审核状态
case "云主机":
case "云数据库":
case "对象存储":
case "托管服务": {
switch (index.get("approveStatus").toString()) {
case "01":
index.put("approveStatus", "提交");
break;
case "03":
index.put("approveStatus", "一级部门提交");
break;
case "04":
index.put("approveStatus", "驳回");
break;
case "05":
index.put("approveStatus", "审核通过");
break;
case "06":
index.put("approveStatus", "交付");
break;
default:
index.put("approveStatus", "未知状态");
}
}
break;
case "云视频": {
switch (index.get("approveStatus").toString()) {
case "00":
index.put("approveStatus", "草稿");
break;
case "01":
index.put("approveStatus", "提交");
break;
case "02":
index.put("approveStatus", "大数据局审核通过");
break;
case "03":
index.put("approveStatus", "提交给视频所属部门");
break;
case "04":
index.put("approveStatus", "大数据局驳回");
break;
case "05":
index.put("approveStatus", "视频所属部门已审核");
break;
case "06":
index.put("approveStatus", "交付");
break;
case "08":
index.put("approveStatus", "视频所属部门审核中");
break;
default:
index.put("approveStatus", "未知状态");
}
}
break;
}
return index;
}).collect(Collectors.toList());
} catch (DataAccessException e) { } catch (DataAccessException e) {
logger.error("查询浪潮数据库--按资源查询申请记录SQL：{}", sb); logger.error("查询浪潮数据库--按资源查询申请记录SQL：{}", sb);
} }