|
@@ -1293,11 +1293,10 @@
|
|
|
<select id="getReportListWithTransfer" resultType="java.util.Map">
|
|
<select id="getReportListWithTransfer" resultType="java.util.Map">
|
|
|
SELECT r.id AS reportId,u.`job_number` AS jobNumber,u.name AS userName,d.`department_name` AS deptName,
|
|
SELECT r.id AS reportId,u.`job_number` AS jobNumber,u.name AS userName,d.`department_name` AS deptName,
|
|
|
p.`project_code` AS projectCode,p.`project_name` AS projectName,date_format(r.`create_date`,'%Y-%m-%d') AS createDate,r.`working_time` AS workingTime,
|
|
p.`project_code` AS projectCode,p.`project_name` AS projectName,date_format(r.`create_date`,'%Y-%m-%d') AS createDate,r.`working_time` AS workingTime,
|
|
|
- tg.`name` AS groupName,s.`stages_name` AS stageName FROM report r
|
|
|
|
|
|
|
+ tg.`name` AS groupName,r.`stage` AS stageName FROM report r
|
|
|
LEFT JOIN `user` u ON r.`creator_id`=u.`id`
|
|
LEFT JOIN `user` u ON r.`creator_id`=u.`id`
|
|
|
LEFT JOIN project p ON r.`project_id`=p.`id`
|
|
LEFT JOIN project p ON r.`project_id`=p.`id`
|
|
|
LEFT JOIN task_group tg ON tg.`id`=r.`group_id`
|
|
LEFT JOIN task_group tg ON tg.`id`=r.`group_id`
|
|
|
- LEFT JOIN stages s ON s.`project_id`=p.id AND s.`group_id`=tg.`id`
|
|
|
|
|
LEFT JOIN department d ON d.`department_id`=u.`department_id`
|
|
LEFT JOIN department d ON d.`department_id`=u.`department_id`
|
|
|
WHERE r.company_id=#{companyId}
|
|
WHERE r.company_id=#{companyId}
|
|
|
<if test="startDate!=null and startDate!='' and endDate!=null and endDate!=''">
|
|
<if test="startDate!=null and startDate!='' and endDate!=null and endDate!=''">
|
|
@@ -1323,7 +1322,6 @@
|
|
|
LEFT JOIN `user` u ON r.`creator_id`=u.`id`
|
|
LEFT JOIN `user` u ON r.`creator_id`=u.`id`
|
|
|
LEFT JOIN project p ON r.`project_id`=p.`id`
|
|
LEFT JOIN project p ON r.`project_id`=p.`id`
|
|
|
LEFT JOIN task_group tg ON tg.`id`=r.`group_id`
|
|
LEFT JOIN task_group tg ON tg.`id`=r.`group_id`
|
|
|
- LEFT JOIN stages s ON s.`project_id`=p.id AND s.`group_id`=tg.`id`
|
|
|
|
|
LEFT JOIN department d ON d.`department_id`=u.`department_id`
|
|
LEFT JOIN department d ON d.`department_id`=u.`department_id`
|
|
|
WHERE r.company_id=#{companyId}
|
|
WHERE r.company_id=#{companyId}
|
|
|
<if test="startDate!=null and startDate!='' and endDate!=null and endDate!=''">
|
|
<if test="startDate!=null and startDate!='' and endDate!=null and endDate!=''">
|
Min