diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/issue/IssueAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/issue/IssueAnalysisDao.xml
index e5a9de28..03a8f7e5 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/issue/IssueAnalysisDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/issue/IssueAnalysisDao.xml
@@ -16,8 +16,8 @@
ee.BROWSE_NUM,
( ee.COMMENT_NUM + ee.BROWSE_NUM + ee.APPROVE_NUM + ee.OPPOSE_NUM ) AS expressAttitudeNum
FROM
- js_esua_epdc_events.epdc_issue ei
- LEFT JOIN js_esua_epdc_events.epdc_events ee ON ee.ID = ei.EVENT_ID
+ esua_epdc_events.epdc_issue ei
+ LEFT JOIN esua_epdc_events.epdc_events ee ON ee.ID = ei.EVENT_ID
AND ee.DEL_FLAG = '0'
WHERE
ei.DEL_FLAG = '0'
@@ -64,8 +64,8 @@
ee.BROWSE_NUM,
( ee.COMMENT_NUM + ee.BROWSE_NUM + ee.APPROVE_NUM + ee.OPPOSE_NUM ) AS expressAttitudeNum
FROM
- js_esua_epdc_events.epdc_issue ei
- LEFT JOIN js_esua_epdc_events.epdc_events ee ON ee.ID = ei.EVENT_ID
+ esua_epdc_events.epdc_issue ei
+ LEFT JOIN esua_epdc_events.epdc_events ee ON ee.ID = ei.EVENT_ID
AND ee.DEL_FLAG = '0'
WHERE
ei.DEL_FLAG = '0'
@@ -142,7 +142,7 @@
SUM( ei.ISSUE_STATE = 4 ) AS itemNum,
'1' as categoryLevel
FROM
- js_esua_epdc_events.epdc_issue ei
+ esua_epdc_events.epdc_issue ei
WHERE ei.DEL_FLAG = '0'
GROUP BY
@@ -160,7 +160,7 @@
SUM( ei.ISSUE_STATE = 4 ) AS itemNum,
'2' as categoryLevel
FROM
- js_esua_epdc_events.epdc_issue ei
+ esua_epdc_events.epdc_issue ei
WHERE
ei.DEL_FLAG = '0'
AND ( LENGTH( ei.CATEGORY_FULL_NAME ) - LENGTH( REPLACE ( ei.CATEGORY_FULL_NAME, '-', '' ) ) ) > 0
@@ -180,7 +180,7 @@
SUM( ei.ISSUE_STATE = 4 ) AS itemNum,
'3' as categoryLevel
FROM
- js_esua_epdc_events.epdc_issue ei
+ esua_epdc_events.epdc_issue ei
WHERE
ei.DEL_FLAG = '0'
AND ( LENGTH( ei.CATEGORY_FULL_NAME ) - LENGTH( REPLACE ( ei.CATEGORY_FULL_NAME, '-', '' ) ) ) > 1
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xml
index af50e655..4da8ddd3 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xml
@@ -127,21 +127,21 @@
ei.ID,
ei.ITEM_CONTENT,
ei.CREATED_TIME,
- ( SELECT COUNT( eihp.ID ) FROM js_esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND
+ ( SELECT COUNT( eihp.ID ) FROM esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND
eihp.ITEM_ID = ei.ID ) AS operatNum,
- ( SELECT CASE WHEN COUNT(eigp.ID) > 0 THEN '1' ELSE '0' END FROM js_esua_epdc_events.epdc_item_grid_platform eigp
+ ( SELECT CASE WHEN COUNT(eigp.ID) > 0 THEN '1' ELSE '0' END FROM esua_epdc_events.epdc_item_grid_platform eigp
WHERE eigp.DEL_FLAG = '0' AND eigp.REFERENCE_ID = ei.ID ) AS reportFlag,
- ( SELECT COUNT(eid.ID) FROM js_esua_epdc_events.epdc_item_dept eid WHERE eid.DEL_FLAG = '0' AND eid.ITEM_ID = ei.ID
+ ( SELECT COUNT(eid.ID) FROM esua_epdc_events.epdc_item_dept eid WHERE eid.DEL_FLAG = '0' AND eid.ITEM_ID = ei.ID
) AS deptNum,
ei.ITEM_STATE,
- ( SELECT eihp.CREATED_TIME FROM js_esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND
+ ( SELECT eihp.CREATED_TIME FROM esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND
eihp.ITEM_ID = ei.ID AND eihp.STATE IN (5, 10) LIMIT 1 ) AS processedTime,
( SELECT TIMESTAMPDIFF( HOUR, MIN(eihp.CREATED_TIME), MAX(eihp.CREATED_TIME) ) FROM
- js_esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND eihp.ITEM_ID = ei.ID ) AS takeTime,
+ esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND eihp.ITEM_ID = ei.ID ) AS takeTime,
ei.ALL_DEPT_NAMES,
ei.EVALUATION_SCORE
FROM
- js_esua_epdc_events.epdc_item ei
+ esua_epdc_events.epdc_item ei
WHERE
ei.DEL_FLAG = '0'
AND ei.GRID_ID IN
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
index 41410a4e..234301b0 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
@@ -10,7 +10,7 @@
SELECT
count(1)
FROM
- js_esua_epdc_news.epdc_news
+ esua_epdc_news.epdc_news
WHERE
DEL_FLAG = '0'
@@ -23,7 +23,7 @@
SELECT
count(1)
FROM
- js_esua_epdc_news.epdc_notice
+ esua_epdc_news.epdc_notice
WHERE
DEL_FLAG = '0'
@@ -36,7 +36,7 @@
SELECT
count(1)
FROM
- js_esua_epdc_events.epdc_issue
+ esua_epdc_events.epdc_issue
WHERE
DEL_FLAG = '0'
@@ -45,7 +45,7 @@
AND GRID_ID = dept.id
) AS eventCount
FROM
- js_esua_epdc_admin.sys_dept dept
+ esua_epdc_admin.sys_dept dept
WHERE
dept.DEL_FLAG = '0'
AND dept.type_key = 'grid_party'
@@ -69,8 +69,8 @@
(SELECT DISTINCT
item.*,handle.STATE
FROM
- js_esua_epdc_events.epdc_item item
- LEFT JOIN ( SELECT MAX( CREATED_TIME ) AS CREATED_TIME, ITEM_ID FROM js_esua_epdc_events.epdc_item_handle_process
+ esua_epdc_events.epdc_item item
+ LEFT JOIN ( SELECT MAX( CREATED_TIME ) AS CREATED_TIME, ITEM_ID FROM esua_epdc_events.epdc_item_handle_process
WHERE
DEL_FLAG = '0' and (state=0 or state=5 or state=10 )
@@ -78,7 +78,7 @@
GROUP BY ITEM_ID
) maxitem ON maxitem.ITEM_ID = item.ID
- LEFT JOIN js_esua_epdc_events.epdc_item_handle_process handle ON maxitem.ITEM_ID = handle.ITEM_ID
+ LEFT JOIN esua_epdc_events.epdc_item_handle_process handle ON maxitem.ITEM_ID = handle.ITEM_ID
AND maxitem.CREATED_TIME = handle.CREATED_TIME)t
WHERE
DEL_FLAG = '0'
@@ -100,12 +100,12 @@
COUNT( DISTINCT ug.user_id ) communityMemberCount,
COUNT( DISTINCT ut.ID ) communityTopicCount
FROM
- js_esua_epdc_group.epdc_group epgr
- LEFT JOIN js_esua_epdc_group.epdc_user_group ug ON epgr.id = ug.group_id AND ug.DEL_FLAG = '0'
+ esua_epdc_group.epdc_group epgr
+ LEFT JOIN esua_epdc_group.epdc_user_group ug ON epgr.id = ug.group_id AND ug.DEL_FLAG = '0'
AND DATE_FORMAT(ug.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
- LEFT JOIN js_esua_epdc_group.epdc_topic ut ON epgr.id = ut.group_id AND ut.DEL_FLAG = '0'
+ LEFT JOIN esua_epdc_group.epdc_topic ut ON epgr.id = ut.group_id AND ut.DEL_FLAG = '0'
AND DATE_FORMAT(ut.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
@@ -139,11 +139,11 @@
GROUP_CONCAT( DISTINCT u.real_name ) gridLeader
FROM
- LEFT JOIN js_esua_epdc_admin.epdc_dept_ma_code ama ON ad.id = ama.GRID_ID AND ama.DEL_FLAG = '0'
- LEFT JOIN js_esua_epdc_admin.sys_role_data_scope ards ON ards.dept_id = ad.id
- LEFT JOIN js_esua_epdc_admin.sys_role r ON ards.role_id = r.id AND r.DEL_FLAG = 0 and r.type_key = 'gridLeader'
- LEFT JOIN js_esua_epdc_admin.sys_role_user ru ON r.id = ru.role_id
- LEFT JOIN js_esua_epdc_admin.sys_user u ON ru.user_id = u.id AND u.del_flag = 0
+ LEFT JOIN esua_epdc_admin.epdc_dept_ma_code ama ON ad.id = ama.GRID_ID AND ama.DEL_FLAG = '0'
+ LEFT JOIN esua_epdc_admin.sys_role_data_scope ards ON ards.dept_id = ad.id
+ LEFT JOIN esua_epdc_admin.sys_role r ON ards.role_id = r.id AND r.DEL_FLAG = 0 and r.type_key = 'gridLeader'
+ LEFT JOIN esua_epdc_admin.sys_role_user ru ON r.id = ru.role_id
+ LEFT JOIN esua_epdc_admin.sys_user u ON ru.user_id = u.id AND u.del_flag = 0
WHERE
ad.type_key = 'grid_party'
@@ -171,7 +171,7 @@
SELECT
AUTHENTICATED_TYPE
FROM
- js_esua_epdc_user.epdc_user_authenticate_history
+ esua_epdc_user.epdc_user_authenticate_history
WHERE
DEL_FLAG = '0'
AND AUTHENTICATED_TYPE IN ( '0', '1' )
@@ -188,7 +188,7 @@
SELECT
AUTHENTICATED_FLAG
FROM
- js_esua_epdc_user.epdc_user_authenticate_history
+ esua_epdc_user.epdc_user_authenticate_history
WHERE
DEL_FLAG = '0'
AND AUTHENTICATED_TYPE IN ( '0', '1' )
@@ -205,7 +205,7 @@
SELECT
count( id ) AS HistoryCount
FROM
- js_esua_epdc_user.epdc_user_authenticate_history
+ esua_epdc_user.epdc_user_authenticate_history
WHERE
DEL_FLAG = '0'
AND AUTHENTICATED_TYPE IN ( '0', '1' )
@@ -216,7 +216,7 @@
AND USER_ID = uu.ID
) AS HistoryCount,
ifnull(if(uu.DEPT_ID = 0, NULL, uu.DEPT_ID), (
- SELECT GRID_ID FROM js_esua_epdc_user.epdc_user_grid_relation
+ SELECT GRID_ID FROM esua_epdc_user.epdc_user_grid_relation
WHERE DEL_FLAG = '0' AND USER_ID = uu.ID
ORDER BY
CREATED_TIME,
@@ -224,7 +224,7 @@
LIMIT 1
)) AS DEPT_ID
FROM
- js_esua_epdc_user.epdc_user uu ) newuu
+ esua_epdc_user.epdc_user uu ) newuu
where newuu.DEL_FLAG = '0'
AND newuu.DEPT_ID in
@@ -245,7 +245,7 @@
IFNULL( ama.id, 'unwork' ) id
FROM
- LEFT JOIN js_esua_epdc_admin.epdc_dept_ma_code ama ON ad.id = ama.GRID_ID AND ama.DEL_FLAG = '0'
+ LEFT JOIN esua_epdc_admin.epdc_dept_ma_code ama ON ad.id = ama.GRID_ID AND ama.DEL_FLAG = '0'
WHERE
ad.type_key = 'grid_party'
AND ad.del_flag = 0
@@ -259,13 +259,13 @@
- js_esua_epdc_admin.sys_dept ad
+ esua_epdc_admin.sys_dept ad
- LEFT JOIN js_esua_epdc_admin.sys_dept ad1 ON ad1.id = ad.pid
- LEFT JOIN js_esua_epdc_admin.sys_dept ad2 ON ad2.id = ad1.pid
+ LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad1.id = ad.pid
+ LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad2.id = ad1.pid