Merge branch 'master' of http://test16.zhongdianyun.com/renjiancai/tasktime.git

olive-console/src/main/java/com/zrqx/olive/ttask/controller/TaskController.java

@@ -134,6 +134,43 @@ public class TaskController {
 		task.setUpdateTime(new Date());
 		task.setCreateTime(new Date());
 		task.setTaskStatus(1);
+		try {
+			// 处理项目工时
+			QueryWrapper<Team> qw = new QueryWrapper<>();
+			// 售前项目
+//			if (taskRequest.getStatus() == 2) {
+//				qw.eq("sales_project_id", taskRequest.getProjectId());
+//			}
+            // 正常项目
+//			if (taskRequest.getStatus() == 1) {
+				qw.eq("project_id", taskRequest.getProjectId());
+//			}
+			qw.eq("department_id", taskRequest.getDepartmentId());
+			List<Team> teamlist = teamService.list(qw);
+
+			if (teamlist.size() > 0) {
+				BigDecimal allocateSurplus = teamlist.get(0).getAllocateSurplus();
+				if (taskRequest.getWorkingHours() != null) {
+					BigDecimal result = allocateSurplus.subtract(taskRequest.getWorkingHours());
+					if (result.floatValue() < 0) {
+						return CommonResult.failed("当前项目工时不足");
+					}
+					Team team = teamlist.get(0);
+					team.setAllocateSurplus(result);
+					teamService.updateById(team);
+				}
+			}
+		
+		// 保存历史记录
+		TaskRecordRequest taskRecord = new TaskRecordRequest();
+		taskRecord.setTaskId(task.getId());
+		taskRecord.setType(5);
+		record(taskRecord, request);
+
+	} catch (Exception e) {
+		// TODO Auto-generated catch block
+		e.printStackTrace();
+	}
 		if (taskService.save(task)) {
 			if (taskRequest.getFile() != null) {
 				for (ProjectFile projectFile : taskRequest.getFile()) {
@@ -142,43 +179,7 @@ public class TaskController {
 					projectFileMapper.insert(projectFile);
 				}
 			}
-			try {
-					// 处理项目工时
-					QueryWrapper<Team> qw = new QueryWrapper<>();
-					// 售前项目
-//					if (taskRequest.getStatus() == 2) {
-//						qw.eq("sales_project_id", taskRequest.getProjectId());
-//					}
-                    // 正常项目
-//					if (taskRequest.getStatus() == 1) {
-						qw.eq("project_id", taskRequest.getProjectId());
-//					}
-					qw.eq("department_id", taskRequest.getDepartmentId());
-					List<Team> teamlist = teamService.list(qw);
-
-					if (teamlist.size() > 0) {
-						BigDecimal allocateSurplus = teamlist.get(0).getAllocateSurplus();
-						if (taskRequest.getWorkingHours() != null) {
-							BigDecimal result = allocateSurplus.subtract(taskRequest.getWorkingHours());
-							if (result.floatValue() < 0) {
-								return CommonResult.failed("当前项目工时不足");
-							}
-							Team team = teamlist.get(0);
-							team.setAllocateSurplus(result);
-							teamService.updateById(team);
-						}
-					}
-				
-				// 保存历史记录
-				TaskRecordRequest taskRecord = new TaskRecordRequest();
-				taskRecord.setTaskId(task.getId());
-				taskRecord.setType(5);
-				record(taskRecord, request);
-
-			} catch (Exception e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
+			
 			return CommonResult.success();
 		} else {
 			return CommonResult.failed();