|
@@ -238,14 +238,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
</insert>
|
|
|
|
|
|
<select id="getManagerRankYearList" parameterType="PdmScoreRankManager" resultMap="PdmScoreRankManagerResult">
|
|
|
- select report_year,company_name,team_type, team_name,manager_name,
|
|
|
+ select report_year,company_name,team_type, GROUP_CONCAT(DISTINCT team_name) team_name,manager_name,
|
|
|
sum(score) score
|
|
|
from pdm_score_rank_manager
|
|
|
<where>
|
|
|
<if test="reportYear != null and reportYear != ''"> and report_year = #{reportYear}</if>
|
|
|
<if test="teamType != null and teamType != ''"> and team_type = #{teamType}</if>
|
|
|
</where>
|
|
|
- group by report_year,company_name,team_type, team_name,manager_name
|
|
|
+ group by report_year,company_name,team_type,manager_name
|
|
|
<if test="isBlack == null or isBlack == '' ">
|
|
|
order by score desc
|
|
|
</if>
|