1

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ProjectMapper.xml

@@ -1943,10 +1943,11 @@
          FROM   (SELECT p.project_name AS projectName,p.id AS projectId,tg.id AS groupId,d.department_name,d.department_id AS deptId,d.corpwx_deptid AS corpwxDeptId,tg.name AS groupName,
         IFNULL(r.realHour,0) AS realHour,IFNULL(r.realCost,0) AS realCost,IFNULL(r.normalHour,0) AS normalHour,IFNULL(r.overHour,0) AS overHour,
         IFNULL(tg.man_day*8,0) AS planHour,IFNULL((SELECT SUM(change_man_day*8) FROM `group_budget_review` WHERE group_id=tg.`id` AND `status`=1),0) AS afterSetPlanHour
-        FROM task_executor te
-        LEFT JOIN task t ON t.id=te.task_id
-        LEFT JOIN `user` u ON te.executor_id=u.id
-        LEFT JOIN task_group tg ON tg.id=t.group_id
+        FROM task_group tg
+        LEFT JOIN task t ON tg.id = t.group_id
+        LEFT JOIN task_executor te ON t.id = te.task_id
+        LEFT JOIN USER u
+        ON te.executor_id = u.id
         LEFT JOIN project p ON p.id=tg.project_id
         LEFT JOIN department d ON d.department_id=u.department_id
         LEFT JOIN (
@@ -1956,7 +1957,7 @@
             AND create_date BETWEEN #{startDate} AND #{endDate}
         </if>
         AND project_id IS NOT NULL AND company_id=#{companyId} GROUP BY group_id) r ON r.group_id=tg.`id`
-        WHERE u.company_id=#{companyId}
+        WHERE p.company_id=#{companyId}
         <if test="listThird!=null and listThird.size()>0">
             AND tg.project_id in
             <foreach collection="listThird" separator="," open="(" close=")" item="item">