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

Merge branch 'feature/qst_copy' of http://121.42.41.42:7070/r/epdc-cloud-analysis-pc-yushan into feature/qst_copy

feature/zhy_updatepush
曲树通 5 years ago
parent
c1d3a75d51 723b3397ee
commit
52b94d1587
1 changed files with 11 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml

22
epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml
View File

@ -6,8 +6,8 @@
<select id="customerAgency" resultType="com.elink.esua.epdc.dto.screen.result.ScreenCustomerAgencyDTO"> <select id="customerAgency" resultType="com.elink.esua.epdc.dto.screen.result.ScreenCustomerAgencyDTO">
SELECT sd.`id` AS agencyId, SELECT sd.`id` AS agencyId,
sd.`name` AS agencyName, sd.`name` AS agencyName,
sd.`pid` AS pid, case when sd.type_key = 'street_party' then 0 else sd.`pid` end AS pid,
sd.`pids` AS pids, case when sd.type_key = 'street_party' then 0 else sd.`pids` end AS pids,
CASE WHEN sd2.`name` IS NULL CASE WHEN sd2.`name` IS NULL
AND sd1.`name` IS NULL THEN sd.`name` WHEN sd2.`name` IS NULL THEN CONCAT(sd1.`name`, '-', sd.`name`) ELSE CONCAT(IFNULL(sd2.`name`, ''), '-', IFNULL(sd1.`name`, ''), '-', sd.`name`) END AS allParentNames, AND sd1.`name` IS NULL THEN sd.`name` WHEN sd2.`name` IS NULL THEN CONCAT(sd1.`name`, '-', sd.`name`) ELSE CONCAT(IFNULL(sd2.`name`, ''), '-', IFNULL(sd1.`name`, ''), '-', sd.`name`) END AS allParentNames,
'' AS areaMarks, '' AS areaMarks,
@ -21,7 +21,7 @@
LEFT JOIN `esua_epdc_admin`.`sys_dept` sd1 ON sd1.`id`= sd.`pid` LEFT JOIN `esua_epdc_admin`.`sys_dept` sd1 ON sd1.`id`= sd.`pid`
LEFT JOIN `esua_epdc_admin`.`sys_dept` sd2 ON sd2.`id`= sd1.`pid` LEFT JOIN `esua_epdc_admin`.`sys_dept` sd2 ON sd2.`id`= sd1.`pid`
WHERE sd.`del_flag`= 0 WHERE sd.`del_flag`= 0
AND sd.`type_key`IN('community_party', 'district_party', 'street_party') AND sd.`type_key`IN('community_party', 'street_party')
AND sd.`id` NOT IN( AND sd.`id` NOT IN(
SELECT t.`dept_id` SELECT t.`dept_id`
FROM `esua_epdc_admin`.`sys_dept_config` t FROM `esua_epdc_admin`.`sys_dept_config` t
@ -2001,7 +2001,7 @@ select gr.id as orgId,
count( behavior.GROUP_OPPOSE_FLAG = 1 OR NULL ) AS groupOpposeFlag, count( behavior.GROUP_OPPOSE_FLAG = 1 OR NULL ) AS groupOpposeFlag,
count( behavior.GROUP_JOIN_FLAG = 1 OR NULL ) AS groupJoinFlag, count( behavior.GROUP_JOIN_FLAG = 1 OR NULL ) AS groupJoinFlag,
count( behavior.GROUP_COMMENT_FLAG = 1 OR NULL ) AS groupCommentFlag, count( behavior.GROUP_COMMENT_FLAG = 1 OR NULL ) AS groupCommentFlag,
count( behavior.GROUP_CREATE_FLAG = 1 OR NULL ) groupCreateFlag 0 as groupCreateFlag
FROM FROM
esua_epdc_analysis.epdc_user_behavior_log behavior esua_epdc_analysis.epdc_user_behavior_log behavior
LEFT JOIN esua_epdc_user.epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0' LEFT JOIN esua_epdc_user.epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0'
@ -2092,7 +2092,7 @@ select gr.id as orgId,
count( behavior.GROUP_OPPOSE_FLAG = 1 OR NULL ) AS groupOpposeFlag, count( behavior.GROUP_OPPOSE_FLAG = 1 OR NULL ) AS groupOpposeFlag,
count( behavior.GROUP_JOIN_FLAG = 1 OR NULL ) AS groupJoinFlag, count( behavior.GROUP_JOIN_FLAG = 1 OR NULL ) AS groupJoinFlag,
count( behavior.GROUP_COMMENT_FLAG = 1 OR NULL ) AS groupCommentFlag, count( behavior.GROUP_COMMENT_FLAG = 1 OR NULL ) AS groupCommentFlag,
count( behavior.GROUP_CREATE_FLAG = 1 OR NULL ) groupCreateFlag 0 as groupCreateFlag
FROM esua_epdc_analysis.epdc_user_behavior_log behavior FROM esua_epdc_analysis.epdc_user_behavior_log behavior
LEFT JOIN esua_epdc_user.epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0' LEFT JOIN esua_epdc_user.epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0'
WHERE behavior.USER_ID in ( select meu.ID from esua_epdc_user.epdc_user meu ) WHERE behavior.USER_ID in ( select meu.ID from esua_epdc_user.epdc_user meu )
@ -2174,7 +2174,7 @@ select gr.id as orgId,
count( behavior.GROUP_OPPOSE_FLAG = 1 OR NULL ) AS groupOpposeFlag, count( behavior.GROUP_OPPOSE_FLAG = 1 OR NULL ) AS groupOpposeFlag,
count( behavior.GROUP_JOIN_FLAG = 1 OR NULL ) AS groupJoinFlag, count( behavior.GROUP_JOIN_FLAG = 1 OR NULL ) AS groupJoinFlag,
count( behavior.GROUP_COMMENT_FLAG = 1 OR NULL ) AS groupCommentFlag, count( behavior.GROUP_COMMENT_FLAG = 1 OR NULL ) AS groupCommentFlag,
count( behavior.GROUP_CREATE_FLAG = 1 OR NULL ) groupCreateFlag 0 as groupCreateFlag
FROM esua_epdc_analysis.epdc_user_behavior_log behavior FROM esua_epdc_analysis.epdc_user_behavior_log behavior
LEFT JOIN esua_epdc_user.epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0' LEFT JOIN esua_epdc_user.epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0'
WHERE behavior.USER_ID in ( select meu.ID from esua_epdc_user.epdc_user meu ) WHERE behavior.USER_ID in ( select meu.ID from esua_epdc_user.epdc_user meu )
@ -2246,7 +2246,7 @@ select gr.id as orgId,
count( behavior.GROUP_OPPOSE_FLAG = 1 OR NULL ) AS groupOpposeFlag, count( behavior.GROUP_OPPOSE_FLAG = 1 OR NULL ) AS groupOpposeFlag,
count( behavior.GROUP_JOIN_FLAG = 1 OR NULL ) AS groupJoinFlag, count( behavior.GROUP_JOIN_FLAG = 1 OR NULL ) AS groupJoinFlag,
count( behavior.GROUP_COMMENT_FLAG = 1 OR NULL ) AS groupCommentFlag, count( behavior.GROUP_COMMENT_FLAG = 1 OR NULL ) AS groupCommentFlag,
count( behavior.GROUP_CREATE_FLAG = 1 OR NULL ) groupCreateFlag 0 as groupCreateFlag
FROM esua_epdc_analysis.epdc_user_behavior_log behavior FROM esua_epdc_analysis.epdc_user_behavior_log behavior
LEFT JOIN esua_epdc_user.epdc_user USER ON USER.ID = behavior.USER_ID LEFT JOIN esua_epdc_user.epdc_user USER ON USER.ID = behavior.USER_ID
AND USER.DEL_FLAG = '0' AND USER.DEL_FLAG = '0'
@ -2337,7 +2337,7 @@ SELECT gr.id as orgId,
SUM( behavior.GROUP_OPPOSE_FLAG = 1 ) AS groupOpposeFlag, SUM( behavior.GROUP_OPPOSE_FLAG = 1 ) AS groupOpposeFlag,
SUM( behavior.GROUP_JOIN_FLAG = 1 ) AS groupJoinFlag, SUM( behavior.GROUP_JOIN_FLAG = 1 ) AS groupJoinFlag,
SUM( behavior.GROUP_COMMENT_FLAG = 1 ) AS groupCommentFlag, SUM( behavior.GROUP_COMMENT_FLAG = 1 ) AS groupCommentFlag,
SUM( behavior.GROUP_CREATE_FLAG = 1 ) groupCreateFlag 0 as groupCreateFlag
FROM esua_epdc_analysis.epdc_user_behavior_log behavior FROM esua_epdc_analysis.epdc_user_behavior_log behavior
GROUP BY USER_ID GROUP BY USER_ID
) behaviorCount ) behaviorCount
@ -2476,7 +2476,7 @@ UNION ALL
SUM( behavior.GROUP_OPPOSE_FLAG = 1 ) AS groupOpposeFlag, SUM( behavior.GROUP_OPPOSE_FLAG = 1 ) AS groupOpposeFlag,
SUM( behavior.GROUP_JOIN_FLAG = 1 ) AS groupJoinFlag, SUM( behavior.GROUP_JOIN_FLAG = 1 ) AS groupJoinFlag,
SUM( behavior.GROUP_COMMENT_FLAG = 1 ) AS groupCommentFlag, SUM( behavior.GROUP_COMMENT_FLAG = 1 ) AS groupCommentFlag,
SUM( behavior.GROUP_CREATE_FLAG = 1 ) groupCreateFlag 0 as groupCreateFlag
FROM esua_epdc_analysis.epdc_user_behavior_log behavior FROM esua_epdc_analysis.epdc_user_behavior_log behavior
GROUP BY USER_ID GROUP BY USER_ID
) behaviorCount ) behaviorCount
@ -2617,7 +2617,7 @@ union all
SUM( behavior.GROUP_OPPOSE_FLAG = 1 ) AS groupOpposeFlag, SUM( behavior.GROUP_OPPOSE_FLAG = 1 ) AS groupOpposeFlag,
SUM( behavior.GROUP_JOIN_FLAG = 1 ) AS groupJoinFlag, SUM( behavior.GROUP_JOIN_FLAG = 1 ) AS groupJoinFlag,
SUM( behavior.GROUP_COMMENT_FLAG = 1 ) AS groupCommentFlag, SUM( behavior.GROUP_COMMENT_FLAG = 1 ) AS groupCommentFlag,
SUM( behavior.GROUP_CREATE_FLAG = 1 ) groupCreateFlag 0 as groupCreateFlag
FROM esua_epdc_analysis.epdc_user_behavior_log behavior FROM esua_epdc_analysis.epdc_user_behavior_log behavior
GROUP BY USER_ID GROUP BY USER_ID
) behaviorCount ) behaviorCount
@ -2760,7 +2760,7 @@ union all
SUM( behavior.GROUP_OPPOSE_FLAG = 1 ) AS groupOpposeFlag, SUM( behavior.GROUP_OPPOSE_FLAG = 1 ) AS groupOpposeFlag,
SUM( behavior.GROUP_JOIN_FLAG = 1 ) AS groupJoinFlag, SUM( behavior.GROUP_JOIN_FLAG = 1 ) AS groupJoinFlag,
SUM( behavior.GROUP_COMMENT_FLAG = 1 ) AS groupCommentFlag, SUM( behavior.GROUP_COMMENT_FLAG = 1 ) AS groupCommentFlag,
SUM( behavior.GROUP_CREATE_FLAG = 1 ) groupCreateFlag 0 as groupCreateFlag
FROM esua_epdc_analysis.epdc_user_behavior_log behavior FROM esua_epdc_analysis.epdc_user_behavior_log behavior
GROUP BY USER_ID GROUP BY USER_ID
) behaviorCount ) behaviorCount

Write Preview
Loading…
Cancel
Save