提交

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

@@ -220,7 +220,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskDao, Task> implements TaskS
 					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
-				type.setProjectId(taskRequest.getProjectId());
+				
+				
 				type.setShowName(excelTaskVo.getModuleName());
 				type.setTypeName(excelTaskVo.getModuleName());
 				type.setCreateTime(new Date());
@@ -240,7 +241,11 @@ public class TaskServiceImpl extends ServiceImpl<TaskDao, Task> implements TaskS
 					task.setCode(type.getCode());
 				}
 			}
-			
+			// 售前项目
+			if (taskRequest.getStatus() == 2) {
+				task.setProjectId(null);
+				task.setSalesProjectId(taskRequest.getProjectId());
+			}
 			//增加工时
 			task.setTaskName(excelTaskVo.getTaskName());
 			task.setWorkingHours(new BigDecimal(excelTaskVo.getHours()));