|
|
@@ -65,20 +65,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
|
|
|
<select id="getSummaryList" parameterType="SysDept" resultMap="SysDeptResult">
|
|
|
SELECT
|
|
|
- d.dept_id,
|
|
|
- d.dept_name,
|
|
|
- d.parent_id,
|
|
|
- d.order_num,
|
|
|
+ t.dept_id,
|
|
|
+ t.dept_name,
|
|
|
+ t.parent_id,
|
|
|
+ t.order_num,
|
|
|
e.dept_name AS parent_name,
|
|
|
ms.`status`,
|
|
|
ms.month_period
|
|
|
FROM gxt_month_score ms
|
|
|
- LEFT JOIN sys_dept d ON ms.dept_id = d.dept_id
|
|
|
- LEFT JOIN sys_dept e ON d.parent_id = e.dept_id
|
|
|
+ LEFT JOIN sys_dept t ON ms.dept_id = t.dept_id
|
|
|
+ LEFT JOIN sys_dept e ON t.parent_id = e.dept_id
|
|
|
<where>
|
|
|
- <if test="deptId != null "> and d.dept_id = #{deptId}</if>
|
|
|
- <if test="parentId != null "> and d.parent_id = #{parentId}</if>
|
|
|
- <if test="deptName != null and deptName != ''"> and d.dept_name like concat('%', #{deptName}, '%')</if>
|
|
|
+ <if test="deptId != null "> and t.dept_id = #{deptId}</if>
|
|
|
+ <if test="parentId != null "> and t.parent_id = #{parentId}</if>
|
|
|
+ <if test="deptName != null and deptName != ''"> and t.dept_name like concat('%', #{deptName}, '%')</if>
|
|
|
<if test="parentName != null and parentName != ''"> and e.dept_name like concat('%', #{parentName}, '%')</if>
|
|
|
<if test="monthPeriod != null and monthPeriod != ''"> and ms.month_period = #{monthPeriod}</if>
|
|
|
<if test="status != null ">
|
|
|
@@ -99,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
</where>
|
|
|
ORDER BY
|
|
|
ms.month_period desc,
|
|
|
- d.parent_id,d.order_num
|
|
|
+ t.parent_id,t.order_num
|
|
|
</select>
|
|
|
|
|
|
<select id="selectDeptListByRoleId" resultType="Long">
|
wanglt