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

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-09-19 11:06:29 +08:00
parent f5118dc89c 8b8d155bc2
commit 2f4aeb75dc
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java
View File

@ -169,9 +169,9 @@ public interface ResourceDao extends BaseDao<ResourceEntity> {
List<Map<String, Object>> selectDevelopDocResource();
List<Map<String,Object>> resourceInstallationOrDataResourceDetails(Map params);
List<Map<String, Object>> resourceInstallationOrDataResourceDetails(Map params);
List<Map> selectAppList(@Param("pageNum") int pageNum, @Param("type") Integer type);
List<Map> selectAppList(@Param("pageNum") int pageNum, @Param("type") Integer type, @Param("area") String area);
String selectPicByResId(@Param("id") String id);
@ -182,7 +182,7 @@ public interface ResourceDao extends BaseDao<ResourceEntity> {
List<Map> getCIMApplyApplicationList(@Param("deptId") Long deptId);
List<Map> getImgServices(@Param("deptid") Long deptid,@Param("type") String type);
List<Map> getImgServices(@Param("deptid") Long deptid, @Param("type") String type);
List<Map> cimAssemblyResources(@Param("deptid") Long deptid);

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

@ -1489,7 +1489,8 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
public Object selectAppList(Map params) {
int pageNum = Integer.parseInt(params.get("pageNum").toString());
Integer type = params.containsKey("type") ? Integer.parseInt(params.get("type").toString()) : null;
List<Map> maps = resourceDao.selectAppList((pageNum - 1) * 9, type);
String area = params.containsKey("area") ? params.get("area").toString() : null;
List<Map> maps = resourceDao.selectAppList((pageNum - 1) * 9, type, area);
maps.forEach(x -> x.put("pic", resourceDao.selectPicByResId(x.get("id").toString())));
return maps;
}
@ -2036,12 +2037,12 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
}
@Override
public Object selectCensusResourceTable(Map params){
public Object selectCensusResourceTable(Map params) {
return resourceDao.selectCensusResourceTable(params);
}
@Override
public Object selectCensusApplyTable(Map params){
public Object selectCensusApplyTable(Map params) {
return resourceDao.selectCensusApplyTable(params);
}

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

@ -1564,6 +1564,10 @@
<if test=" type != null and type != ''">
AND sd.type = #{type}
</if>
<if test=" area != null and area != ''">
AND JSON_CONTAINS( tdr.info_list, JSON_OBJECT( 'attrType', '应用领域' ))
AND JSON_EXTRACT( tdr.info_list, '$[*].attrValue' ) LIKE CONCAT( '%', #{area}, '%' )
</if>
ORDER BY
sd.type, sr.sort, sd.sort, tdr.dept_id, tdr.visitor DESC, tdr.id DESC
LIMIT ${pageNum}, 9