|
|
@ -154,7 +154,7 @@ |
|
|
tmp.TAG_NAME, |
|
|
tmp.TAG_NAME, |
|
|
tmp.VOLUNTEER_SIGNATURE, |
|
|
tmp.VOLUNTEER_SIGNATURE, |
|
|
tmp.ADDRESS, |
|
|
tmp.ADDRESS, |
|
|
IFNULL( SUM( aup.POINTS ), 0 ) AS volunteerPoints, |
|
|
IFNULL( SUM( l.POINTS ), 0 ) AS volunteerPoints, |
|
|
COUNT(aup.ID) participationNum, |
|
|
COUNT(aup.ID) participationNum, |
|
|
IFNULL( SUM( ai.KINDNESS_TIME ), 0 ) AS kindnessTime |
|
|
IFNULL( SUM( ai.KINDNESS_TIME ), 0 ) AS kindnessTime |
|
|
FROM ( |
|
|
FROM ( |
|
|
@ -188,7 +188,7 @@ |
|
|
LEFT JOIN esua_epdc_mutuality.epdc_act_info ai on ai.`ID`= aur.`ACT_ID` |
|
|
LEFT JOIN esua_epdc_mutuality.epdc_act_info ai on ai.`ID`= aur.`ACT_ID` |
|
|
GROUP BY tmp.ID |
|
|
GROUP BY tmp.ID |
|
|
<if test='sortType != null and sortType == "1"'> |
|
|
<if test='sortType != null and sortType == "1"'> |
|
|
ORDER BY IFNULL( SUM( aup.POINTS ), 0 ) DESC |
|
|
ORDER BY IFNULL( SUM( l.POINTS ), 0 ) DESC |
|
|
</if> |
|
|
</if> |
|
|
<if test='sortType != null and sortType == "2"'> |
|
|
<if test='sortType != null and sortType == "2"'> |
|
|
ORDER BY COUNT(aup.ID) DESC |
|
|
ORDER BY COUNT(aup.ID) DESC |
|
|
|