Browse Source

Revert "去除测试数据库前缀"

This reverts commit 290b1613
feature/screenDataPush
songyunpeng 4 years ago
parent
commit
45ab1ee918
  1. 22
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/VolunteerPointsAnalysisDao.xml

22
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/VolunteerPointsAnalysisDao.xml

@ -10,8 +10,8 @@
IFNULL(COUNT( DISTINCT v.ID ), 0) AS volunteerNum, IFNULL(COUNT( DISTINCT v.ID ), 0) AS volunteerNum,
IFNULL(SUM( l.POINTS ), 0) AS volunteerPoints IFNULL(SUM( l.POINTS ), 0) AS volunteerPoints
FROM FROM
esua_epdc_user.epdc_volunteer_dept d js_esua_epdc_user.epdc_volunteer_dept d
LEFT JOIN esua_epdc_user.epdc_volunteer_info v ON v.VOLUNTEER_DEPT_ID = d.ID LEFT JOIN js_esua_epdc_user.epdc_volunteer_info v ON v.VOLUNTEER_DEPT_ID = d.ID
AND v.DEL_FLAG = '0' AND v.DEL_FLAG = '0'
AND v.AUDIT_STATUS IN ( '0', '1' ) AND v.AUDIT_STATUS IN ( '0', '1' )
<if test="startTime != null and startTime != ''"> <if test="startTime != null and startTime != ''">
@ -20,7 +20,7 @@
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
and DATE_FORMAT( v.REGIST_TIME, '%Y-%m-%d' ) &lt;=#{endTime} and DATE_FORMAT( v.REGIST_TIME, '%Y-%m-%d' ) &lt;=#{endTime}
</if> </if>
LEFT JOIN esua_epdc_points.epdc_points_logs l ON l.USER_ID = v.USER_ID LEFT JOIN js_esua_epdc_points.epdc_points_logs l ON l.USER_ID = v.USER_ID
AND l.DEL_FLAG = '0' AND l.DEL_FLAG = '0'
AND l.BEHAVIOR_CODE = 'join_act' AND l.BEHAVIOR_CODE = 'join_act'
<if test="startTime != null and startTime != ''"> <if test="startTime != null and startTime != ''">
@ -65,10 +65,10 @@
v.VOLUNTEER_SIGNATURE, v.VOLUNTEER_SIGNATURE,
v.ADDRESS v.ADDRESS
FROM FROM
esua_epdc_user.epdc_volunteer_info v js_esua_epdc_user.epdc_volunteer_info v
LEFT JOIN esua_epdc_user.epdc_volunteer_tag_relation r ON r.VOLUNTEER_ID = v.ID LEFT JOIN js_esua_epdc_user.epdc_volunteer_tag_relation r ON r.VOLUNTEER_ID = v.ID
AND r.DEL_FLAG = '0' AND r.DEL_FLAG = '0'
LEFT JOIN esua_epdc_user.epdc_volunteer_tag t ON t.ID = r.TAG_ID LEFT JOIN js_esua_epdc_user.epdc_volunteer_tag t ON t.ID = r.TAG_ID
WHERE WHERE
v.DEL_FLAG = '0' v.DEL_FLAG = '0'
AND v.AUDIT_STATUS IN ( '0', '1' ) AND v.AUDIT_STATUS IN ( '0', '1' )
@ -80,7 +80,7 @@
and DATE_FORMAT( v.REGIST_TIME, '%Y-%m-%d' ) &lt;=#{endTime} and DATE_FORMAT( v.REGIST_TIME, '%Y-%m-%d' ) &lt;=#{endTime}
</if> </if>
) tmp ) tmp
LEFT JOIN esua_epdc_points.epdc_points_logs l ON l.USER_ID = tmp.USER_ID LEFT JOIN js_esua_epdc_points.epdc_points_logs l ON l.USER_ID = tmp.USER_ID
AND l.DEL_FLAG = '0' AND l.DEL_FLAG = '0'
AND l.BEHAVIOR_CODE = 'join_act' AND l.BEHAVIOR_CODE = 'join_act'
<if test="startTime != null and startTime != ''"> <if test="startTime != null and startTime != ''">
@ -105,10 +105,10 @@
ELSE ai.`TITLE` ELSE ai.`TITLE`
END AS actName, END AS actName,
l.`OPERATION_TIME` l.`OPERATION_TIME`
FROM `esua_epdc_points`.`epdc_points_logs` l FROM `js_esua_epdc_points`.`epdc_points_logs` l
LEFT JOIN `esua_epdc_mutuality`.`epdc_act_user_points_log` aup on aup.`ID`= l.`REFERENCE_ID` LEFT JOIN `js_esua_epdc_mutuality`.`epdc_act_user_points_log` aup on aup.`ID`= l.`REFERENCE_ID`
LEFT JOIN `esua_epdc_mutuality`.`epdc_act_user_relation` aur on aur.`ID`= aup.`ACT_USER_ID` LEFT JOIN `js_esua_epdc_mutuality`.`epdc_act_user_relation` aur on aur.`ID`= aup.`ACT_USER_ID`
LEFT JOIN `esua_epdc_mutuality`.`epdc_act_info` ai on ai.`ID`= aur.`ACT_ID` LEFT JOIN `js_esua_epdc_mutuality`.`epdc_act_info` ai on ai.`ID`= aur.`ACT_ID`
WHERE l.`DEL_FLAG`= '0' WHERE l.`DEL_FLAG`= '0'
AND l.`BEHAVIOR_CODE`= 'join_act' AND l.`BEHAVIOR_CODE`= 'join_act'
AND l.USER_ID = #{userId} AND l.USER_ID = #{userId}

Loading…
Cancel
Save