修改重置提示

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

@@ -1635,5 +1635,10 @@ public class ProjectController {
     public HttpRespMsg exportTaskPlanFTEData(String monthStart,String monthEnd,String area,String userId,Integer departmentId ,HttpServletRequest request){
         return projectService.exportTaskPlanFTEData(monthStart,monthEnd,area,userId,departmentId,request);
     }
+
+    @RequestMapping("/initTaskGroupsFromTemplate")
+    public HttpRespMsg initTaskGroupsFromTemplate(Integer companyId){
+        return projectService.initTaskGroups(companyId);
+    }
 }
 

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

@@ -62,6 +62,8 @@ public class FinanceMonthlyWorktime extends Model<FinanceMonthlyWorktime> {
     /**
      * 最近一次发送时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("last_send_time")
     private LocalDateTime lastSendTime;
 

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

@@ -331,4 +331,5 @@ public interface ProjectService extends IService<Project> {
 
     HttpRespMsg exportTaskPlanFTEData(String monthStart, String monthEnd, String area, String userId, Integer departmentId, HttpServletRequest request);
 
+    HttpRespMsg initTaskGroups(Integer companyId);
 }

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

@@ -298,30 +298,16 @@ public class FinanceMonthlyWorktimeServiceImpl extends ServiceImpl<FinanceMonthl
                                                 }
                                             });
                                         } else {
-                                            throw new Exception("存在目标部门没有内部工时，导致公共工时无法分摊：targetDeptId=="+assignToDeptId);
+                                            Department dept = departmentMapper.selectById(assignToDeptId);
+                                            throw new Exception("存在目标部门没有内部工时，导致公共工时无法分摊：部门=="+dept.getDepartmentName()+",deptId=="+assignToDeptId);
                                         }
                                     }
                                 }
                             } else {
                                 //本部门也没有协作其他部门产生工单工时
-                                throw new Exception("公共工时无法分配，因为本部门没有协作其他部门产生工单工时，deptId=="+deptId);
+                                Department dept = departmentMapper.selectById(deptId);
+                                throw new Exception("公共工时无法分配，因为本部门没有协作其他部门产生工单工时，部门=="+dept.getDepartmentName()+",deptId=="+deptId);
                             }
-
-//                            List<FmwDetail> fmwDetails = insertDataList.stream().filter(fmwDetail -> fmwDetail.getDeptId().equals(deptId)).collect(Collectors.toList());
-//                            double assistDeptTotalTime = fmwDetails.stream().reduce(0.0, (a, b) -> a + b.getAssistTime(), Double::sum);
-//                            if (assistDeptTotalTime > 0) {
-//                                //计算总工时： 用维修组装工时，调试工时和等料工时相加
-//                                insertDataList.forEach(fmwDetail -> {
-//                                    //计算每一个项目的部门内部工时占比，按比例分摊公共工时
-//                                    if (fmwDetail.getProjectId().equals(publicReportDeptItem.getProjectId())) {
-//                                        double curProjectTime = fmwDetail.getMaintanceTime() + fmwDetail.getDebugTime() + fmwDetail.getWaitingTime();
-//                                        double assignTime = curProjectTime / assistDeptTotalTime * publicReportDeptItem.getWorkingTime();
-//                                        fmwDetail.setPublicTime(assignTime);
-//                                    }
-//                                });
-//                            } else {
-//                                throw new Exception("存在部门公共工时无法分配，来源deptId=="+deptId);
-//                            }
                         }
                     }
                 }

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

@@ -13842,6 +13842,18 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         return httpRespMsg;
     }
 
+    @Override
+    public HttpRespMsg initTaskGroups(Integer companyId) {
+        HttpRespMsg httpRespMsg = new HttpRespMsg();
+        User user = userMapper.selectById(request.getHeader("TOKEN"));
+        List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().eq("company_id", user.getCompanyId()));
+        projectList.forEach(p->{
+            taskGroupService.initGroup(companyId, p.getId(), user);
+        });
+
+        return httpRespMsg;
+    }
+
     //导出FTE报表数据
     @Override
     public HttpRespMsg exportFTEData(String monthStart,String monthEnd, String area,Integer departmentId,HttpServletRequest request) {

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

@@ -219,9 +219,6 @@ public class TaskGroupServiceImpl extends ServiceImpl<TaskGroupMapper, TaskGroup
                 group.setName(groupTemplate.getName());
                 save(group);
                 //从模板创建任务列表
-                Project project = projectMapper.selectById(projectId);
-                String inchargerId = project.getInchargerId();
-                User inchargerUser = userMapper.selectById(inchargerId);
                 List<GroupTmpstages> stages = groupTmpstagesMapper.selectList(new QueryWrapper<GroupTmpstages>().eq("template_id", groupTemplate.getId()));
                 List<Stages> batchList = new ArrayList<>();
                 stages.forEach(s->{