diff --git a/.gitignore b/.gitignore index e479a49..d88f4f0 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,9 @@ # Editor-based HTTP Client requests /httpRequests/ + +/.settings/ +/.vscode/ ### Example user template template ### Example user template @@ -38,7 +41,10 @@ gen *.zip *.tar.gz *.rar - +.factorypath +.project +/target/** +.classpath # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* diff --git a/pom.xml b/pom.xml index 1c911f9..3ed6bfa 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ Demo project for Spring Boot - 1.8 + 11 true diff --git a/src/main/java/com/example/survey/service/impl/ProjectServiceImpl.java b/src/main/java/com/example/survey/service/impl/ProjectServiceImpl.java index 2d66da1..9d22b77 100644 --- a/src/main/java/com/example/survey/service/impl/ProjectServiceImpl.java +++ b/src/main/java/com/example/survey/service/impl/ProjectServiceImpl.java @@ -53,7 +53,7 @@ public class ProjectServiceImpl implements ProjectService { MetaData metaData = metaDataDao.selectMetaData(createProjectDTO.getMetaDataName()); Project project = new Project(); project.setName(createProjectDTO.getName()); - project.setMetaData(metaData); + // project.setMetaData(metaData); project.setStartTime(createProjectDTO.getStartTime()); project.setEndTime(createProjectDTO.getEndTime()); project.setDetail(createProjectDTO.getDetail()); @@ -72,9 +72,9 @@ public class ProjectServiceImpl implements ProjectService { projectVO.setStartTime(project.getStartTime()); projectVO.setEndTime(project.getEndTime()); projectVO.setUsername(project.getUser().getUsername()); - if (project.getMetaData() != null) { - projectVO.setMetaDataName(project.getMetaData().getName()); - } + // if (project.getMetaData() != null) { + // projectVO.setMetaDataName(project.getMetaData().getName()); + // } projectVO.setState(project.getState()); return projectVO; }).collect(Collectors.toList());