|
@@ -70,6 +70,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
projectDto.setProjectOverview(projectInfo.getProjectBasicInfo().getProjectOverview());
|
|
projectDto.setProjectOverview(projectInfo.getProjectBasicInfo().getProjectOverview());
|
|
projectDto.setResourcesOverview(projectInfo.getProjectBasicInfo().getResourcesOverview());
|
|
projectDto.setResourcesOverview(projectInfo.getProjectBasicInfo().getResourcesOverview());
|
|
projectDto.setProjectNameEasy(projectInfo.getProjectBasicInfo().getProjectNameEasy());
|
|
projectDto.setProjectNameEasy(projectInfo.getProjectBasicInfo().getProjectNameEasy());
|
|
|
|
+ projectDto.setWd(projectInfo.getProjectBasicInfo().getWd());
|
|
|
|
+ projectDto.setTAvailableHours(projectInfo.getProjectBasicInfo().getTAvailableHours());
|
|
|
|
+ projectDto.setTPowerGeneration(projectInfo.getProjectBasicInfo().getTPowerGeneration());
|
|
if (projectInfo.getProjectBasicInfo().getPosition() != null && !projectInfo.getProjectBasicInfo().getPosition().equals("")) {
|
|
if (projectInfo.getProjectBasicInfo().getPosition() != null && !projectInfo.getProjectBasicInfo().getPosition().equals("")) {
|
|
String[] split = projectInfo.getProjectBasicInfo().getPosition().split(",");
|
|
String[] split = projectInfo.getProjectBasicInfo().getPosition().split(",");
|
|
projectDto.setLongitude(split[0]);
|
|
projectDto.setLongitude(split[0]);
|
|
@@ -216,6 +219,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
projectBasicInfo.setProjectState(projectDto.getProjectState());
|
|
projectBasicInfo.setProjectState(projectDto.getProjectState());
|
|
projectBasicInfo.setProjectType(projectDto.getProjectType());
|
|
projectBasicInfo.setProjectType(projectDto.getProjectType());
|
|
projectBasicInfo.setProjectNameEasy(projectDto.getProjectNameEasy());
|
|
projectBasicInfo.setProjectNameEasy(projectDto.getProjectNameEasy());
|
|
|
|
+ projectBasicInfo.setWd(projectDto.getWd());
|
|
|
|
+ projectBasicInfo.setTAvailableHours(projectDto.getTAvailableHours());
|
|
|
|
+ projectBasicInfo.setTPowerGeneration(projectDto.getTPowerGeneration());
|
|
if (projectDto.getLongitude() != null && projectDto.getLatitude() != null) {
|
|
if (projectDto.getLongitude() != null && projectDto.getLatitude() != null) {
|
|
if (projectDto.getLongitude().equals("") && projectDto.getLatitude().equals("")) {
|
|
if (projectDto.getLongitude().equals("") && projectDto.getLatitude().equals("")) {
|
|
projectBasicInfo.setPosition("");
|
|
projectBasicInfo.setPosition("");
|