77

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectController.java

@@ -145,11 +145,11 @@ public class ComProjectController extends BaseController<ComProjectService, ComP
 
     @ApiOperation(value = "分步保存项目信息", httpMethod = "POST", notes = "分步保存项目信息")
     @PostMapping
-    @RequestMapping("/SaveByStep")
+    @RequestMapping("/saveByStep")
     @PreAuthorize("hasAnyRole('REPORT','GOV','ADMIN')")
     @Logs(value = CommonEnum.logType.projectSave)
-    public ResponseDataModel<String> SaveByStep(@RequestBody ComProjectDTO comProjectDTO, BindingResult bindingResult) {
-        return ResponseDataModel.ok(comProjectService.SaveByStep(comProjectDTO));
+    public ResponseDataModel<String> saveByStep(@RequestBody ComProjectDTO comProjectDTO, BindingResult bindingResult) {
+        return ResponseDataModel.ok(comProjectService.saveByStep(comProjectDTO));
     }
 
     /**

science-admin/src/main/java/com/yiboshi/science/service/ComProjectService.java

@@ -51,7 +51,7 @@ public interface ComProjectService extends BaseService<ComProjectQueryVO, ComPro
      * @param dto
      * @return
      */
-    String SaveByStep(ComProjectDTO dto);
+    String saveByStep(ComProjectDTO dto);
 
     /**
      * 修改申报单位

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java

@@ -692,13 +692,13 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
             ComProject project = this.entityById(dto.getId());
             if (null == project) {
                 dto.setId(projectInsert(dto));
-            }
-            projectUpdate(dto);
+            } else
+                projectUpdate(dto);
         }
         return dto.getId();
     }
 
-    public String SaveByStep(ComProjectDTO dto) {
+    public String saveByStep(ComProjectDTO dto) {
         String ProjectID = "";
         switch (dto.getStep()) {
             case 0://项目基本信息
@@ -740,8 +740,8 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
             ComProject project = this.entityById(dto.getId());
             if (null == project) {
                 ProjectID = InsertProjectBaseInfo(dto);
-            }
-            ProjectID = UpdateProjectBaseInfo(dto);
+            } else
+                ProjectID = UpdateProjectBaseInfo(dto);
         }
 
         return ProjectID;