elink-star
/
epdc-cloud-analysis-pc-yushan
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

PC端-工作台-数据统计接口 init

hotfix/zhy
liuchuang 5 years ago
parent
d9bf18f668
commit
5f712b715b
3 changed files with 45 additions and 45 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. 6
      epdc-cloud-analysis-pc/src/main/resources/mapper/backstage/EpdcBackstageDao.xml
  2. 82
      epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml
  3. 2
      epdc-cloud-client-yushan

6
epdc-cloud-analysis-pc/src/main/resources/mapper/backstage/EpdcBackstageDao.xml
View File

@ -20,7 +20,7 @@
SUM(
DATE_FORMAT( DATE_SUB( CURDATE(), INTERVAL 1 DAY ), '%Y-%m-%d' ) = DATE_FORMAT( t.CREATED_TIME, '%Y-%m-%d' )) AS topicAddedYesterdayNum
FROM
yushan_esua_epdc_group.epdc_topic t
esua_epdc_group.epdc_topic t
WHERE
t.DEL_FLAG = '0'
<if test="deptId != null and deptId != ''">
@ -36,7 +36,7 @@
SUM(
DATE_FORMAT( DATE_SUB( CURDATE(), INTERVAL 1 DAY ), '%Y-%m-%d' ) = DATE_FORMAT( issue.CREATED_TIME, '%Y-%m-%d' )) AS issueAddedYesterdayNum
FROM
yushan_esua_epdc_events.epdc_issue issue
esua_epdc_events.epdc_issue issue
WHERE
issue.DEL_FLAG = '0'
<if test="deptId != null and deptId != ''">
@ -58,7 +58,7 @@
AND item.ITEM_STATE = 10
) AS itemCaseClosedAddedYesterdayNum
FROM
yushan_esua_epdc_events.epdc_item item
esua_epdc_events.epdc_item item
WHERE
item.DEL_FLAG = '0'
<if test="deptId != null and deptId != ''">

82
epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml
View File

@ -27,9 +27,9 @@
i.DISTRIBUTE_TIME,
IFNULL(e.APPROVE_NUM + e.OPPOSE_NUM + e.COMMENT_NUM, 0) AS attentionNum
FROM
yushan_esua_epdc_events.epdc_item i
LEFT JOIN yushan_esua_epdc_events.epdc_category c ON c.CATEGORY_CODE = i.CATEGORY_CODE
LEFT JOIN yushan_esua_epdc_events.epdc_events e ON e.ID = i.EVENT_ID
esua_epdc_events.epdc_item i
LEFT JOIN esua_epdc_events.epdc_category c ON c.CATEGORY_CODE = i.CATEGORY_CODE
LEFT JOIN esua_epdc_events.epdc_events e ON e.ID = i.EVENT_ID
WHERE
i.DEL_FLAG = '0'
ORDER BY
@ -45,13 +45,13 @@
ec.CATEGORY_NAME,
t.itemNum
FROM
yushan_esua_epdc_analysis.meta_epdc_category ec
esua_epdc_analysis.meta_epdc_category ec
LEFT JOIN (
SELECT
c.CATEGORY_NAME,
IFNULL( SUM( c.ITEM_TOTLE ), 0 ) itemNum
FROM
yushan_esua_epdc_analysis.epdc_issue_item_category c
esua_epdc_analysis.epdc_issue_item_category c
WHERE
c.CATEGORY_TYPE = '1'
GROUP BY
@ -69,7 +69,7 @@
IFNULL(SUM(ITEM_STATE = 0), 0) AS processingNum,
IFNULL(SUM(ITEM_STATE = 5 OR ITEM_STATE = 10), 0) AS completedNum
FROM
yushan_esua_epdc_events.epdc_item
esua_epdc_events.epdc_item
WHERE
DEL_FLAG = '0'
</select>
@ -83,8 +83,8 @@
di.HANDLE_TOTAL,
di.DEPT_TOTAL
FROM
yushan_esua_epdc_analysis.epdc_difficult_item di,
yushan_esua_epdc_analysis.epdc_item_difficult_config dc
esua_epdc_analysis.epdc_difficult_item di,
esua_epdc_analysis.epdc_item_difficult_config dc
WHERE
di.DEL_FLAG = '0'
AND (
@ -115,7 +115,7 @@
SATISFACTION_RATE,
AUTONOMY_RATE
FROM
yushan_esua_epdc_analysis.epdc_screen_governance_ranking
esua_epdc_analysis.epdc_screen_governance_ranking
WHERE
DEL_FLAG = '0'
AND STATISTIC_TYPE = #{statisticType}
@ -137,8 +137,8 @@
n.CREATED_TIME,
n.TOP_FLAG
FROM
yushan_esua_epdc_news.epdc_notice n
LEFT JOIN yushan_esua_epdc_news.epdc_module_type t ON t.id = n.TYPE_ID
esua_epdc_news.epdc_notice n
LEFT JOIN esua_epdc_news.epdc_module_type t ON t.id = n.TYPE_ID
WHERE
n.DEL_FLAG = '0'
AND n.NOTICE_RELEASE_STATE = '1'
@ -161,8 +161,8 @@
IFNULL( a.ACT_SHYK_PERSON_NUM, 0 ) AS actShykPersonNum,
IFNULL( a.ACT_LJGJ_PERSON_NUM, 0 ) AS actLjgjPersonNum
FROM
yushan_esua_epdc_admin.sys_dept d
LEFT JOIN yushan_esua_epdc_analysis.epdc_screen_community_act_statistics a ON a.DEPT_ID = d.id
esua_epdc_admin.sys_dept d
LEFT JOIN esua_epdc_analysis.epdc_screen_community_act_statistics a ON a.DEPT_ID = d.id
AND a.DEL_FLAG = '0'
WHERE
d.del_flag = 0
@ -186,8 +186,8 @@
ot.IMG_URL,
COUNT( po.ID ) AS partyOrgNum
FROM
yushan_esua_epdc_admin.epdc_party_org_type ot
LEFT JOIN yushan_esua_epdc_admin.epdc_party_org po ON po.TYPE_CODE = ot.TYPE_CODE
esua_epdc_admin.epdc_party_org_type ot
LEFT JOIN esua_epdc_admin.epdc_party_org po ON po.TYPE_CODE = ot.TYPE_CODE
AND po.DEL_FLAG = '0'
WHERE
ot.DEL_FLAG = '0'
@ -210,8 +210,8 @@
po.TYPE_CODE,
pot.IMG_URL
FROM
yushan_esua_epdc_admin.epdc_party_org po
LEFT JOIN yushan_esua_epdc_admin.epdc_party_org_type pot ON po.TYPE_CODE = pot.TYPE_CODE
esua_epdc_admin.epdc_party_org po
LEFT JOIN esua_epdc_admin.epdc_party_org_type pot ON po.TYPE_CODE = pot.TYPE_CODE
WHERE
po.DEL_FLAG = '0'
AND
@ -229,8 +229,8 @@
ui.PROMISE,
ui.SERVICE_AREA
FROM
yushan_esua_epdc_user.epdc_user_info ui
LEFT JOIN yushan_esua_epdc_user.epdc_user u ON u.ID = ui.USER_ID
esua_epdc_user.epdc_user_info ui
LEFT JOIN esua_epdc_user.epdc_user u ON u.ID = ui.USER_ID
WHERE
ui.DEL_FLAG = '0'
AND ui.RECOMMEND_FLAG = '1'
@ -249,7 +249,7 @@
IFNULL(SUM( AGE_SIXTY_ONE_SEVENTY ), 0) AS ageSixtyOneSeventy,
IFNULL(SUM( AGE_OVER_SEVENTY ), 0) AS ageOverSeventy
FROM
yushan_esua_epdc_analysis.epdc_screen_party_member_age_statistics
esua_epdc_analysis.epdc_screen_party_member_age_statistics
WHERE
DEL_FLAG = '0'
</select>
@ -269,9 +269,9 @@
sdi.ACREAGE AS acreage,
edi.IMG_URL AS imgUrl,
edi.IMG_TYPE AS imgType
FROM yushan_esua_epdc_admin.sys_dept_info sdi
LEFT JOIN yushan_esua_epdc_admin.sys_dept sd ON sd.ID = sdi.DEPT_ID
LEFT JOIN yushan_esua_epdc_admin.epdc_admin_img edi ON edi.REFERENCE_ID = sdi.DEPT_ID
FROM esua_epdc_admin.sys_dept_info sdi
LEFT JOIN esua_epdc_admin.sys_dept sd ON sd.ID = sdi.DEPT_ID
LEFT JOIN esua_epdc_admin.epdc_admin_img edi ON edi.REFERENCE_ID = sdi.DEPT_ID
WHERE sd.del_flag = '0'
AND sdi.DEL_FLAG = '0'
AND edi.DEL_FLAG = '0'
@ -286,7 +286,7 @@
sum(if(LIVE_TYPE='0',PERSON_NUM,0)) as permanentResidenceNum,
sum(if(LIVE_TYPE='1',PERSON_NUM,0)) as floatingPopulationNum,
sum(if(LIVE_TYPE='2',PERSON_NUM,0)) as overseasPopulationNum
FROM yushan_esua_epdc_analysis.epdc_screen_person_live_statistics
FROM esua_epdc_analysis.epdc_screen_person_live_statistics
WHERE DEL_FLAG = '0'
</select>
@ -298,7 +298,7 @@
sum(if(HOUSE_TYPE ='2',HOUSE_NUM ,0)) as dormitoryNum,
sum(if(HOUSE_TYPE ='3',HOUSE_NUM ,0)) as vacantNum,
sum(if(HOUSE_TYPE ='4',HOUSE_NUM ,0)) as otherNum
FROM yushan_esua_epdc_analysis.epdc_screen_house_type_statistics
FROM esua_epdc_analysis.epdc_screen_house_type_statistics
WHERE DEL_FLAG = '0'
</select>
@ -309,7 +309,7 @@
SUM(ONE_SHOT_NUM) as oneShotNum,
SUM(TWO_SHOTS_NUM) as twoShotsNum,
SUM(NOT_VACCINATED_NUM) as notVaccinatedNum
FROM yushan_esua_epdc_analysis.epdc_screen_vaccination_statistics
FROM esua_epdc_analysis.epdc_screen_vaccination_statistics
WHERE DEL_FLAG = '0'
<if test="typeKey != null and typeKey !=''">
AND TYPE_KEY = #{typeKey}
@ -329,7 +329,7 @@
BEING_VACCINATED_NUM,
LONGITUDE,
LATITUDE
FROM yushan_esua_epdc_analysis.epdc_screen_vaccination_statistics
FROM esua_epdc_analysis.epdc_screen_vaccination_statistics
WHERE DEL_FLAG = '0'
ORDER BY
<if test="orderType == 0">
@ -353,7 +353,7 @@
SELECT
COMPANY,
SUM(VACCINATION_NUM) AS vaccinationNum
FROM yushan_esua_epdc_analysis.epdc_screen_vaccination_company_statistics
FROM esua_epdc_analysis.epdc_screen_vaccination_company_statistics
WHERE DEL_FLAG = '0'
GROUP BY
COMPANY
@ -368,7 +368,7 @@
SUM(AGE_FORTY_ONE_FIFTY) AS ageFortyOneFifty,
SUM(AGE_FIFTY_ONE_SIXTY) AS ageFiftyOneSixty,
SUM(AGE_OVER_SIXTY) AS ageOverSixty
FROM yushan_esua_epdc_analysis.epdc_screen_vaccination_age_statistics
FROM esua_epdc_analysis.epdc_screen_vaccination_age_statistics
WHERE DEL_FLAG = '0'
AND STATISTIC_TYPE = #{statisticType}
<if test="typeKey != null and typeKey !=''">
@ -382,7 +382,7 @@
SUM(PERMANENT_RESIDENCE_NUM) AS permanentResidenceNum,
SUM(FLOATING_POPULATION_NUM) AS floatingPopulationNum,
SUM(FOREIGN_POPULATION_NUM) AS foreignPopulationNum
FROM yushan_esua_epdc_analysis.epdc_screen_vaccination_person_statistics
FROM esua_epdc_analysis.epdc_screen_vaccination_person_statistics
WHERE DEL_FLAG = '0'
AND STATISTIC_TYPE = #{statisticType}
<if test="typeKey != null and typeKey !=''">
@ -398,14 +398,14 @@
(SELECT
GROUP_CONCAT(r.STAFF_NAME)
FROM
yushan_esua_epdc_admin.sys_user u
LEFT JOIN yushan_esua_epdc_admin.sys_epmet_user_relation r ON r.SYS_USER_ID = u.id AND r.DEL_FLAG = '0'
esua_epdc_admin.sys_user u
LEFT JOIN esua_epdc_admin.sys_epmet_user_relation r ON r.SYS_USER_ID = u.id AND r.DEL_FLAG = '0'
WHERE
u.del_flag = 0
AND u.dept_id = i.GRID_ID
ORDER BY r.CREATED_TIME) AS gridMan
FROM
yushan_esua_epdc_events.epdc_item i
esua_epdc_events.epdc_item i
WHERE
i.DEL_FLAG = '0'
<if test="idFlag == 0">
@ -439,9 +439,9 @@
itemDept.DEPT_NAME,
img.IMG_URL
FROM
yushan_esua_epdc_events.epdc_item_handle_process hp
LEFT JOIN yushan_esua_epdc_events.epdc_item_dept itemDept ON hp.ID = itemDept.ITEM_HANDLE_ID
LEFT JOIN yushan_esua_epdc_events.epdc_img img ON hp.ID = img.REFERENCE_ID
esua_epdc_events.epdc_item_handle_process hp
LEFT JOIN esua_epdc_events.epdc_item_dept itemDept ON hp.ID = itemDept.ITEM_HANDLE_ID
LEFT JOIN esua_epdc_events.epdc_img img ON hp.ID = img.REFERENCE_ID
AND IMG_TYPE = 'itemHandle'
AND img.DEL_FLAG = '0'
WHERE
@ -462,7 +462,7 @@
NULL AS DEPT_NAME,
NULL AS IMG_URL
FROM
yushan_esua_epdc_events.epdc_item item
esua_epdc_events.epdc_item item
WHERE
item.DEL_FLAG = '0'
AND item.ID = #{id}
@ -472,7 +472,7 @@
</select>
<select id="selectItemInfo" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenItemInfoResultDTO">
SELECT ID, ISSUE_ID, EVENT_ID FROM yushan_esua_epdc_events.epdc_item WHERE DEL_FLAG = '0'
SELECT ID, ISSUE_ID, EVENT_ID FROM esua_epdc_events.epdc_item WHERE DEL_FLAG = '0'
<if test="idFlag == 0">
AND ID = #{id}
</if>
@ -492,8 +492,8 @@
hd.GROUP_NAME,
img.IMG_URL
FROM
yushan_esua_epdc_events.epdc_issue_handle hd
LEFT JOIN yushan_esua_epdc_events.epdc_img img ON hd.ID = img.REFERENCE_ID
esua_epdc_events.epdc_issue_handle hd
LEFT JOIN esua_epdc_events.epdc_img img ON hd.ID = img.REFERENCE_ID
AND img.DEL_FLAG = '0'
AND img.IMG_TYPE = 'issueHandle'
WHERE
@ -510,7 +510,7 @@
ISSUE_LATITUDE,
ISSUE_LONGITUDE
FROM
yushan_yushan_esua_epdc_events.epdc_item
esua_epdc_events.epdc_item
WHERE
DEL_FLAG = '0'
ORDER BY

2
epdc-cloud-client-yushan

@ -1 +1 @@
Subproject commit 3b4c1c3076a2ea432cafe8ebe21b64eb74db8a5a
Subproject commit 5b564cde29b3dd3539da42136c9514fdd1463761
Write Preview
Loading…
Cancel
Save