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

...

This commit is contained in:
dinggang 2022-05-19 17:22:53 +08:00
parent e7a36f02b9
commit 093d51efab
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
renren-admin/src/main/java/io/renren/modules/resource/dto/ResourceDTO.java
View File

@ -90,6 +90,8 @@ public class ResourceDTO extends AuditingBaseDTO implements Serializable {
private String applyState; private String applyState;
@ApiModelProperty(value = "申请量") @ApiModelProperty(value = "申请量")
private String applyCount; private String applyCount;
@ApiModelProperty(value = "部门ID集合")
private List<Long> deptIds;
@ApiModelProperty(value = "属性信息") @ApiModelProperty(value = "属性信息")

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

@ -144,6 +144,11 @@
<if test="dto.districtId != null and dto.districtId != ''"> <if test="dto.districtId != null and dto.districtId != ''">
AND tdr.district_id = #{dto.districtId} AND tdr.district_id = #{dto.districtId}
</if> </if>
<if test="null != dto.deptIds and dto.deptIds.size > 0">
AND tdr.dept_id IN <foreach collection="dto.deptIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="dto.shareCondition != null and dto.shareCondition != ''"> <if test="dto.shareCondition != null and dto.shareCondition != ''">
AND tdr.share_condition = #{dto.shareCondition} AND tdr.share_condition = #{dto.shareCondition}
</if> </if>
@ -282,6 +287,11 @@
<if test="dto.districtId != null and dto.districtId != ''"> <if test="dto.districtId != null and dto.districtId != ''">
AND tdr.district_id = #{dto.districtId} AND tdr.district_id = #{dto.districtId}
</if> </if>
<if test="null != dto.deptIds and dto.deptIds.size > 0">
AND tdr.dept_id IN <foreach collection="dto.deptIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="dto.shareCondition != null and dto.shareCondition != ''"> <if test="dto.shareCondition != null and dto.shareCondition != ''">
AND tdr.share_condition = #{dto.shareCondition} AND tdr.share_condition = #{dto.shareCondition}
</if> </if>
@ -356,7 +366,8 @@
sd.NAME AS "deptName", sd.NAME AS "deptName",
IFNULL( tdr.deptCount, 0 ) AS "deptCount", IFNULL( tdr.deptCount, 0 ) AS "deptCount",
sd.id AS "deptId", sd.id AS "deptId",
sr.name AS "districtName" sr.name AS "districtName",
sr.id AS "districtId"
FROM FROM
sys_dept sd sys_dept sd
LEFT JOIN ( SELECT dept_id, COUNT( id ) AS "deptCount" FROM tb_data_resource WHERE 1 = 1 AND del_flag IN (0 ,5) LEFT JOIN ( SELECT dept_id, COUNT( id ) AS "deptCount" FROM tb_data_resource WHERE 1 = 1 AND del_flag IN (0 ,5)
@ -423,7 +434,8 @@
( CASE sd.type WHEN 1 THEN '省级' WHEN 2 THEN '市级' WHEN 3 THEN '区级' WHEN 4 THEN '企业' ELSE '其他' END ) AS "type", ( CASE sd.type WHEN 1 THEN '省级' WHEN 2 THEN '市级' WHEN 3 THEN '区级' WHEN 4 THEN '企业' ELSE '其他' END ) AS "type",
sd.NAME AS "deptName", sd.NAME AS "deptName",
IFNULL( tdr.deptCount, 0) AS "deptCount", IFNULL( tdr.deptCount, 0) AS "deptCount",
IFNULL(sr.name, '暂无该地区') AS "districtName" IFNULL(sr.name, '暂无该地区') AS "districtName",
sr.id AS "districtId"
FROM FROM
sys_dept sd sys_dept sd
LEFT JOIN ( SELECT dept_id, COUNT( id ) AS "deptCount" FROM tb_data_resource LEFT JOIN ( SELECT dept_id, COUNT( id ) AS "deptCount" FROM tb_data_resource