1

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

@@ -55,11 +55,13 @@ public class GroupBudgetReviewController {
         GroupBudgetReview groupBudgetReview=new GroupBudgetReview();
         TaskGroup taskGroup = taskGroupMapper.selectById(groupId);
         Project project = projectMapper.selectById(taskGroup.getProjectId());
-        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)){
-            httpRespMsg.setError("任务分组["+taskGroup.getName()+"]的预估工时需大于等于已分配任务的总计划工时["+sum+"]小时");
-            return httpRespMsg;
+        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)){
+                httpRespMsg.setError("任务分组["+taskGroup.getName()+"]的预估工时需大于等于已分配任务的总计划工时["+sum+"]小时");
+                return httpRespMsg;
+            }
         }
         groupBudgetReview.setGroupId(groupId).setGroupName(taskGroup.getName())
                 .setOldManDay(oldManDay)

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

@@ -171,7 +171,8 @@ public class TaskController {
             }
             //针对依斯呗的校验
             if(user.getCompanyId()==3092){
-                if(task.getGroupId()!=null){
+                Project project = projectService.getById(task.getProjectId());
+                if(task.getGroupId()!=null&&(project.getCategory()!=null&&project.getCategory()==696)){
                     TaskGroup taskGroup = taskGroupService.getById(task.getGroupId());
                     if(taskGroup.getManDay()==null){
                         msg.setError("创建失败,请先分配任务分组的预估工时");

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

@@ -176,14 +176,21 @@ public class TaskGroupController {
         List<TaskGroup> addList = new ArrayList<>();
         int totalManDay = 0;
         List<Integer> groupIds = groupList.stream().map(TaskGroup::getId).collect(Collectors.toList());
+        List<Integer> projectIds = groupList.stream().map(TaskGroup::getProjectId).collect(Collectors.toList());
+        List<Project> projectList = projectMapper.selectList(new LambdaQueryWrapper<Project>().select(Project::getCategory).isNotNull(Project::getCategory));
         List<Task> taskList = taskService.list(new LambdaQueryWrapper<Task>().select(Task::getPlanHours,Task::getGroupId).isNotNull(Task::getPlanHours).in(Task::getGroupId, groupIds));
         for (TaskGroup taskGroup : groupList) {
             TaskGroup item = new TaskGroup();
             List<Task> targetTaskList = taskList.stream().filter(t -> t.getGroupId() != null && t.getGroupId().equals(taskGroup.getId())).collect(Collectors.toList());
-            int sum = targetTaskList.stream().mapToInt(Task::getPlanHours).sum();
-            if(sum>((taskGroup.getManDay()==null?0:taskGroup.getManDay())*8)){
-                msg.setError("任务分组["+taskGroup.getName()+"]的预估工时需大于等于已分配任务的总计划工时["+sum+"]小时");
-                return msg;
+            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();
+                    if(sum>((taskGroup.getManDay()==null?0:taskGroup.getManDay())*8)){
+                        msg.setError("任务分组["+taskGroup.getName()+"]的预估工时需大于等于已分配任务的总计划工时["+sum+"]小时");
+                        return msg;
+                    }
+                }
             }
             item.setId(taskGroup.getId());
             if (taskGroup.getManDay() == null) {