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

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
wangliwen 2022-07-21 17:30:17 +08:00
parent 66ae7d2fe6 6bdd4b3c30
commit 8de4de904f
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -533,11 +533,11 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
public Object selectTotal() { public Object selectTotal() {
HashMap<String, Object> resultMap = new HashMap<>(); HashMap<String, Object> resultMap = new HashMap<>();
List<Map> re = resourceDao.selectTypeCount(null); List<Map> re = resourceDao.selectTypeCount(null);
//2022-07-05,ytl修改 start /*//2022-07-05,ytl修改 start
re.removeIf(r -> { re.removeIf(r -> {
return org.apache.commons.lang3.StringUtils.equals(r.get("type").toString(), "基础设施"); return org.apache.commons.lang3.StringUtils.equals(r.get("type").toString(), "基础设施");
}); });
//2022-07-05,ytl修改 end //2022-07-05,ytl修改 end*/
switch (Constant.ProjectPlace.getByFlag(projectPlace)) { switch (Constant.ProjectPlace.getByFlag(projectPlace)) {
case TSINGTAO_XHA: { // 青岛西海岸 case TSINGTAO_XHA: { // 青岛西海岸
CompletableFuture allAmount = CompletableFuture.supplyAsync(() -> { // 获取平台总基础设施数目 CompletableFuture allAmount = CompletableFuture.supplyAsync(() -> { // 获取平台总基础设施数目

6
renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
View File

@ -536,11 +536,9 @@
<select id="countAllDept" resultType="java.lang.Long"> <select id="countAllDept" resultType="java.lang.Long">
SELECT SELECT
COUNT( DISTINCT dept_id ) COUNT(id)
FROM FROM
tb_data_resource sys_dept
WHERE
del_flag = 0
</select> </select>
<select id="selectGroupByDeptId" resultType="java.util.Map"> <select id="selectGroupByDeptId" resultType="java.util.Map">