elink-star
/
esua-epdc-cloud
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'feature/screenJop' of http://121.42.41.42:7070/r/esua-epdc-cloud into feature/screenJop

feature/dangjian
wanggongfeng 5 years ago
parent
de9fd31b7a 297fe673bd
commit
3209afb78d
1 changed files with 62 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 78
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/DataStatsScreencollDao.xml

78
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/DataStatsScreencollDao.xml
View File

@ -45,13 +45,24 @@
count( ( 60 <![CDATA[<]]> t.age AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel6
FROM
(SELECT
eu.ID,
eu.PARTY_FLAG,
IFNULL( TIMESTAMPDIFF( YEAR, eu.BIRTHDAY, CURDATE( ) ), 0 ) AS age,
d.id AS orgId
e.ID,
e.PARTY_FLAG,
IFNULL( TIMESTAMPDIFF( YEAR, e.BIRTHDAY, CURDATE( ) ), 0 ) AS age,
d.id as orgId
FROM
esua_epdc_admin.sys_dept d
left join esua_epdc_user.epdc_user eu on d.id=eu.DEPT_ID and eu.DEL_FLAG = '0'
left join (select eu.id,
eu.BIRTHDAY,
(select ifnull(if(eu.DEPT_ID = 0, NULL, eu.DEPT_ID), (
SELECT GRID_ID FROM esua_epdc_user.epdc_user_grid_relation
WHERE DEL_FLAG = '0' AND USER_ID = eu.ID
ORDER BY
CREATED_TIME,id
LIMIT 1 )
)) AS orgId,
eu.PARTY_FLAG
from esua_epdc_user.epdc_user eu
where eu.DEL_FLAG = '0' )e on d.id=e.orgId
WHERE
d.DEL_FLAG = '0'
and d.type_key='grid_party'
@ -108,14 +119,25 @@
count( ( 60 <![CDATA[<]]> t.age AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel6
FROM
(SELECT
eu.ID,
eu.PARTY_FLAG,
IFNULL( TIMESTAMPDIFF( YEAR, eu.BIRTHDAY, CURDATE( ) ), 0 ) AS age,
e.ID,
e.PARTY_FLAG,
IFNULL( TIMESTAMPDIFF( YEAR, e.BIRTHDAY, CURDATE( ) ), 0 ) AS age,
co.id AS orgId
FROM
esua_epdc_admin.sys_dept co
left join esua_epdc_admin.sys_dept gr on gr.pid=co.id
left join esua_epdc_user.epdc_user eu on gr.id=eu.DEPT_ID and eu.DEL_FLAG = '0'
left join (select eu.id,
eu.BIRTHDAY,
(select ifnull(if(eu.DEPT_ID = 0, NULL, eu.DEPT_ID), (
SELECT GRID_ID FROM esua_epdc_user.epdc_user_grid_relation
WHERE DEL_FLAG = '0' AND USER_ID = eu.ID
ORDER BY
CREATED_TIME,id
LIMIT 1 )
)) AS orgId,
eu.PARTY_FLAG
from esua_epdc_user.epdc_user eu
where eu.DEL_FLAG = '0' )e on gr.id=e.orgId
WHERE
co.DEL_FLAG = '0'
and gr.DEL_FLAG = '0'
@ -173,15 +195,26 @@
count( ( 60 <![CDATA[<]]> t.age AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel6
FROM
(SELECT
eu.ID,
eu.PARTY_FLAG,
IFNULL( TIMESTAMPDIFF( YEAR, eu.BIRTHDAY, CURDATE( ) ), 0 ) AS age,
e.ID,
e.PARTY_FLAG,
IFNULL( TIMESTAMPDIFF( YEAR, e.BIRTHDAY, CURDATE( ) ), 0 ) AS age,
st.id AS orgId
FROM
esua_epdc_admin.sys_dept st
left join esua_epdc_admin.sys_dept co on co.pid=st.id
left join esua_epdc_admin.sys_dept gr on gr.pid=co.id
left join esua_epdc_user.epdc_user eu on gr.id=eu.DEPT_ID and eu.DEL_FLAG = '0'
left join (select eu.id,
eu.BIRTHDAY,
(select ifnull(if(eu.DEPT_ID = 0, NULL, eu.DEPT_ID), (
SELECT GRID_ID FROM esua_epdc_user.epdc_user_grid_relation
WHERE DEL_FLAG = '0' AND USER_ID = eu.ID
ORDER BY
CREATED_TIME,id
LIMIT 1 )
)) AS orgId,
eu.PARTY_FLAG
from esua_epdc_user.epdc_user eu
where eu.DEL_FLAG = '0' )e on gr.id=e.orgId
WHERE
st.DEL_FLAG = '0'
and co.DEL_FLAG = '0'
@ -241,16 +274,27 @@
count( ( 60 <![CDATA[<]]> t.age AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel6
FROM
(SELECT
eu.ID,
eu.PARTY_FLAG,
IFNULL( TIMESTAMPDIFF( YEAR, eu.BIRTHDAY, CURDATE( ) ), 0 ) AS age,
e.ID,
e.PARTY_FLAG,
IFNULL( TIMESTAMPDIFF( YEAR, e.BIRTHDAY, CURDATE( ) ), 0 ) AS age,
city.id AS orgId
FROM
esua_epdc_admin.sys_dept city
left join esua_epdc_admin.sys_dept st on st.pid=city.id
left join esua_epdc_admin.sys_dept co on co.pid=st.id
left join esua_epdc_admin.sys_dept gr on gr.pid=co.id
left join esua_epdc_user.epdc_user eu on gr.id=eu.DEPT_ID and eu.DEL_FLAG = '0'
left join (select eu.id,
eu.BIRTHDAY,
(select ifnull(if(eu.DEPT_ID = 0, NULL, eu.DEPT_ID), (
SELECT GRID_ID FROM esua_epdc_user.epdc_user_grid_relation
WHERE DEL_FLAG = '0' AND USER_ID = eu.ID
ORDER BY
CREATED_TIME,id
LIMIT 1 )
)) AS orgId,
eu.PARTY_FLAG
from esua_epdc_user.epdc_user eu
where eu.DEL_FLAG = '0' )e on gr.id=e.orgId
WHERE
city.DEL_FLAG = '0'
and st.DEL_FLAG = '0'

Write Preview
Loading…
Cancel
Save