|
@@ -16,8 +16,8 @@
|
|
|
base_personnel_labour_capital t
|
|
base_personnel_labour_capital t
|
|
|
LEFT JOIN base_personnel_labour_capital_data t1 ON t1.labour_capital_id = t.id
|
|
LEFT JOIN base_personnel_labour_capital_data t1 ON t1.labour_capital_id = t.id
|
|
|
LEFT JOIN xjr_user u ON t1.job_number = u.user_name
|
|
LEFT JOIN xjr_user u ON t1.job_number = u.user_name
|
|
|
- LEFT JOIN wf_teacher_depart w ON u.id = w.create_user_id
|
|
|
|
|
- LEFT JOIN xjr_department d ON w.dept_name = d.id
|
|
|
|
|
|
|
+ LEFT JOIN xjr_user_dept_relation w ON u.id = w.user_id
|
|
|
|
|
+ LEFT JOIN xjr_department d ON w.dept_id = d.id
|
|
|
WHERE t.delete_mark = 0
|
|
WHERE t.delete_mark = 0
|
|
|
<if test="dto.year != null and dto.month != null">
|
|
<if test="dto.year != null and dto.month != null">
|
|
|
and YEAR(t.date_of_issue) = #{dto.year}
|
|
and YEAR(t.date_of_issue) = #{dto.year}
|
|
@@ -46,7 +46,6 @@
|
|
|
t.delete_mark = 0
|
|
t.delete_mark = 0
|
|
|
and YEAR(t1.date_of_issue) = #{dto.year}
|
|
and YEAR(t1.date_of_issue) = #{dto.year}
|
|
|
and t.job_number = #{dto.jobNumber}
|
|
and t.job_number = #{dto.jobNumber}
|
|
|
- limit 1
|
|
|
|
|
</select>
|
|
</select>
|
|
|
</mapper>
|
|
</mapper>
|
|
|
<!-- SELECT-->
|
|
<!-- SELECT-->
|
