wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

BI页面统计增加隐患排查数据情况

pull/4/head
wangpeng 2024-02-21 17:20:55 +08:00
parent 5514125492
commit d086ad5dcc
3 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/main/resources/mybatis/datasource/check/CheckRecordMapper.xml
View File

@ -1144,8 +1144,8 @@
l.PERIOD, l.PERIOD,
DATE_FORMAT( f.CHECK_TIME, '%Y-%m-%d' ) CHECK_TIME DATE_FORMAT( f.CHECK_TIME, '%Y-%m-%d' ) CHECK_TIME
FROM FROM
BUS_CHECKRECORD f vi_list_checkrecord_all f
LEFT JOIN BUS_LISTMANAGER l ON l.LISTMANAGER_ID = f.LISTMANAGER_ID LEFT JOIN vi_list_all l ON l.LISTMANAGER_ID = f.LISTMANAGER_ID and l.LIST_TYPE = f.HIDDEN_RISKSTANDARD
WHERE WHERE
f.FINISHED = '1' f.FINISHED = '1'
AND f.ISSTATISTICS = '1' AND f.ISSTATISTICS = '1'
@ -1176,8 +1176,8 @@
l.PERIOD, l.PERIOD,
YEARWEEK(DATE_FORMAT(f.CHECK_TIME,'%Y-%m-%d'),1) WEEKNUM YEARWEEK(DATE_FORMAT(f.CHECK_TIME,'%Y-%m-%d'),1) WEEKNUM
FROM FROM
BUS_CHECKRECORD f vi_list_checkrecord_all f
LEFT JOIN BUS_LISTMANAGER l ON l.LISTMANAGER_ID = f.LISTMANAGER_ID LEFT JOIN vi_list_all l ON l.LISTMANAGER_ID = f.LISTMANAGER_ID and l.LIST_TYPE = f.HIDDEN_RISKSTANDARD
WHERE WHERE
f.FINISHED = '1' f.FINISHED = '1'
AND f.ISDELETE = '0' AND f.ISDELETE = '0'
@ -1209,8 +1209,8 @@
l.TYPE, l.TYPE,
l.PERIOD l.PERIOD
FROM FROM
BUS_CHECKRECORD f vi_list_checkrecord_all f
LEFT JOIN BUS_LISTMANAGER l ON l.LISTMANAGER_ID = f.LISTMANAGER_ID LEFT JOIN vi_list_all l ON l.LISTMANAGER_ID = f.LISTMANAGER_ID and l.LIST_TYPE = f.HIDDEN_RISKSTANDARD
WHERE WHERE
f.FINISHED = '1' f.FINISHED = '1'
AND f.ISSTATISTICS = '1' AND f.ISSTATISTICS = '1'
@ -1240,8 +1240,8 @@
l.PERIOD, l.PERIOD,
DATE_FORMAT( f.CHECK_TIME, '%Y-%m' ) CHECK_TIME DATE_FORMAT( f.CHECK_TIME, '%Y-%m' ) CHECK_TIME
FROM FROM
BUS_CHECKRECORD f vi_list_checkrecord_all f
LEFT JOIN BUS_LISTMANAGER l ON l.LISTMANAGER_ID = f.LISTMANAGER_ID LEFT JOIN vi_list_all l ON l.LISTMANAGER_ID = f.LISTMANAGER_ID and l.LIST_TYPE = f.HIDDEN_RISKSTANDARD
WHERE WHERE
f.FINISHED = '1' f.FINISHED = '1'
AND f.ISDELETE = '0' AND f.ISDELETE = '0'
@ -1277,8 +1277,8 @@
DATE_FORMAT( f.CHECK_TIME, '%Y' ), DATE_FORMAT( f.CHECK_TIME, '%Y' ),
QUARTER ( f.CHECK_TIME )) CHECK_TIME_quarter QUARTER ( f.CHECK_TIME )) CHECK_TIME_quarter
FROM FROM
BUS_CHECKRECORD f vi_list_checkrecord_all f
LEFT JOIN bus_listmanager l ON l.LISTMANAGER_ID = f.LISTMANAGER_ID LEFT JOIN vi_list_all l ON l.LISTMANAGER_ID = f.LISTMANAGER_ID and l.LIST_TYPE = f.HIDDEN_RISKSTANDARD
WHERE WHERE
f.FINISHED = '1' f.FINISHED = '1'
AND f.ISDELETE = '0' AND f.ISDELETE = '0'
@ -1319,8 +1319,8 @@
l.PERIOD, l.PERIOD,
concat(DATE_FORMAT(f.CHECK_TIME, '%Y'), INTERVAL(CONVERT(MONTH(f.CHECK_TIME),SIGNED),7,13) ) concat(DATE_FORMAT(f.CHECK_TIME, '%Y'), INTERVAL(CONVERT(MONTH(f.CHECK_TIME),SIGNED),7,13) )
FROM FROM
BUS_CHECKRECORD f vi_list_checkrecord_all f
LEFT JOIN bus_listmanager l ON l.LISTMANAGER_ID = f.LISTMANAGER_ID LEFT JOIN vi_list_all l ON l.LISTMANAGER_ID = f.LISTMANAGER_ID and l.LIST_TYPE = f.HIDDEN_RISKSTANDARD
WHERE WHERE
f.FINISHED = '1' f.FINISHED = '1'
AND f.ISSTATISTICS = '1' AND f.ISSTATISTICS = '1'
@ -1359,8 +1359,8 @@
l.PERIOD, l.PERIOD,
DATE_FORMAT( f.CHECK_TIME, '%Y' ) CHECK_TIME DATE_FORMAT( f.CHECK_TIME, '%Y' ) CHECK_TIME
FROM FROM
BUS_CHECKRECORD f vi_list_checkrecord_all f
LEFT JOIN BUS_LISTMANAGER l ON l.LISTMANAGER_ID = f.LISTMANAGER_ID LEFT JOIN vi_list_all l ON l.LISTMANAGER_ID = f.LISTMANAGER_ID and l.LIST_TYPE = f.HIDDEN_RISKSTANDARD
WHERE WHERE
f.FINISHED = '1' f.FINISHED = '1'
AND f.ISSTATISTICS = '1' AND f.ISSTATISTICS = '1'
@ -1398,8 +1398,8 @@
1, 1,
count( 1 )) num count( 1 )) num
FROM FROM
BUS_CHECKRECORD f vi_list_checkrecord_all f
LEFT JOIN BUS_LISTMANAGER l ON l.LISTMANAGER_ID = f.LISTMANAGER_ID LEFT JOIN vi_list_all l ON l.LISTMANAGER_ID = f.LISTMANAGER_ID and l.LIST_TYPE = f.HIDDEN_RISKSTANDARD
WHERE WHERE
f.FINISHED = '1' f.FINISHED = '1'
AND f.ISSTATISTICS = '1' AND f.ISSTATISTICS = '1'
@ -1571,8 +1571,8 @@
count( s.USER_ID ) count( s.USER_ID )
FROM FROM
sys_user s sys_user s
LEFT JOIN bus_checkuser cu ON s.USER_ID = cu.USER_ID LEFT JOIN vi_list_checkuser_all cu ON s.USER_ID = cu.USER_ID
LEFT JOIN bus_checkrecord f ON f.CHECKRECORD_ID = cu.CHECKRECORD_ID LEFT JOIN vi_list_checkrecord_all f ON f.CHECKRECORD_ID = cu.CHECKRECORD_ID and f.HIDDEN_RISKSTANDARD = cu.HIDDEN_RISKSTANDARD
WHERE WHERE
s.ISDELETE = 0 and s.ISDELETE = 0 and
s.CORPINFO_ID = #{CORPINFO_ID} s.CORPINFO_ID = #{CORPINFO_ID}
@ -1594,8 +1594,8 @@
count( s.DEPARTMENT_ID ) count( s.DEPARTMENT_ID )
FROM FROM
oa_department s oa_department s
LEFT JOIN bus_checkuser cu ON s.DEPARTMENT_ID = cu.DEPARTMENT_ID LEFT JOIN vi_list_checkuser_all cu ON s.DEPARTMENT_ID = cu.DEPARTMENT_ID
LEFT JOIN bus_checkrecord f ON f.CHECKRECORD_ID = cu.CHECKRECORD_ID LEFT JOIN vi_list_checkrecord_all f ON f.CHECKRECORD_ID = cu.CHECKRECORD_ID and f.HIDDEN_RISKSTANDARD = cu.HIDDEN_RISKSTANDARD
WHERE WHERE
s.CORPINFO_ID = #{CORPINFO_ID} s.CORPINFO_ID = #{CORPINFO_ID}
AND s.ISDELETE = 0 AND s.ISDELETE = 0

8
src/main/resources/mybatis/datasource/check/ListManagerMapper.xml
View File

@ -2135,7 +2135,7 @@
SELECT SELECT
count( 1 ) count( 1 )
FROM FROM
bus_listmanager vi_list_all
WHERE WHERE
CORPINFO_ID = #{CORPINFO_ID} CORPINFO_ID = #{CORPINFO_ID}
and ISDELETE = '0' and ISDELETE = '0'
@ -2150,8 +2150,8 @@
SELECT SELECT
count( s.LISTMANAGER_ID ) count( s.LISTMANAGER_ID )
FROM FROM
bus_listmanager s vi_list_all s
LEFT JOIN bus_checkrecord f ON f.LISTMANAGER_ID = s.LISTMANAGER_ID LEFT JOIN vi_list_checkrecord_all f ON f.LISTMANAGER_ID = s.LISTMANAGER_ID and f.HIDDEN_RISKSTANDARD = s.LIST_TYPE
WHERE WHERE
s.CORPINFO_ID = #{CORPINFO_ID} s.CORPINFO_ID = #{CORPINFO_ID}
AND f.FINISHED = '1' AND f.FINISHED = '1'
@ -2451,7 +2451,7 @@
<select id="getCountNumBi" parameterType="pd" resultType="pd"> <select id="getCountNumBi" parameterType="pd" resultType="pd">
select count(1) count,d.NAME select count(1) count,d.NAME
from BUS_LISTMANAGER f from vi_list_all f
left join sys_dictionaries d on d.BIANMA = f.SCREENTYPE left join sys_dictionaries d on d.BIANMA = f.SCREENTYPE
where f.ISDELETE = '0' where f.ISDELETE = '0'
<if test="CORPINFO_ID != null and CORPINFO_ID != ''"><!-- 关键词检索 --> <if test="CORPINFO_ID != null and CORPINFO_ID != ''"><!-- 关键词检索 -->

3
src/main/resources/mybatis/datasource/statistics/ListStatisticsMapper.xml
View File

@ -176,9 +176,10 @@
<!-- 获取统计分母 --> <!-- 获取统计分母 -->
<select id="getCountList" parameterType="pd" resultType="pd"> <select id="getCountList" parameterType="pd" resultType="pd">
select select
f.HIDDEN_RISKSTANDARD,
<include refid="Field"></include> <include refid="Field"></include>
from from
<include refid="tableName"></include> f vi_list_statistics_all f
where where
f.CORPINFO_ID = #{CORPINFO_ID} and f.TYPE != 'listType0006' f.CORPINFO_ID = #{CORPINFO_ID} and f.TYPE != 'listType0006'
and and