漏提交
This commit is contained in:
parent
c4e43ff5ef
commit
b2b21f6442
|
@ -365,6 +365,9 @@
|
||||||
LEFT JOIN ( SELECT data_resource_id, attr_type, attr_value FROM tb_data_attr tda WHERE del_flag = 0 AND attr_type = '组件类型' ) attr ON tdr.id = attr.data_resource_id
|
LEFT JOIN ( SELECT data_resource_id, attr_type, attr_value FROM tb_data_attr tda WHERE del_flag = 0 AND attr_type = '组件类型' ) attr ON tdr.id = attr.data_resource_id
|
||||||
WHERE
|
WHERE
|
||||||
1 = 1
|
1 = 1
|
||||||
|
AND tdr.del_flag = 0
|
||||||
|
AND taa.del_flag = 0
|
||||||
|
AND (taa.camera_list IS NULL OR taa.camera_list = '')
|
||||||
<choose>
|
<choose>
|
||||||
<when test="params.applyResult == null or params.applyResult == ''">
|
<when test="params.applyResult == null or params.applyResult == ''">
|
||||||
AND taa.approve_status IN ( '审核中', '通过' )
|
AND taa.approve_status IN ( '审核中', '通过' )
|
||||||
|
@ -453,6 +456,9 @@
|
||||||
LEFT JOIN ( SELECT data_resource_id, attr_type, attr_value FROM tb_data_attr tda WHERE del_flag = 0 AND attr_type = '组件类型' ) attr ON tdr.id = attr.data_resource_id
|
LEFT JOIN ( SELECT data_resource_id, attr_type, attr_value FROM tb_data_attr tda WHERE del_flag = 0 AND attr_type = '组件类型' ) attr ON tdr.id = attr.data_resource_id
|
||||||
WHERE
|
WHERE
|
||||||
1 = 1
|
1 = 1
|
||||||
|
AND tdr.del_flag = 0
|
||||||
|
AND taa.del_flag = 0
|
||||||
|
AND (taa.camera_list IS NULL OR taa.camera_list = '')
|
||||||
<choose>
|
<choose>
|
||||||
<when test="params.applyResult == null or params.applyResult == ''">
|
<when test="params.applyResult == null or params.applyResult == ''">
|
||||||
AND taa.approve_status IN ( '审核中', '通过' )
|
AND taa.approve_status IN ( '审核中', '通过' )
|
||||||
|
@ -539,6 +545,9 @@
|
||||||
LEFT JOIN ( SELECT data_resource_id, attr_type, attr_value FROM tb_data_attr tda WHERE del_flag = 0 AND attr_type = '组件类型' ) attr ON tdr.id = attr.data_resource_id
|
LEFT JOIN ( SELECT data_resource_id, attr_type, attr_value FROM tb_data_attr tda WHERE del_flag = 0 AND attr_type = '组件类型' ) attr ON tdr.id = attr.data_resource_id
|
||||||
WHERE
|
WHERE
|
||||||
1 = 1
|
1 = 1
|
||||||
|
AND tdr.del_flag = 0
|
||||||
|
AND taa.del_flag = 0
|
||||||
|
AND (taa.camera_list IS NULL OR taa.camera_list = '')
|
||||||
<choose>
|
<choose>
|
||||||
<when test="params.applyResult == null or params.applyResult == ''">
|
<when test="params.applyResult == null or params.applyResult == ''">
|
||||||
AND taa.approve_status IN ( '审核中', '通过' )
|
AND taa.approve_status IN ( '审核中', '通过' )
|
||||||
|
@ -627,6 +636,9 @@
|
||||||
LEFT JOIN ( SELECT data_resource_id, attr_type, attr_value FROM tb_data_attr tda WHERE del_flag = 0 AND attr_type = '组件类型' ) attr ON tdr.id = attr.data_resource_id
|
LEFT JOIN ( SELECT data_resource_id, attr_type, attr_value FROM tb_data_attr tda WHERE del_flag = 0 AND attr_type = '组件类型' ) attr ON tdr.id = attr.data_resource_id
|
||||||
WHERE
|
WHERE
|
||||||
1 = 1
|
1 = 1
|
||||||
|
AND tdr.del_flag = 0
|
||||||
|
AND taa.del_flag = 0
|
||||||
|
AND (taa.camera_list IS NULL OR taa.camera_list = '')
|
||||||
<choose>
|
<choose>
|
||||||
<when test="params.applyResult == null or params.applyResult == ''">
|
<when test="params.applyResult == null or params.applyResult == ''">
|
||||||
AND taa.approve_status IN ( '审核中', '通过' )
|
AND taa.approve_status IN ( '审核中', '通过' )
|
||||||
|
@ -702,7 +714,7 @@
|
||||||
SELECT
|
SELECT
|
||||||
districtId,
|
districtId,
|
||||||
districtName,
|
districtName,
|
||||||
SUM(applyPrice) AS "applyPrice"
|
SUM( applyPrice ) AS "applyPrice"
|
||||||
FROM
|
FROM
|
||||||
(
|
(
|
||||||
SELECT
|
SELECT
|
||||||
|
@ -715,21 +727,24 @@
|
||||||
FROM
|
FROM
|
||||||
( SELECT id, NAME, sort FROM sys_region WHERE tree_level = 3 AND 9 >= sort ) srg
|
( SELECT id, NAME, sort FROM sys_region WHERE tree_level = 3 AND 9 >= sort ) srg
|
||||||
LEFT JOIN sys_dept sd ON sd.district = srg.id
|
LEFT JOIN sys_dept sd ON sd.district = srg.id
|
||||||
LEFT JOIN tb_data_resource tdr ON tdr.dept_id = sd.id
|
LEFT JOIN sys_user su ON su.dept_id = sd.id
|
||||||
LEFT JOIN (
|
LEFT JOIN (
|
||||||
SELECT
|
SELECT
|
||||||
resource_id,
|
user_id,
|
||||||
SUM( apply_price ) AS "apply_price"
|
SUM( apply_price ) AS "apply_price",
|
||||||
|
COUNT( id ) AS "applyCount"
|
||||||
FROM
|
FROM
|
||||||
t_ability_application taa
|
t_ability_application taa
|
||||||
WHERE
|
WHERE
|
||||||
taa.del_flag = 0
|
taa.del_flag = 0
|
||||||
AND taa.approve_status = '通过'
|
AND taa.approve_status = '通过'
|
||||||
GROUP BY
|
GROUP BY
|
||||||
resource_id
|
user_id
|
||||||
) taa ON taa.resource_id = tdr.id
|
) taa ON taa.user_id = su.id
|
||||||
GROUP BY
|
GROUP BY
|
||||||
srg.id UNION ALL
|
srg.id
|
||||||
|
|
||||||
|
UNION ALL
|
||||||
SELECT
|
SELECT
|
||||||
tmb.district AS "districtId",
|
tmb.district AS "districtId",
|
||||||
srg.NAME AS "districtName",
|
srg.NAME AS "districtName",
|
||||||
|
@ -851,18 +866,16 @@
|
||||||
SELECT
|
SELECT
|
||||||
sd.id AS "deptId",
|
sd.id AS "deptId",
|
||||||
sd.NAME AS "deptName",
|
sd.NAME AS "deptName",
|
||||||
COUNT( tdr.id ) AS "resourceCount",
|
sum( taa.applyCount ) AS "resourceCount",
|
||||||
CONVERT (
|
CONVERT (
|
||||||
IFNULL( SUM( taa.price ), 0 ) / 10000,
|
IFNULL( SUM( taa.price ), 0 ) / 10000,
|
||||||
DECIMAL ( 15, 1 )) AS "applyPrice"
|
DECIMAL ( 15, 1 )) AS "applyPrice"
|
||||||
FROM
|
FROM
|
||||||
sys_dept sd
|
(
|
||||||
LEFT JOIN tb_data_resource tdr ON tdr.dept_id = sd.id
|
|
||||||
LEFT JOIN (
|
|
||||||
SELECT
|
SELECT
|
||||||
resource_id,
|
resource_id,
|
||||||
SUM( apply_price ) AS "price",
|
SUM( apply_price ) AS "price",
|
||||||
COUNT( resource_id ) AS "applyCount"
|
COUNT( id ) AS "applyCount"
|
||||||
FROM
|
FROM
|
||||||
t_ability_application taa
|
t_ability_application taa
|
||||||
WHERE
|
WHERE
|
||||||
|
@ -870,7 +883,9 @@
|
||||||
AND taa.approve_status = '通过'
|
AND taa.approve_status = '通过'
|
||||||
GROUP BY
|
GROUP BY
|
||||||
resource_id
|
resource_id
|
||||||
) taa ON taa.resource_id = tdr.id
|
) taa
|
||||||
|
LEFT JOIN tb_data_resource tdr ON tdr.id = taa.resource_id
|
||||||
|
LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id
|
||||||
WHERE
|
WHERE
|
||||||
tdr.del_flag = 0
|
tdr.del_flag = 0
|
||||||
AND sd.type = 2
|
AND sd.type = 2
|
||||||
|
@ -879,16 +894,14 @@
|
||||||
SELECT
|
SELECT
|
||||||
1067246875800000066 AS "deptId",
|
1067246875800000066 AS "deptId",
|
||||||
'青岛市大数据发展管理局' AS "deptName",
|
'青岛市大数据发展管理局' AS "deptName",
|
||||||
( SELECT COUNT( id ) FROM t_meetingroom ) AS "resourceCount",
|
COUNT( tmb.id ) AS "resourceCount",
|
||||||
CONVERT (
|
CONVERT (
|
||||||
IFNULL( SUM( tmb.apply_price ), 0 ) / 10000,
|
IFNULL( SUM( tmb.apply_price ), 0 ) / 10000,
|
||||||
DECIMAL ( 15, 1 )) AS "applyPrice"
|
DECIMAL ( 15, 1 )) AS "applyPrice"
|
||||||
FROM
|
FROM
|
||||||
t_meetingroom tm
|
t_meetingroom_book tmb
|
||||||
LEFT JOIN t_meetingroom_book tmb ON tmb.room_id = tm.id
|
|
||||||
WHERE
|
WHERE
|
||||||
tm.del_flag = 0
|
tmb.state = 2
|
||||||
AND tmb.state = 2
|
|
||||||
) temp
|
) temp
|
||||||
GROUP BY
|
GROUP BY
|
||||||
deptId,
|
deptId,
|
||||||
|
@ -924,6 +937,7 @@
|
||||||
WHERE
|
WHERE
|
||||||
taa.del_flag = 0
|
taa.del_flag = 0
|
||||||
AND taa.approve_status = '通过'
|
AND taa.approve_status = '通过'
|
||||||
|
AND ( taa.camera_list IS NULL OR camera_list = '' )
|
||||||
GROUP BY
|
GROUP BY
|
||||||
user_id
|
user_id
|
||||||
) taa
|
) taa
|
||||||
|
@ -950,7 +964,8 @@
|
||||||
tmb.dept
|
tmb.dept
|
||||||
) temp
|
) temp
|
||||||
GROUP BY
|
GROUP BY
|
||||||
deptName, deptId
|
deptName,
|
||||||
|
deptId
|
||||||
ORDER BY
|
ORDER BY
|
||||||
SUM( applyPrice ) DESC
|
SUM( applyPrice ) DESC
|
||||||
LIMIT 10
|
LIMIT 10
|
||||||
|
@ -966,10 +981,10 @@
|
||||||
FROM
|
FROM
|
||||||
( SELECT id, NAME, sort FROM sys_region WHERE tree_level = 3 AND 9 >= sort ) srg
|
( SELECT id, NAME, sort FROM sys_region WHERE tree_level = 3 AND 9 >= sort ) srg
|
||||||
LEFT JOIN sys_dept sd ON sd.district = srg.id
|
LEFT JOIN sys_dept sd ON sd.district = srg.id
|
||||||
LEFT JOIN sys_user su ON su.dept_id = sd.id
|
LEFT JOIN tb_data_resource tdr ON tdr.dept_id = sd.id
|
||||||
LEFT JOIN (SELECT user_id, SUM(apply_price) AS "apply_price", COUNT(id) AS "applyCount" FROM t_ability_application taa WHERE
|
LEFT JOIN (SELECT resource_id, SUM(apply_price) AS "apply_price", COUNT(id) AS "applyCount" FROM t_ability_application taa WHERE
|
||||||
taa.del_flag = 0
|
taa.del_flag = 0
|
||||||
AND taa.approve_status = '通过' GROUP BY user_id ) taa ON taa.user_id = su.id
|
AND taa.approve_status = '通过' AND (taa.camera_list IS NULL OR taa.camera_list = '') GROUP BY resource_id ) taa ON taa.resource_id = tdr.id
|
||||||
GROUP BY
|
GROUP BY
|
||||||
srg.id
|
srg.id
|
||||||
ORDER BY srg.sort
|
ORDER BY srg.sort
|
||||||
|
@ -994,10 +1009,10 @@
|
||||||
FROM
|
FROM
|
||||||
( SELECT id, NAME, sort FROM sys_region WHERE tree_level = 3 AND 9 >= sort ) srg
|
( SELECT id, NAME, sort FROM sys_region WHERE tree_level = 3 AND 9 >= sort ) srg
|
||||||
LEFT JOIN sys_dept sd ON sd.district = srg.id
|
LEFT JOIN sys_dept sd ON sd.district = srg.id
|
||||||
LEFT JOIN tb_data_resource tdr ON tdr.dept_id = sd.id
|
LEFT JOIN sys_user su ON su.dept_id = sd.id
|
||||||
LEFT JOIN (
|
LEFT JOIN (
|
||||||
SELECT
|
SELECT
|
||||||
resource_id,
|
user_id,
|
||||||
SUM( apply_price ) AS "apply_price",
|
SUM( apply_price ) AS "apply_price",
|
||||||
COUNT( id ) AS "applyCount"
|
COUNT( id ) AS "applyCount"
|
||||||
FROM
|
FROM
|
||||||
|
@ -1006,10 +1021,12 @@
|
||||||
taa.del_flag = 0
|
taa.del_flag = 0
|
||||||
AND taa.approve_status = '通过'
|
AND taa.approve_status = '通过'
|
||||||
GROUP BY
|
GROUP BY
|
||||||
resource_id
|
user_id
|
||||||
) taa ON taa.resource_id = tdr.id
|
) taa ON taa.user_id = su.id
|
||||||
GROUP BY
|
GROUP BY
|
||||||
srg.id UNION ALL
|
srg.id
|
||||||
|
|
||||||
|
UNION ALL
|
||||||
SELECT
|
SELECT
|
||||||
tmb.district AS "districtId",
|
tmb.district AS "districtId",
|
||||||
srg.NAME AS "districtName",
|
srg.NAME AS "districtName",
|
||||||
|
@ -1051,5 +1068,55 @@
|
||||||
temp.sort
|
temp.sort
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<select id="getApplyPriceCount" resultType="java.lang.Long">
|
||||||
|
SELECT CONVERT
|
||||||
|
(
|
||||||
|
SUM( temp.applyPrice ) / 10000,
|
||||||
|
DECIMAL ( 15, 1 ))
|
||||||
|
FROM
|
||||||
|
(
|
||||||
|
SELECT
|
||||||
|
taa.apply_price AS "applyPrice"
|
||||||
|
FROM
|
||||||
|
t_ability_application taa
|
||||||
|
WHERE
|
||||||
|
1 = 1
|
||||||
|
AND taa.approve_status = '通过' UNION ALL
|
||||||
|
SELECT
|
||||||
|
tmb.apply_price AS "applyPrice"
|
||||||
|
FROM
|
||||||
|
t_meetingroom_book tmb
|
||||||
|
WHERE
|
||||||
|
tmb.state = 2
|
||||||
|
) temp
|
||||||
|
</select>
|
||||||
|
|
||||||
|
<select id="getResourceFundStatementTotal" resultType="java.lang.Long">
|
||||||
|
SELECT SUM(applyPrice) FROM (
|
||||||
|
SELECT
|
||||||
|
CONVERT (
|
||||||
|
taa.price / 10000,
|
||||||
|
DECIMAL ( 15, 1 )) AS "applyPrice"
|
||||||
|
FROM
|
||||||
|
(
|
||||||
|
SELECT
|
||||||
|
resource_id,
|
||||||
|
SUM( apply_price ) AS "price",
|
||||||
|
COUNT( resource_id ) AS "applyCount"
|
||||||
|
FROM
|
||||||
|
t_ability_application taa
|
||||||
|
WHERE
|
||||||
|
taa.del_flag = 0
|
||||||
|
AND taa.approve_status = '通过'
|
||||||
|
GROUP BY
|
||||||
|
resource_id
|
||||||
|
) taa
|
||||||
|
LEFT JOIN tb_data_resource tdr ON taa.resource_id = tdr.id
|
||||||
|
LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id
|
||||||
|
WHERE
|
||||||
|
tdr.del_flag = 0
|
||||||
|
AND tdr.type = '应用资源' ) tmp
|
||||||
|
</select>
|
||||||
|
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
Loading…
Reference in New Issue