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

Merge remote-tracking branch '备份/dev' into dev

This commit is contained in:
wangliwen 2022-11-01 11:31:06 +08:00
parent cca87f9fbd 59fd3fb7d6
commit b9550748fa
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1917,7 +1917,11 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
CompletableFuture<Void> all = CompletableFuture.allOf(jcss, hkt, sphy);
all.join();
return resultMap;
return new LinkedHashMap(){{
put("视频资源", resultMap.get("视频资源"));
put("会客厅", resultMap.get("会客厅"));
put("视频会议", resultMap.get("视频会议"));
}};
}
@Override
@ -1931,7 +1935,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
@Override
public Object selectCollectResourceList() {
List<Map> resourceCountList = baseDao.selectCollectResourceList();
Map result = new HashMap();
Map result = new LinkedHashMap();
resourceCountList.stream().filter(it -> it.get("type") != null && !it.get("type").equals("")).forEach(it -> result.put(it.get("type"), it.get("count")));
return result;
}

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

@ -1812,7 +1812,7 @@
GROUP BY
sd.id,
tdr.type
<if test="type == null or type == '' or type == '会议室'">
<if test="type == null or type == '' or type == '会客厅'">
UNION
SELECT
@ -2001,14 +2001,14 @@
AND SUBSTR(taa.create_date, 1, 10) BETWEEN #{startDate} AND #{endDate}
</if>
<if test="type == null or type == '' or type == '会议室'">
<if test="type == null or type == '' or type == '会客厅'">
UNION ALL
SELECT
tmb.dept AS 'deptName',
tm.`name` AS 'resourceName',
'青岛市大数据发展管理局' AS 'resourceDeptName',
'会议室' AS 'type',
'会客厅' AS 'type',
tmb.create_date AS 'createDate',
CASE tmb.state WHEN 1 THEN '审核中' WHEN 2 THEN '通过' WHEN 3 THEN '不通过' ELSE '审核中' END AS
'approveStatus',
@ -2055,9 +2055,11 @@
FROM tb_data_attr a INNER JOIN mysql.help_topic b ON a.attr_type='应用领域' AND a.del_flag=0 AND b.help_topic_id
<![CDATA[ < ]]> (length(a.attr_value) - length(REPLACE(a.attr_value, ';', '')) + 1)) tda
ON tdr.id=tda.data_resource_id
LEFT JOIN (select sdd.sort, sdd.dict_label from sys_dict_data sdd left join tb_data_category tdc on sdd.dict_type_id=tdc.link_value
where 1=1 and sdd.status=1 and tdc.del_flag=0 and tdc.name='应用领域' and tdc.root_category='应用资源') dict ON dict.dict_label=tda.attr_value
WHERE 1=1 AND tdr.del_flag=0 AND tdr.type='应用资源'
GROUP BY tda.attr_value
ORDER BY count DESC
ORDER BY ANY_VALUE(IFNULL(dict.sort, 9999)) ASC
</select>
<select id="getPraiseList" resultType="java.util.Map">