需求基本信息调整

src/main/java/com/jeeplus/modules/sg/managementcenter/project/service/ProjectService.java

@@ -95,6 +95,9 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
 					acquisitionStatus = project2.getAcquisitionStatus();
 					constructionStatus = project2.getConstructionStatus();
 					whetherCloseStatus = project2.getWhetherCloseStatus();
+					project.setId(project2.getId());//项目id
+					project.setCreateBy(project2.getCreateBy());
+					project.setCreateDate(project2.getCreateDate());
 					project.setProjectManageRole(project2.getProjectManageRole());//项目经理角色
 					project.setDistributionEngineering(project2.getDistributionEngineering());//配网工程专职角色
 					project.setDistributionMaterials(project2.getDistributionMaterials());//配网物资专职角色
@@ -112,7 +115,12 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
 					break;
 				}
 			}
-			project.preInsert();
+			if (null!=project.getId()){
+				project.preUpdate();
+			}else {
+				project.preInsert();
+			}
+
 			project.setStatus(status);
 			project.setAcquisitionStatus(acquisitionStatus);
 			project.setConstructionStatus(constructionStatus);

src/main/java/com/jeeplus/modules/sg/managementcenter/project/web/ProjectController.java

@@ -271,7 +271,7 @@ public class ProjectController extends BaseController {
 			Boolean judgeValue = ProExcelInfo.getJudgeValue(projects);
 			if (judgeValue){
 				j.setSuccess(false);
-				j.setMsg("导入失败：数据不符合规范");
+				j.setMsg("导入失败：数据不符合规范,请调整后重新导入");
 				return j;
 			}
 			projectService.saveList(projects);