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

统计报表新增：审批单号

This commit is contained in:
lizhicheng 2022-10-03 16:06:42 +08:00
parent 4a5ef24d0c
commit be042a94b0
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1785,12 +1785,13 @@
<select id="selectCensusResourceTable" resultType="java.util.Map"> <select id="selectCensusResourceTable" resultType="java.util.Map">
SELECT sd.name AS deptName, tdr.name AS resourceName, tdr.type, tdr.create_date AS createDate, SELECT sd.name AS deptName, tdr.name AS resourceName, tdr.type, tdr.create_date AS createDate,
if(tdr.del_flag=0, '审核通过', '审核中') AS approveStatus if(tdr.del_flag=0, '审核通过', '审核中') AS approveStatus, trma.apply_number AS applyNumber
FROM (SELECT IF(d.type='组件服务', A.attr_value, d.type) AS type, d.id, d.del_flag, d.dept_id, d.create_date, FROM (SELECT IF(d.type='组件服务', A.attr_value, d.type) AS type, d.id, d.del_flag, d.dept_id, d.create_date,
d.name d.name
FROM tb_data_resource d LEFT JOIN tb_data_attr a ON d.id=a.data_resource_id AND a.attr_type='组件类型' AND FROM tb_data_resource d LEFT JOIN tb_data_attr a ON d.id=a.data_resource_id AND a.attr_type='组件类型' AND
a.del_flag=0 a.del_flag=0
WHERE d.type NOT IN ('知识库','基础设施','数据资源')) tdr, WHERE d.type NOT IN ('知识库','基础设施','数据资源')) tdr
LEFT JOIN t_resource_mount_apply trma on tdr.id=trma.resource_id,
sys_dept sd sys_dept sd
WHERE 1=1 AND tdr.dept_id=sd.id WHERE 1=1 AND tdr.dept_id=sd.id
<choose> <choose>
@ -1818,7 +1819,7 @@
<select id="selectCensusApplyTable" resultType="java.util.Map"> <select id="selectCensusApplyTable" resultType="java.util.Map">
SELECT sd.name AS deptName, tdr.name AS resourceName, tdr.type, taa.create_date AS createDate, SELECT sd.name AS deptName, tdr.name AS resourceName, tdr.type, taa.create_date AS createDate,
taa.approve_status AS approveStatus taa.approve_status AS approveStatus, taa.apply_number AS applyNumber
FROM (SELECT IF(d.type='组件服务', A.attr_value, d.type) AS type, d.id, d.del_flag, d.dept_id, d.create_date, FROM (SELECT IF(d.type='组件服务', A.attr_value, d.type) AS type, d.id, d.del_flag, d.dept_id, d.create_date,
d.name d.name
FROM tb_data_resource d LEFT JOIN tb_data_attr a ON d.id=a.data_resource_id AND a.attr_type='组件类型' AND FROM tb_data_resource d LEFT JOIN tb_data_attr a ON d.id=a.data_resource_id AND a.attr_type='组件类型' AND