任务工时

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

@@ -81,8 +81,8 @@ public class GroupBudgetReviewController {
         Project project = projectMapper.selectById(taskGroup.getProjectId());
         if(project.getCategory()!=null&&project.getCategory()==696){
             List<Task> taskList = taskService.list(new LambdaQueryWrapper<Task>().select(Task::getPlanHours,Task::getGroupId).isNotNull(Task::getPlanHours).eq(Task::getGroupId, groupId));
-            int sum = taskList.stream().mapToInt(Task::getPlanHours).sum();
-            if(sum>((nowManDay==null?0:nowManDay)*8)){
+            double sum = taskList.stream().mapToDouble(Task::getPlanHours).sum();
+            if(sum>((nowManDay==null?0:nowManDay)*7.5)){
                 httpRespMsg.setError("任务分组["+taskGroup.getName()+"]的预估工时需大于等于已分配任务的总计划工时["+sum+"]小时");
                 return httpRespMsg;
             }

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

@@ -238,6 +238,7 @@ public class TaskController {
             List<User> allUsers = userMapper.selectList(new QueryWrapper<User>().eq("company_id", user.getCompanyId()));
             List<TaskExecutor> executorList = JSONArray.parseArray(executorListStr, TaskExecutor.class);
             task.setExecutorList(executorList);
+            StringBuilder conflictExecutor = new StringBuilder();
             executorList.stream().forEach(ex->{
                 //执行人必填
                 if (StringUtils.isEmpty(ex.getExecutorId())) {
@@ -264,9 +265,13 @@ public class TaskController {
                 //检查人员在其他任务上是否有时间冲突
                 Integer count = taskMapper.getUserConflitTaskCount(ex.getExecutorId(), task.getId(), task.getStartDate(), task.getEndDate());
                 if (count > 0) {
-                    msg.setError(ex.getExecutorName()+"在其他任务上有时间冲突");
+                    conflictExecutor.append(ex.getExecutorName()).append(",");
                 }
             });
+            if (conflictExecutor.length() > 0) {
+                conflictExecutor.deleteCharAt(conflictExecutor.length() - 1);
+                msg.setError("执行人[" + conflictExecutor.toString() + "]在其他任务上有时间冲突");
+            }
             if (msg.code.equals("error")) {
                 return msg;
             }
@@ -280,7 +285,7 @@ public class TaskController {
             String colors = executorList.stream().filter(f->!StringUtils.isEmpty(f.getExecutorId())).map(TaskExecutor::getExecutorColor).collect(Collectors.joining(","));
             task.setExecutorColor(StringUtils.isEmpty(colors)?null:colors);
             //总时长
-            task.setPlanHours(executorList.stream().filter(f->f.getPlanHours() != null).mapToInt(TaskExecutor::getPlanHours).sum());
+            task.setPlanHours(executorList.stream().filter(f->f.getPlanHours() != null).mapToDouble(TaskExecutor::getPlanHours).sum());
             //校验总计划工时不得超过父任务的计划工时
             if (task.getParentTid() != null) {
                 Task pTask = taskService.getById(task.getParentTid());
@@ -290,7 +295,7 @@ public class TaskController {
                         //过滤掉当前任务
                         subTaskList = subTaskList.stream().filter(sub->!sub.getId().equals(task.getId())).collect(Collectors.toList());
                     }
-                    Integer leftHours = pTask.getPlanHours() - subTaskList.stream().mapToInt(Task::getPlanHours).sum();
+                    double leftHours = pTask.getPlanHours() - subTaskList.stream().mapToDouble(Task::getPlanHours).sum();
                     if (leftHours == 0) {
                         msg.setError("父任务计划工时已分配完，请调整。");
                         return msg;
@@ -305,7 +310,7 @@ public class TaskController {
                 if (task.getPlanHours() != null) {
                     List<Task> allSubTasks = taskMapper.selectList(new QueryWrapper<Task>().select("id, plan_hours").eq("parent_tid", task.getId()));
                     if (allSubTasks.size() > 0) {
-                        int sum = allSubTasks.stream().mapToInt(Task::getPlanHours).sum();
+                        double sum = allSubTasks.stream().mapToDouble(Task::getPlanHours).sum();
                         if (task.getPlanHours() < sum) {
                             msg.setError("计划工时不得少于全部子任务计划工时总和("+sum+"小时)，请调整。");
                             return msg;
@@ -1516,12 +1521,12 @@ public class TaskController {
             switch (dateType){
                 case 0:
                     if(null != startDate && null != endDate){
-                        queryWrapper.ge("start_date",startDate).le("start_date",endDate);
+                        queryWrapper.ge("start_date",startDate + " 00:00:00").le("start_date",endDate + " 23:59:59");
                     }
                     break;
                 case 1:
                     if(null != startDate && null != endDate){
-                        queryWrapper.ge("task.end_date",startDate).le("task.end_date",endDate);
+                        queryWrapper.ge("task.end_date",startDate + " 00:00:00" ).le("task.end_date",endDate + " 23:59:59");
                     }
                     break;
             }
@@ -1850,6 +1855,12 @@ public class TaskController {
         return taskService.cancelByManager(id,request);
     }
 
+    @RequestMapping("/cancelByCreator")
+    public HttpRespMsg cancelByCreator(Integer id){
+        return taskService.cancelByCreator(id,request);
+    }
+
+
     @RequestMapping("/viewUserTaskSchedule")
     public HttpRespMsg viewUserTaskSchedule(Integer taskId, String userId, String startDate, String endDate){
         return taskService.viewUserTaskSchedule(taskId, userId, startDate, endDate, request);

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

@@ -191,7 +191,7 @@ public class TaskGroupController {
             if(taskGroup.getProjectId()!=null){
                 Optional<Project> first = projectList.stream().filter(p -> p.getId().equals(taskGroup.getProjectId())).findFirst();
                 if(first.isPresent()&&first.get().getCategory()==696){
-                    int sum = targetTaskList.stream().mapToInt(Task::getPlanHours).sum();
+                    double sum = targetTaskList.stream().mapToDouble(Task::getPlanHours).sum();
                     if(sum>((taskGroup.getManDay()==null?0:taskGroup.getManDay())*8)){
                         msg.setError("任务分组["+taskGroup.getName()+"]的预估工时需大于等于已分配任务的总计划工时["+sum+"]小时");
                         return msg;

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

@@ -1699,7 +1699,7 @@ public class WeiXinCorpController {
                         stagesMapper.insert(stage);
                         Task task=new Task();
                         TimeType timeType = timeTypeMapper.selectById(company.getId());
-                        Integer oneDayHours = 8;
+                        double oneDayHours = 7.5;
                         task.setCreateDate(LocalDate.now());
                         task.setProjectId(project.getId());
                         task.setCompanyId(company.getId());

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

@@ -155,7 +155,7 @@ public class Task extends Model<Task> {
      * 计划工时
      */
     @TableField("plan_hours")
-    private Integer planHours;
+    private Double planHours;
 
     /**
      * 0-任务，1-里程碑，2-风险

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

@@ -55,7 +55,7 @@ public class TaskExecutor extends Model<TaskExecutor> {
      * 计划工时
      */
     @TableField("plan_hours")
-    private Integer planHours;
+    private Double planHours;
 
     @TableField("project_id")
     private Integer projectId;

fhKeeper/formulahousekeeper/management-platform-mld/src/main/java/com/management/platform/entity/vo/GanttDataItem.java

@@ -11,7 +11,7 @@ public class GanttDataItem {
     public String id;
     public String userId;
     public String text;
-    public Integer time;
+    public Double time;
 //    @JsonFormat(pattern = "yyyy-MM-dd")
     public String start_date;
 //    @JsonFormat(pattern = "yyyy-MM-dd")

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

@@ -70,4 +70,6 @@ public interface TaskService extends IService<Task> {
     HttpRespMsg cancelByManager(Integer id, HttpServletRequest request);
 
     HttpRespMsg viewUserTaskSchedule(Integer taskId, String userId, String startDate, String endDate, HttpServletRequest request);
+
+    HttpRespMsg cancelByCreator(Integer id, HttpServletRequest request);
 }

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

@@ -337,7 +337,7 @@ public class DingDingServiceImpl implements DingDingService {
                 stage.setStagesName("工作开展");
                 stagesMapper.insert(stage);
                 Task task=new Task();
-                Integer oneDayHours = 8;
+                double oneDayHours = 7.5;
                 task.setCreateDate(LocalDate.now());
                 task.setProjectId(project.getId());
                 task.setCompanyId(company.getId());
@@ -578,7 +578,7 @@ public class DingDingServiceImpl implements DingDingService {
                 stage.setStagesName("工作开展");
                 stagesMapper.insert(stage);
                 Task task=new Task();
-                Integer oneDayHours = 8;
+                double oneDayHours = 7.5;
                 task.setCreateDate(LocalDate.now());
                 task.setProjectId(project.getId());
                 task.setCompanyId(company.getId());

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

@@ -4871,7 +4871,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 for(Department department:departmentList){
                     GanttDataItem parent = new GanttDataItem();
                     parent.id=department.getDepartmentId().toString();
-                    parent.time = 0;
+                    parent.time = 0.0;
                     parent.text=department.getDepartmentName();
                     parent.type="";
                     if(department.getSuperiorId()!=null){
@@ -4910,7 +4910,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         userGantt.render = "split";
                         userGantt.start_date = null;
                         userGantt.end_date = null;
-                        userGantt.time = 0;
+                        userGantt.time = 0.0;
                         userGantt.parent=String.valueOf(u.getDepartmentId());
                         userGantt.setObjType(0);
                         itemList.add(userGantt);
@@ -4934,7 +4934,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         parent.render = "split";
                         parent.start_date = businessTripList.get(i).getStartDate().toString();
                         parent.end_date = businessTripList.get(i).getEndDate().toString();
-                        parent.time = 0;
+                        parent.time = 0.0;
                         parent.parent=String.valueOf(departmentId);
                         parent.setObjType(0);
                         itemList.add(parent);
@@ -4983,7 +4983,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         }
                     }
                 }
-                System.out.println("按项目查看，项目size="+projectIds.size());
                 ganttData = projectMapper.getTaskPlanByProject(projectIds, startDate + " 00:00:00" ,endDate + " 23:59:59", user.getCompanyId(),groupName,taskType,userIds);
                 QueryWrapper<BusinessTrip> btQueryWrapper =new QueryWrapper<>();
                 QueryWrapper<BustripProject> bpQueryWrapper =new QueryWrapper<>();
@@ -5018,7 +5017,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                                 parent.render = "split";
                                 parent.start_date = bustripProject.getStartDate().toString();
                                 parent.end_date = bustripProject.getEndDate().toString();
-                                parent.time = 0;
+                                parent.time = 0.0;
                                 parent.setObjType(0);
                                 itemList.add(parent);
                                 btLastItemId = String.valueOf(bustripProject.getProjectId());
@@ -5041,7 +5040,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
             String lastItemId = null;
             GanttDataItem lastParentItem = null;
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             for (int i=0;i<ganttData.size(); i++) {
                 Map map = ganttData.get(i);
                 String userId = (String) map.get("user_id");
@@ -5070,7 +5069,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         parent.render = "split";
                         parent.start_date = start_date;
                         parent.end_date = end_date;
-                        parent.time = 0;
+                        parent.time = 0.0;
                         parent.parent=String.valueOf(departmentId);
                         parent.setObjType(0);
                         itemList.add(parent);
@@ -5096,7 +5095,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     curItem.setLeaderOrManager(map.get("leaderOrManager")==null?null:(Integer)map.get("leaderOrManager"));
                     curItem.setTaskPlan(map.get("taskPlan")==null?null:(Integer)map.get("taskPlan"));
                     curItem.end_date = end_date;
-                    curItem.time = (Integer)map.get("duration");
+                    curItem.time = (Double)map.get("duration");
                     curItem.parent = lastItemId;
                     curItem.setObjType(2);
                     itemList.add(curItem);
@@ -5112,7 +5111,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         parent.render = "split";
                         parent.start_date = start_date;
                         parent.end_date = end_date;
-                        parent.time = 0;
+                        parent.time = 0.0;
                         parent.setObjType(2);
                         itemList.add(parent);
                         lastItemId = projectId;
@@ -5136,7 +5135,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     curItem.setTaskPlan(map.get("taskPlan")==null?null:(Integer)map.get("taskPlan"));
                     curItem.start_date = start_date;
                     curItem.end_date = end_date;
-                    curItem.time = (Integer)map.get("duration");
+                    curItem.time = (Double)map.get("duration");
                     curItem.parent = lastItemId;
                     curItem.setObjType(2);
                     itemList.add(curItem);
@@ -12649,7 +12648,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 for(Department department:departmentList){
                     GanttDataItem parent = new GanttDataItem();
                     parent.id=department.getDepartmentId().toString();
-                    parent.time = 0;
+                    parent.time = 0.0;
                     parent.text=department.getDepartmentName();
                     parent.translationType="department";
                     if(department.getSuperiorId()!=null){
@@ -12687,7 +12686,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         userGantt.render = "split";
                         userGantt.start_date = null;
                         userGantt.end_date = null;
-                        userGantt.time = 0;
+                        userGantt.time = 0.0;
                         userGantt.color=u.getColor();
                         userGantt.parent=String.valueOf(u.getDepartmentId());
                         userGantt.children=new ArrayList<>();
@@ -12715,7 +12714,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         parent.render = "split";
                         parent.start_date = leaveSheetList.get(i).getStartDate().toString();
                         parent.end_date = leaveSheetList.get(i).getEndDate().toString();
-                        parent.time = 0;
+                        parent.time = 0.0;
                         parent.parent=String.valueOf(departmentId);
                         lsLastItemId =leaveSheetList.get(i).getOwnerId();
                     }
@@ -12774,7 +12773,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         parent.render = "split";
                         parent.start_date = businessTripList.get(i).getStartDate().toString();
                         parent.end_date = businessTripList.get(i).getEndDate().toString();
-                        parent.time = 0;
+                        parent.time = 0.0;
                         parent.parent=String.valueOf(departmentId);
                         btLastItemId =businessTripList.get(i).getOwnerId();
                     }
@@ -12854,7 +12853,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                                 parent.render = "split";
                                 parent.start_date = bustripProject.getStartDate().toString();
                                 parent.end_date = bustripProject.getEndDate().toString();
-                                parent.time = 0;
+                                parent.time = 0.0;
                                 parent.children=new ArrayList<>();
                                 itemList.add(parent);
                                 btLastItemId = String.valueOf(bustripProject.getProjectId());
@@ -12909,7 +12908,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         parent.render = "split";
                         parent.start_date = start_date;
                         parent.end_date = end_date;
-                        parent.time = 0;
+                        parent.time = 0.0;
                         parent.translationType="user";
                         parent.parent=String.valueOf(departmentId);
                         parent.children=new ArrayList<>();
@@ -12928,7 +12927,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     curItem.start_date = start_date;
 
                     curItem.end_date = end_date;
-                    curItem.time = (Integer)map.get("duration");
+                    curItem.time = (Double)map.get("duration");
                     curItem.parent = lastItemId;
                     curItem.level = level;
                     curItem.children=new ArrayList<>();
@@ -12944,7 +12943,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         parent.render = "split";
                         parent.start_date = start_date;
                         parent.end_date = end_date;
-                        parent.time = 0;
+                        parent.time = 0.0;
                         parent.children=new ArrayList<>();
                         lastItemId = projectId;
                         itemList.add(parent);
@@ -12955,7 +12954,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     curItem.text = (String) map.get("name")+"/"+(String)map.get("task_name");
                     curItem.start_date = start_date;
                     curItem.end_date = end_date;
-                    curItem.time = (Integer)map.get("duration");
+                    curItem.time = (Double)map.get("duration");
                     curItem.translationType="user";
                     curItem.parent = lastItemId;
                     curItem.level = level;
@@ -13393,7 +13392,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         for (Department dept : collect) {
             GanttDataItem subParent = new GanttDataItem();
             subParent.id=dept.getDepartmentId().toString();
-            subParent.time = 0;
+            subParent.time = 0.0;
             subParent.text=dept.getDepartmentName();
             subParent.translationType="department";
             if(dept.getSuperiorId()!=null){

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

@@ -535,7 +535,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                     task.setEndDate(endDate);
                 }
                 if(planHoursCell!=null){
-                    task.setPlanHours(Integer.parseInt(planHoursCell.getStringCellValue()));
+                    task.setPlanHours(Double.parseDouble(planHoursCell.getStringCellValue()));
                 }
                 if(descCell!=null){
                     task.setTaskDesc(descCell.getStringCellValue());
@@ -1234,6 +1234,22 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         return msg;
     }
 
+    @Override
+    public HttpRespMsg cancelByCreator(Integer id, HttpServletRequest request) {
+        HttpRespMsg msg = new HttpRespMsg();
+        String token = request.getHeader("TOKEN");
+        Task task = taskMapper.selectById(id);
+        if (!token.equals(task.getCreaterId())) {
+            msg.setError("您没有权限");
+        } else if (task.getTaskStatus() != TaskController.STATUS_FIRST_CHECK) {
+            msg.setError("当前计划状态无法撤回");
+        } else {
+            task.setTaskStatus(TaskController.STATUS_CANCEL);
+            taskMapper.updateById(task);
+        }
+        return msg;
+    }
+
     private List<Integer> getBranchDepartment(Integer departmentId, List<Department> departmentList) {
         List<Integer> list = new ArrayList<>();
         list.add(departmentId);

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

@@ -3405,7 +3405,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         stage.setStagesName("工作开展");
         stagesMapper.insert(stage);
         Task task=new Task();
-        Integer oneDayHours = 8;
+        double oneDayHours = 7.5;
         task.setCreateDate(LocalDate.now());
         task.setProjectId(project.getId());
         task.setCompanyId(company.getId());

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

@@ -327,9 +327,9 @@
         task_executor.`first_auditor_id`, group_concat(task_executor.`second_auditor_id`) as second_auditor_id, u1.name AS first_auditor_name, group_concat(u2.`name`) AS second_auditor_name
         FROM task LEFT JOIN project ON project.id = task.`project_id`
         left join task_executor on task_executor.task_id=task.id
-        LEFT JOIN USER u1 ON u1.id = task_executor.`first_auditor_id`
-        LEFT JOIN USER u2 ON u2.id = task_executor.`second_auditor_id`
-        left join user on user.id = task.`reject_user_id`
+        LEFT JOIN `user` u1 ON u1.id = task_executor.`first_auditor_id`
+        LEFT JOIN `user` u2 ON u2.id = task_executor.`second_auditor_id`
+        left join  `user` on user.id = task.`reject_user_id`
         left join stages on stages.id = task.stages_id
         left join department on department.department_id=project.dept_id
         ${ew.customSqlSegment}
@@ -850,7 +850,7 @@
         SELECT task.*, task_executor.`first_auditor_id`, group_concat(task_executor.`second_auditor_id`) as second_auditor_id, u1.name AS first_auditor_name, group_concat(u2.`name`) AS second_auditor_name, project.`project_name`, stages.stages_name
         FROM task LEFT JOIN task_executor ON task.id = task_executor.`task_id`
         left join project on project.id = task.`project_id`
-        LEFT JOIN USER u1 ON u1.id = task_executor.`first_auditor_id` LEFT JOIN USER u2 ON u2.id = task_executor.`second_auditor_id`
+        LEFT JOIN `user` u1 ON u1.id = task_executor.`first_auditor_id` LEFT JOIN `user` u2 ON u2.id = task_executor.`second_auditor_id`
         left join stages on stages.id = task.stages_id
         ${ew.customSqlSegment}
         and (task_executor.`audit_status` = 3 AND task_executor.`first_auditor_id` = #{userId} ) or (task.task_status = 4 and task_executor.`audit_status` = 4 AND task_executor.`second_auditor_id` = #{userId} )
@@ -863,7 +863,7 @@
     <select id="getMyAuditTaskCount"
             resultType="java.lang.Integer">
         SELECT count(DISTINCT task.id) FROM task LEFT JOIN task_executor ON task.id = task_executor.`task_id`
-                                                 LEFT JOIN USER u1 ON u1.id = task_executor.`first_auditor_id` LEFT JOIN USER u2 ON u2.id = task_executor.`second_auditor_id`
+                                                 LEFT JOIN `user` u1 ON u1.id = task_executor.`first_auditor_id` LEFT JOIN `user` u2 ON u2.id = task_executor.`second_auditor_id`
             ${ew.customSqlSegment}
         and (task_executor.`audit_status` = 3 AND task_executor.`first_auditor_id` = #{userId} ) or (task.task_status = 4 and task_executor.`audit_status` = 4 AND task_executor.`second_auditor_id` = #{userId} )
     </select>