1

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TaskController.java

@@ -952,13 +952,13 @@ public class TaskController {
     }
 
     @RequestMapping("/getTaskTimeCompare")
-    public HttpRespMsg getTaskTimeCompare(Integer projectId) {
-        return taskService.getTaskTimeCompare(projectId);
+    public HttpRespMsg getTaskTimeCompare(Integer projectId,Integer deptId) {
+        return taskService.getTaskTimeCompare(projectId,deptId);
     }
 
     @RequestMapping("/exportTaskTimeCompare")
-    public HttpRespMsg exportTaskTimeCompare(Integer projectId) {
-        return taskService.exportTaskTimeCompare(projectId);
+    public HttpRespMsg exportTaskTimeCompare(Integer projectId,Integer deptId) {
+        return taskService.exportTaskTimeCompare(projectId,deptId);
     }
 
     @RequestMapping("exportTask")

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/TaskMapper.java

@@ -29,7 +29,7 @@ public interface TaskMapper extends BaseMapper<Task> {
 
     List<Task> nameList(@Param(Constants.WRAPPER) Wrapper wrapper);
 
-    List getTaskTimeCompare(Integer projectId);
+    List getTaskTimeCompare(Integer projectId,Integer deptId);
 
     List<TimeTask> getTaskWithWorktime(Integer projectId, Integer taskType);
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/TaskService.java

@@ -32,8 +32,8 @@ public interface TaskService extends IService<Task> {
     List<Task> nameList(Wrapper<Task> queryWrapper);
 
 
-    HttpRespMsg getTaskTimeCompare(Integer projectId);
-    HttpRespMsg exportTaskTimeCompare(Integer projectId);
+    HttpRespMsg getTaskTimeCompare(Integer projectId,Integer deptId);
+    HttpRespMsg exportTaskTimeCompare(Integer projectId,Integer deptId);
 
     HttpRespMsg exportTask(Integer projectId, Integer taskType);
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/TaskServiceImpl.java

@@ -117,16 +117,16 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
     }
 
     @Override
-    public HttpRespMsg getTaskTimeCompare(Integer projectId) {
+    public HttpRespMsg getTaskTimeCompare(Integer projectId,Integer deptId) {
         HttpRespMsg msg = new HttpRespMsg();
-        msg.data = taskMapper.getTaskTimeCompare(projectId);
+        msg.data = taskMapper.getTaskTimeCompare(projectId,deptId);
         return msg;
     }
 
     @Override
-    public HttpRespMsg exportTaskTimeCompare(Integer projectId) {
+    public HttpRespMsg exportTaskTimeCompare(Integer projectId,Integer deptId) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
-        List<Map> list= taskMapper.getTaskTimeCompare(projectId);
+        List<Map> list= taskMapper.getTaskTimeCompare(projectId,deptId);
         Project project = projectMapper.selectById(projectId);
         try {
             //准备导出

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

@@ -150,10 +150,17 @@
 
     <!-- 查询任务实际工时和计划工时对比,仅查询有实际工时的数据 -->
     <select id="getTaskTimeCompare" resultType="java.util.Map">
-        SELECT task.id , task.name AS name, task.plan_hours as planHours, IFNULL(SUM(report.`working_time`),0) AS workHours FROM report
-                                                                                                                                     LEFT JOIN task ON report.`task_id` = task.id AND report.state = 1
-        WHERE task.project_id = #{projectId}
-        GROUP BY task.id
+        SELECT t.id , t.name AS name ,IFNULL(SUM(te.plan_hours),0) AS planHours, IFNULL(SUM(r.`working_time`),0) AS workHours FROM
+        task_executor te
+        LEFT JOIN USER u ON te.executor_id=u.id
+        LEFT JOIN task t ON t.id=te.task_id
+        LEFT JOIN report r ON r.task_id=t.id AND r.state=1
+        LEFT JOIN project p ON p.id=t.project_id
+        WHERE p.id= #{projectId}
+        <if test="deptId!=null and deptId">
+            and u.department_id=#{deptId}
+        </if>
+        GROUP BY t.id
     </select>
 
     <!--查询任务，带实际工时-->