From f31ae33e37895b9517ee6ace6bd703f4bbb47e81 Mon Sep 17 00:00:00 2001 From: value <z1292839451@163.com> Date: 星期日, 23 六月 2024 23:44:30 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- performance-server/src/main/resources/mapper/EvaluateLeaderMapper.xml | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/performance-server/src/main/resources/mapper/EvaluateLeaderMapper.xml b/performance-server/src/main/resources/mapper/EvaluateLeaderMapper.xml index a5009fb..d30a997 100644 --- a/performance-server/src/main/resources/mapper/EvaluateLeaderMapper.xml +++ b/performance-server/src/main/resources/mapper/EvaluateLeaderMapper.xml @@ -17,6 +17,24 @@ <result column="seasonable" property="seasonable" /> <result column="exact" property="exact" /> <result column="total" property="total" /> + <result column="name" property="name" /> + <result column="depart_lims" property="departLims"/> </resultMap> - + <select id="getEvaluateLeader" resultType="com.yuanchu.mom.pojo.EvaluateLeader"> + select el.*,u.name,dl.name depart_lims + from evaluate_leader el + left join evaluate e on el.evaluate_id = e.id + left join user u on e.user_id = u.id + left join department_lims dl on FIND_IN_SET(dl.id, depart_lims_id) + where 1=1 + <if test="month!=null and month!=''"> + and e.month=#{month} + </if> + <if test="departLims!=null and departLims!=''"> + and dl.name like concat ('%',#{departLims},'%') + </if> + <if test="name!=null and name!=''"> + and u.name like concat ('%',#{name},'%') + </if> + </select> </mapper> -- Gitblit v1.9.3