|
|
@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<resultMap type="GxtUserScore" id="GxtUserScoreResult">
|
|
|
<result property="id" column="id"/>
|
|
|
<result property="userName" column="user_name"/>
|
|
|
+ <result property="userId" column="user_id"/>
|
|
|
<result property="monthPeriod" column="month_period"/>
|
|
|
<result property="monthScoreId" column="month_score_id"/>
|
|
|
<result property="maintenanceTotalScore" column="maintenance_total_score"/>
|
|
|
@@ -30,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
</resultMap>
|
|
|
|
|
|
<sql id="selectGxtUserScoreVo">
|
|
|
- select id, user_name, month_period, month_score_id, maintenance_total_score, repair_total_score, final_score, first_check_status,
|
|
|
+ select id, user_name, (select user_id from sys_user where nick_name = gxt_user_score.user_name) AS user_id, month_period, month_score_id, maintenance_total_score, repair_total_score, final_score, first_check_status,
|
|
|
first_checker, first_check_time, second_check_status, second_checker, second_check_time, status,
|
|
|
create_by, create_time, update_by, update_time, remark,
|
|
|
(SELECT nick_name FROM sys_user WHERE user_name=gxt_user_score.create_by) AS nickName from gxt_user_score
|
|
|
@@ -57,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="secondChecker != null "> and second_checker = #{secondChecker}</if>
|
|
|
<if test="secondCheckTime != null "> and second_check_time = #{secondCheckTime}</if>
|
|
|
<if test="status != null "> and status = #{status}</if>
|
|
|
- <if test="userId != null "> and user_name = (select user_name from sys_user where user_id = #{userId})</if>
|
|
|
+ <if test="userId != null "> and user_name = (select nick_name from sys_user where user_id = #{userId})</if>
|
|
|
<if test="deptId != null ">
|
|
|
and user_name in (select nick_name from sys_user where dept_id = #{deptId})
|
|
|
</if>
|
wanglt