tijiao1

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

@@ -368,8 +368,7 @@ public class TaskController {
 	@PostMapping(value = "/impor/excel", produces = "application/json;charset=UTF-8")
 	public CommonResult<Object> imporTask(@RequestParam("file") MultipartFile file,
 			TaskForm taskRequest) throws BaseException, IOException {
-		taskService.imporTask(file, taskRequest);
-		return null;
+		return taskService.imporTask(file, taskRequest);
 	}
 
 }

olive-console/src/main/java/com/zrqx/olive/ttask/service/imp/TaskServiceImpl.java

@@ -141,16 +141,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskDao, Task> implements TaskS
 			task.setTaskStatus(1);
 			task.setUpdateTime(new Date());
 			task.setCreateTime(new Date());
-			// 可选值：1:项目任务 2:BUG任务 3:部门任务"
-			if (excelTaskVo.getTaskTypeName().equals("项目任务")) {
-				task.setTaskType(1);
-			}
-			if (excelTaskVo.getTaskTypeName().equals("BUG任务")) {
-				task.setTaskType(2);
-			}
-			if (excelTaskVo.getTaskTypeName().equals("部门任务")) {
-				task.setTaskType(3);
-			}
+		
 			task.setProjectId(taskRequest.getProjectId());
 			// 所属模块
 			DiyType type = new DiyType();
@@ -252,7 +243,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskDao, Task> implements TaskS
 			this.save(task);
 
 		}
-		return null;
+		return CommonResult.success();
 	}
 
 }