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-12-05 16:08:56 +08:00
parent 19e6f7d5a4 b2b21f6442
commit 386478aa76
3 changed files with 114 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
renren-admin/src/main/java/io/renren/modules/processForm/dao/TAbilityApplicationDao.java
View File

@ -80,4 +80,8 @@ public interface TAbilityApplicationDao extends BaseDao<TAbilityApplicationEntit
List<Map> getProvideDistrictFundStatement(); List<Map> getProvideDistrictFundStatement();
List<Map> getApplyDistrictFundStatement(); List<Map> getApplyDistrictFundStatement();
Long getApplyPriceCount();
Long getResourceFundStatementTotal();
} }

16
renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java
View File

@ -234,13 +234,9 @@ public class TAbilityApplicationServiceImpl extends CrudServiceImpl<TAbilityAppl
@Override @Override
public Object getResourceFundStatement(Map<String, Object> params) { public Object getResourceFundStatement(Map<String, Object> params) {
List<Map> list = abilityApplicationDao.getResourceFundStatement(); List<Map> list = abilityApplicationDao.getResourceFundStatement();
BigDecimal total = BigDecimal.ZERO;
for (Map map : list) {
total = total.add((BigDecimal) map.get("applyPrice"));
}
Map<String, Object> resultMap = new HashMap<>(); Map<String, Object> resultMap = new HashMap<>();
resultMap.put("list", list); resultMap.put("list", list);
resultMap.put("total", total); resultMap.put("total", abilityApplicationDao.getResourceFundStatementTotal());
return resultMap; return resultMap;
} }
@ -292,12 +288,10 @@ public class TAbilityApplicationServiceImpl extends CrudServiceImpl<TAbilityAppl
@Override @Override
public Object getApplyPriceCount() { public Object getApplyPriceCount() {
Map<String, Object> map = new HashMap<>();
map.put("applyResult", "通过"); Long sum = 0L;
Long sum = abilityApplicationDao.getFundStatementSum(map); sum = sum + abilityApplicationDao.getApplyPriceCount();
BigDecimal result = new BigDecimal(sum).divide(new BigDecimal(10000)); return sum ;
result = result.setScale(1, BigDecimal.ROUND_HALF_UP);
return result ;
} }
} }

143
renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml
View File

@ -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
@ -958,20 +973,20 @@
<select id="getProvideDistrictFundStatement" resultType="java.util.Map"> <select id="getProvideDistrictFundStatement" resultType="java.util.Map">
SELECT SELECT
srg.id AS "districtId ", srg.id AS "districtId ",
srg.NAME AS "districtName", srg.NAME AS "districtName",
IFNULL(SUM(taa.applyCount), 0) AS "applyCount", IFNULL(SUM(taa.applyCount), 0) AS "applyCount",
convert(IFNULL( SUM( taa.apply_price ), 0 ) / 10000, decimal(15,1)) AS "applyPrice", convert(IFNULL( SUM( taa.apply_price ), 0 ) / 10000, decimal(15,1)) AS "applyPrice",
srg.sort srg.sort
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
</select> </select>
@ -979,8 +994,8 @@
SELECT SELECT
districtId, districtId,
districtName, districtName,
SUM( applyCount ) AS "applyCount", SUM( applyCount ) AS "applyCount",
SUM( applyPrice ) AS "applyPrice" SUM( applyPrice ) AS "applyPrice"
FROM FROM
( (
SELECT SELECT
@ -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>