1.修复依斯倍耗用表问题

2. 增加财务工时分配表

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

@@ -77,8 +77,8 @@ public class DepartmentController {
      * parentId 父级部门id
      */
     @RequestMapping("/add")
-    public HttpRespMsg insertDepartment(@RequestParam String name, Integer parentId, String managerId, String reportAuditUserid,String otherManagerIds, Integer isEnableMulti,HttpServletRequest request) {
-        return departmentService.insertDepartment(name, parentId, managerId, reportAuditUserid,otherManagerIds, isEnableMulti, request);
+    public HttpRespMsg insertDepartment(@RequestParam String name, Integer parentId, String managerId, String reportAuditUserid,String otherManagerIds, Integer isEnableMulti,String deptCode,HttpServletRequest request) {
+        return departmentService.insertDepartment(name, parentId, managerId, reportAuditUserid,otherManagerIds, isEnableMulti, deptCode, request);
     }
 
     /**
@@ -87,8 +87,8 @@ public class DepartmentController {
      * name 部门名称
      */
     @RequestMapping("/edit")
-    public HttpRespMsg updateDepartment(@RequestParam Integer id, @RequestParam String name, String managerId, String reportAuditUserid,String otherManagerIds,Integer pushToSap, Integer isEnableMulti, HttpServletRequest request) {
-        return departmentService.updateDepartment(id, name, managerId, reportAuditUserid,otherManagerIds,pushToSap,isEnableMulti, request);
+    public HttpRespMsg updateDepartment(@RequestParam Integer id, @RequestParam String name, String managerId, String reportAuditUserid,String otherManagerIds,Integer pushToSap, Integer isEnableMulti, String deptCode, HttpServletRequest request) {
+        return departmentService.updateDepartment(id, name, managerId, reportAuditUserid,otherManagerIds,pushToSap,isEnableMulti, deptCode, request);
     }
 
     /**

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

@@ -540,16 +540,16 @@ public class ReportController {
                 extraField3[i] = null;
             }
         }
-        if (extraField4 == null) {
+        if (extraField4 == null || extraField4.length == 0) {
             extraField4 = new String[projectId.length];
             for(int i=0;i<extraField4.length; i++) {
-                extraField4[i] = null;
+                extraField4[i] = "";
             }
         }
-        if (extraField5 == null) {
+        if (extraField5 == null || extraField5.length == 0) {
             extraField5 = new String[projectId.length];
             for(int i=0;i<extraField5.length; i++) {
-                extraField5[i] = null;
+                extraField5[i] = "";
             }
         }
         if (professionProgress == null) {

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Department.java

@@ -1,6 +1,5 @@
 package com.management.platform.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -16,7 +15,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Seyason
- * @since 2023-11-30
+ * @since 2025-04-16
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -58,23 +57,21 @@ public class Department extends Model<Department> {
     /**
      * 部门负责人id
      */
-    @TableField(value = "manager_id")
+    @TableField("manager_id")
     private String managerId;
 
     /**
      * 日报导入审核人
      */
-    @TableField(value = "report_audit_userid")
+    @TableField("report_audit_userid")
     private String reportAuditUserid;
 
-
     /**
      * 企业微信的部门id
      */
     @TableField("corpwx_deptid")
     private Integer corpwxDeptid;
 
-
     /**
      * 企业微信部门的父部门id
      */
@@ -99,6 +96,12 @@ public class Department extends Model<Department> {
     @TableField("push_to_sap")
     private Integer pushToSap;
 
+    /**
+     * 部门编码
+     */
+    @TableField("dept_code")
+    private String deptCode;
+
 
     @Override
     protected Serializable pkVal() {

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

@@ -192,7 +192,7 @@ public interface ProjectMapper extends BaseMapper<Project> {
 
     Long userProjectProcessCount(Integer deptId, String userId, Integer projectId, Integer companyId,@Param("list") List<Integer> deptIds,@Param("listSecond") List<Integer> regularDeptIds);
 
-    List<Map<String, Object>> groupExpendProcessList(String userId, Integer companyId,String startDate,String endDate,@Param("list") List<Integer> deptIds,@Param("listSecond") List<Integer> regularDeptIds,@Param("listFour") List<Integer> projectIds);
+    List<Map<String, Object>> groupExpendProcessList(String userId, Integer companyId,String startDate,String endDate,@Param("projectIds") List<Integer> projectIds);
 
     List<Map<String, Object>> projectExpendProcessList(String startDate,String endDate,Integer projectId, Integer categoryId, String userId, Integer companyId, @Param("list") List<Integer> deptIds, Integer start, Integer size);
 

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

@@ -18,9 +18,9 @@ import java.util.List;
  * @since 2020-02-11
  */
 public interface DepartmentService extends IService<Department> {
-    HttpRespMsg insertDepartment(String departmentName, Integer superiorId, String managerId, String reportAuditUserid,String otherManagerIds,Integer isEnableMulti, HttpServletRequest request);
+    HttpRespMsg insertDepartment(String departmentName, Integer superiorId, String managerId, String reportAuditUserid,String otherManagerIds,Integer isEnableMulti, String deptCode, HttpServletRequest request);
 
-    HttpRespMsg updateDepartment(Integer departmentId, String departmentName, String managerId, String reportAuditUserid,String otherManagerIds,Integer pushToSap, Integer isEnableMulti, HttpServletRequest request);
+    HttpRespMsg updateDepartment(Integer departmentId, String departmentName, String managerId, String reportAuditUserid,String otherManagerIds,Integer pushToSap, Integer isEnableMulti, String deptCode, HttpServletRequest request);
 
     HttpRespMsg deleteDepartment(Integer departmentId, HttpServletRequest request);
 

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

@@ -87,7 +87,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
 
     //新增部门
     @Override
-    public HttpRespMsg insertDepartment(String departmentName, Integer superiorId, String managerId, String reportAuditUserid,String otherManagerIds, Integer isEnableMulti, HttpServletRequest request) {
+    public HttpRespMsg insertDepartment(String departmentName, Integer superiorId, String managerId, String reportAuditUserid,String otherManagerIds, Integer isEnableMulti, String deptCode, HttpServletRequest request) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         try {
             Integer companyId = userMapper.selectById(request.getHeader("Token")).getCompanyId();
@@ -100,7 +100,8 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
                         .setSuperiorId(superiorId)
                         .setManagerId(managerId)
                         .setCompanyId(companyId)
-                        .setReportAuditUserid(reportAuditUserid);
+                        .setReportAuditUserid(reportAuditUserid)
+                        .setDeptCode(deptCode);
                 if (departmentMapper.insert(department) == 0) {
                     //httpRespMsg.setError("添加失败");
                     httpRespMsg.setError(MessageUtils.message("other.addFail"));
@@ -146,7 +147,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
 
     //更新部门
     @Override
-    public HttpRespMsg updateDepartment(Integer departmentId, String departmentName,String managerId, String reportAuditUserid,String otherManagerIds,Integer pushToSap, Integer isEnableMulti, HttpServletRequest request) {
+    public HttpRespMsg updateDepartment(Integer departmentId, String departmentName,String managerId, String reportAuditUserid,String otherManagerIds,Integer pushToSap, Integer isEnableMulti, String deptCode, HttpServletRequest request) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         try {
             Integer companyId = userMapper.selectById(request.getHeader("Token")).getCompanyId();
@@ -164,6 +165,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
                 department.setManagerId(managerId);
                 department.setPushToSap(pushToSap);
                 department.setReportAuditUserid(reportAuditUserid);
+                department.setDeptCode(deptCode);
 
                 //修改审批流中的部门名称
                 if (deptNameChanged) {

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

@@ -15244,7 +15244,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         List<Integer> targetDeptIds=new ArrayList<>();
         targetDeptIds.add(7458);
         targetDeptIds.add(8696);
-        targetDeptIds.add(8695);
+        targetDeptIds.add(8695);//工程本部
         //需要统计的分组名称
         List<String> targetGroupNameList=new ArrayList<>();
         targetGroupNameList.add("生产部电气");
@@ -15276,41 +15276,15 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         //是否具有查看全部数据的权限
         //针对依斯呗 指定部门
         List<Integer> projectIdList = projectList.stream().map(Project::getId).distinct().collect(Collectors.toList());
-        List<Integer> regularDeptIds=new ArrayList<>();
-        if(user.getCompanyId()==3092){
-            List<String> nameString=new ArrayList<>();
-            nameString.add("4");
-            nameString.add("46");
-            nameString.add("45");
-            List<Department> departmentList = departmentMapper.selectList(new LambdaQueryWrapper<Department>().eq(Department::getCompanyId, user.getCompanyId()).in(Department::getDepartmentName, nameString));
-            List<Integer> theCollect = departmentList.stream().map(dm -> dm.getDepartmentId()).distinct().collect(Collectors.toList());
-            theCollect.add(-1);
-            for (Integer integer : theCollect) {
-                List<Integer> branchDepartment = getBranchDepartment(integer, allDeptList);
-                regularDeptIds.addAll(branchDepartment);
-            }
-        }
         if(!viewAll){
             if(!incharger){
                 //只能查看本人的数据
-                resultList=projectMapper.groupExpendProcessList(user.getId(),companyId,startDate,endDate,null,null,projectIdList);
+                resultList=projectMapper.groupExpendProcessList(user.getId(),companyId,startDate,endDate,projectIdList);
             }else {
-                List<Department> departmentList = departmentMapper.selectList(new LambdaQueryWrapper<Department>().select(Department::getDepartmentId).eq(Department::getManagerId, user.getId()));
-                List<DepartmentOtherManager> departmentOtherManagerList = departmentOtherManagerMapper.selectList(new QueryWrapper<DepartmentOtherManager>().eq("other_manager_id", user.getId()));
-                List<Integer> deptIds=new ArrayList<>();
-                List<Integer> theCollect = departmentList.stream().map(dm -> dm.getDepartmentId()).distinct().collect(Collectors.toList());
-                theCollect.add(-1);
-                List<Integer> otherCollect = departmentOtherManagerList.stream().map(dom -> dom.getDepartmentId()).distinct().collect(Collectors.toList());
-                otherCollect.add(-1);
-                theCollect.addAll(otherCollect);
-                for (Integer integer : theCollect) {
-                    List<Integer> branchDepartment = getBranchDepartment(integer, allDeptList);
-                    deptIds.addAll(branchDepartment);
-                }
-                resultList=projectMapper.groupExpendProcessList(null,companyId,startDate,endDate,deptIds,regularDeptIds,projectIdList);
+                resultList=projectMapper.groupExpendProcessList(null,companyId,startDate,endDate,projectIdList);
             }
         }else {
-            resultList=projectMapper.groupExpendProcessList(null,companyId,startDate,endDate,null,regularDeptIds,projectIdList);
+            resultList=projectMapper.groupExpendProcessList(null,companyId,startDate,endDate,projectIdList);
         }
         List<Department> departmentList = departmentMapper.selectList(new LambdaQueryWrapper<Department>().eq(Department::getCompanyId, companyId));
         List<Map<String,Object>> itemList=new ArrayList<>();
@@ -15320,11 +15294,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 Optional<Department> department = departmentList.stream().filter(d -> d.getDepartmentId().equals(deptId)).findFirst();
                 Integer corpwxDeptid = department.get().getCorpwxDeptid();
                 String departmentName = department.get().getDepartmentName();
-                List<Integer> subDeptIds;
                 switch (deptId){
                     case 8696:
-                        //获取此部门下的子部门id列表
-                        subDeptIds = getBranchDepartment(deptId, allDeptList);
                         groupNames=new ArrayList<>();
                         groupNames.add("生产部电气");
                         groupNames.add("生产部车间");
@@ -15339,8 +15310,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             item.put("corpwxDeptId",corpwxDeptid);
                             item.put("department_name",departmentName);
                             if(taskGroup.isPresent()){
-//                                List<Map<String, Object>> mapList = resultList.stream().filter(r -> Integer.valueOf(String.valueOf(r.get("projectId"))).equals(project.getId())
-//                                        && Integer.valueOf(String.valueOf(r.get("groupId"))).equals(taskGroup.get().getId()) && (Integer.valueOf(String.valueOf(r.get("deptId"))).equals(7459) || subDeptIds.contains(Integer.valueOf(String.valueOf(r.get("deptId")))))).collect(Collectors.toList());
                                 List<Map<String, Object>> mapList = resultList.stream().filter(r -> Integer.valueOf(String.valueOf(r.get("projectId"))).equals(project.getId())
                                         && Integer.valueOf(String.valueOf(r.get("groupId"))).equals(taskGroup.get().getId())).collect(Collectors.toList());
                                 if(mapList!=null&&mapList.size()>0){
@@ -15383,8 +15352,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         }
                         break;
                     case 8695:
-                        //获取此部门下的子部门id列表
-                        subDeptIds = getBranchDepartment(deptId, allDeptList);
                         groupNames=new ArrayList<>();
                         groupNames.add("工程部现场安装施工");
                         groupNames.add("工程部配合调试");
@@ -15399,8 +15366,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             item.put("corpwxDeptId",corpwxDeptid);
                             item.put("department_name",departmentName);
                             if(taskGroup.isPresent()){
-//                                List<Map<String, Object>> mapList = resultList.stream().filter(r -> Integer.valueOf(String.valueOf(r.get("projectId"))).equals(project.getId())
-//                                        && Integer.valueOf(String.valueOf(r.get("groupId"))).equals(taskGroup.get().getId()) && (Integer.valueOf(String.valueOf(r.get("deptId"))).equals(7460) || subDeptIds.contains(Integer.valueOf(String.valueOf(r.get("deptId")))))).collect(Collectors.toList());
                                 List<Map<String, Object>> mapList = resultList.stream().filter(r -> Integer.valueOf(String.valueOf(r.get("projectId"))).equals(project.getId())
                                         && Integer.valueOf(String.valueOf(r.get("groupId"))).equals(taskGroup.get().getId())).collect(Collectors.toList());
                                 if(mapList!=null&&mapList.size()>0){
@@ -15443,8 +15408,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         }
                         break;
                     case 7458:
-                        //获取此部门下的子部门id列表
-                        subDeptIds = getBranchDepartment(deptId, allDeptList);
                         groupNames=new ArrayList<>();
                         groupNames.add("研发部工艺设计");
                         groupNames.add("研发部结构设计");

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

@@ -10376,7 +10376,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         HttpRespMsg msg=new HttpRespMsg();
         User user = userMapper.selectById(request.getHeader("token"));
         DateTimeFormatter df=DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        List<UserFvTime> userFvTimeList = userFvTimeMapper.selectList(new LambdaQueryWrapper<UserFvTime>().between(UserFvTime::getWorkDate, startDate, endDate));
+        List<UserFvTime> userFvTimeList = userFvTimeMapper.selectList(new LambdaQueryWrapper<UserFvTime>().between(UserFvTime::getWorkDate, startDate, endDate).eq(UserFvTime::getCompanyId, user.getCompanyId()));
         List<Department> departmentList = departmentMapper.selectList(new LambdaQueryWrapper<Department>().eq(Department::getCompanyId, user.getCompanyId()));
         List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getCompanyId, user.getCompanyId()));
         List<UserCustom> userCustomList = userCustomMapper.selectList(new LambdaQueryWrapper<UserCustom>().eq(UserCustom::getCompanyId, user.getCompanyId()));
@@ -10919,7 +10919,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     }
                     //如果存在corpwxUserid位空的用户，按姓名匹配
                     List<String> nameList = manageUserList.stream().filter(u->u.getCorpwxUserid() == null).map(User::getName).collect(Collectors.toList());
-                    if (nameList.size() == 0) {
+                    if (nameList.size() > 0) {
                         userCorpwxTimeList.addAll(userCorpwxTimeMapper.selectList(new QueryWrapper<UserCorpwxTime>().eq("company_id", companyId).in("name", nameList).between("create_date", firstDay, lastDay)));
                     }
                 } else {
@@ -10938,7 +10938,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 if (!StringUtils.isEmpty(userId)) {
                     User findUser = userMapper.selectById(userId);
                     if (findUser != null) {
-                        userFvTimeList = userFvTimeMapper.selectList(new QueryWrapper<UserFvTime>().eq("company_id", companyId).eq("user_id", userId).between("create_date", firstDay, lastDay));
+                        userFvTimeList = userFvTimeMapper.selectList(new QueryWrapper<UserFvTime>().eq("company_id", companyId).eq("user_id", userId).between("work_date", firstDay, lastDay));
                         manageUserList.add(findUser);
                     }
                 } else  if (deptId != null) {
@@ -10948,10 +10948,10 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     manageUserList = userMapper.selectList(new QueryWrapper<User>().in("department_id", allSubDeptIds));
                     if (manageUserList.size() > 0) {
                         List<String> collect = manageUserList.stream().map(User::getId).collect(Collectors.toList());
-                        userFvTimeList = userFvTimeMapper.selectList(new QueryWrapper<UserFvTime>().eq("company_id", companyId).in("user_id", collect).between("create_date", firstDay, lastDay));
+                        userFvTimeList = userFvTimeMapper.selectList(new QueryWrapper<UserFvTime>().eq("company_id", companyId).in("user_id", collect).between("work_date", firstDay, lastDay));
                     }
                 } else {
-                    userFvTimeList = userFvTimeMapper.selectList(new QueryWrapper<UserFvTime>().eq("company_id", companyId).between("create_date", firstDay, lastDay));
+                    userFvTimeList = userFvTimeMapper.selectList(new QueryWrapper<UserFvTime>().eq("company_id", companyId).between("work_date", firstDay, lastDay));
                     manageUserList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", companyId));
                 }
             } else {
@@ -10980,11 +10980,11 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     }
                     List<String> userIdList = manageUserList.stream().map(User::getId).collect(Collectors.toList());
                     if (userIdList.size() > 0) {
-                        userFvTimeList = userFvTimeMapper.selectList(new QueryWrapper<UserFvTime>().eq("company_id", companyId).in("user_id", userIdList).between("create_date", firstDay, lastDay));
+                        userFvTimeList = userFvTimeMapper.selectList(new QueryWrapper<UserFvTime>().eq("company_id", companyId).in("user_id", userIdList).between("work_date", firstDay, lastDay));
                     }
                 } else {
                     //个人看自己的
-                    userFvTimeList = userFvTimeMapper.selectList(new QueryWrapper<UserFvTime>().eq("company_id", companyId).eq("user_id", user.getId()).between("create_date", firstDay, lastDay));
+                    userFvTimeList = userFvTimeMapper.selectList(new QueryWrapper<UserFvTime>().eq("company_id", companyId).eq("user_id", user.getId()).between("work_date", firstDay, lastDay));
                     manageUserList.add(user);
                 }
             }
@@ -11060,8 +11060,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             for (UserFvTime fvTime : userFvTimeList) {
                 boolean isMatch = true;
                 double reportTime = 0;
-                User targetUser = manageUserList.stream().filter(u -> fvTime.getUserId().equals(u.getId())).findFirst().get();;
-                if (targetUser != null) {
+                Optional<User> first = manageUserList.stream().filter(u -> u.getId().equals(fvTime.getUserId())).findFirst();
+                if (first.isPresent()) {
+                    User targetUser = first.get();
                     for (Report report : reportList) {
                         if (report.getCreatorId().equals(targetUser.getId()) && fvTime.getWorkDate().isEqual(report.getCreateDate())) {
                             reportTime = report.getWorkingTime();

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

@@ -16,11 +16,12 @@
         <result column="dd_deptid" property="ddDeptid" />
         <result column="feishu_deptid" property="feishuDeptid" />
         <result column="push_to_sap" property="pushToSap" />
+        <result column="dept_code" property="deptCode" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        department_id, department_name, seq, superior_id, company_id, manager_id, report_audit_userid, corpwx_deptid, corpwx_deptpid, dd_deptid, feishu_deptid, push_to_sap
+        department_id, department_name, seq, superior_id, company_id, manager_id, report_audit_userid, corpwx_deptid, corpwx_deptpid, dd_deptid, feishu_deptid, push_to_sap, dept_code
     </sql>
     <!--根据部门获取成本-->
     <select id="getCostByDepartment" resultType="java.util.Map">
@@ -149,7 +150,7 @@
     <select id="getNameWithProjectRelates" resultType="com.management.platform.entity.vo.ProjectDeptInfo">
         select department.department_id,department.department_name,pdr.project_id
         from department
-                 left join project_dept_relate pdr on department.department_id = pdr.department_id
+        left join project_dept_relate pdr on department.department_id = pdr.department_id
         where pdr.project_id in
         <foreach collection="projectIds" item="projectId" separator="," open="(" close=")">
             #{projectId}

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

@@ -1960,35 +1960,30 @@
     </select>
 
     <select id="groupExpendProcessList" resultType="java.util.Map">
-        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,
+        SELECT p.project_name AS projectName,p.id AS projectId,tg.id AS groupId,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_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 AND u.`company_id`=#{companyId}
-        LEFT JOIN project p ON p.id=tg.project_id
-        LEFT JOIN department d ON d.department_id=u.department_id
+        LEFT JOIN project p ON p.id=tg.project_id AND p.`company_id`=#{companyId}
         LEFT JOIN (
         SELECT SUM(working_time) AS realHour,SUM(cost) AS realCost,(SUM(working_time)-SUM(overtime_hours)) AS normalHour,SUM(overtime_hours) AS overHour,group_id,dept_id
         FROM report  WHERE state=1
         <if test="startDate!=null and startDate!='' and endDate!=null and endDate!=''">
          AND create_date BETWEEN #{startDate} AND #{endDate}
         </if>
-        AND project_id IS NOT NULL AND company_id=#{companyId} GROUP BY group_id,dept_id) r ON r.group_id=tg.`id` and r.dept_id=u.department_id
+        <if test="userId!=null and userId!=''">
+            and report.creator_id=#{userId}
+        </if>
+        AND project_id IS NOT NULL AND company_id=#{companyId} GROUP BY group_id) r ON r.group_id=tg.`id`
         WHERE p.company_id=#{companyId}
-        <if test="listFour!=null and listFour.size()>0">
+        <if test="projectIds!=null and projectIds.size()>0">
             AND tg.project_id in
-            <foreach collection="listFour" separator="," open="(" close=")" item="item">
+            <foreach collection="projectIds" separator="," open="(" close=")" item="item">
                 #{item}
             </foreach>
         </if>
         AND tg.name IN ('生产部电气','生产部车间','工程部现场安装施工','工程部配合调试','研发部工艺设计','研发部结构设计','研发部BIM设计','研发部电气设计','研发部工艺调试验收','研发部电气调试验收')
-        <if test="userId!=null and userId!=''">
-            and t.executor_id=#{userId}
-        </if>
-        GROUP BY p.id,tg.id,d.department_id ORDER BY p.id,d.department_id
+        GROUP BY p.id,tg.id ORDER BY p.id
     </select>
 
     <select id="groupExpendProcessListForChart" resultType="java.util.Map">