Merge remote-tracking branch 'origin/master'

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ReviewByProvincialDeptManage.java

@@ -97,7 +97,7 @@ public class ReviewByProvincialDeptManage {
         // 对接省级联审的接口
         List<ProjectApplication> applications = applicationService.list(Wrappers.lambdaQuery(ProjectApplication.class)
                 .eq(ProjectApplication::getProjectId, projectInfo.getId()));
-        if(joinReviewProvincialBureauService.pushImportProject(
+        if(!joinReviewProvincialBureauService.pushImportProject(
                 ApplicationConverter.convertProject(projectInfo,applications))){
             throw new BusinessException("提交省级部门联审失败");
         }

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/utils/GenerateProjectCodeUtil.java

@@ -52,7 +52,7 @@ public class GenerateProjectCodeUtil {
         // 获取项目库当前最大项目序号
         List<Project> projectList = projectService.list(Wrappers.lambdaQuery(Project.class).orderByDesc(Project::getId));
         Project project = CollUtil.isEmpty(projectList) ? null : projectList.get(0);
-        Long projectId = Objects.isNull(project) ? DeclaredProjectContant.Project.MIN_PROJECT_ID : project.getId();
+        Long projectId = Objects.isNull(project) ? DeclaredProjectContant.Project.MIN_PROJECT_ID : project.getId() + 1;
         if (projectId > DeclaredProjectContant.Project.MAX_PROJECT_ID){
             // 超过999的项目号从1开始 1
             Long newProjectId = projectId % DeclaredProjectContant.Project.MAX_PROJECT_ID;