|
@@ -2409,6 +2409,7 @@ public class ProjectDeclarationService extends BaseService<ProjectDeclaration> {
|
|
|
|
|
|
|
|
List<ProjectApplicationImportDto> projectApplicationList = projectApplicationService.importList();
|
|
List<ProjectApplicationImportDto> projectApplicationList = projectApplicationService.importList();
|
|
|
List<ProjectApplicationImportDto> errorList = new ArrayList<>();
|
|
List<ProjectApplicationImportDto> errorList = new ArrayList<>();
|
|
|
|
|
+ List<String> ids = new ArrayList<>();
|
|
|
for (ProjectApplicationImportDto projectApplicationImportDto : projectApplicationImportDtoList) {
|
|
for (ProjectApplicationImportDto projectApplicationImportDto : projectApplicationImportDtoList) {
|
|
|
boolean flag = true;
|
|
boolean flag = true;
|
|
|
for (ProjectApplicationImportDto projectApplication : projectApplicationList) {
|
|
for (ProjectApplicationImportDto projectApplication : projectApplicationList) {
|
|
@@ -2435,10 +2436,22 @@ public class ProjectDeclarationService extends BaseService<ProjectDeclaration> {
|
|
|
)
|
|
)
|
|
|
|
|
|
|
|
) {
|
|
) {
|
|
|
|
|
+ //判断是否已经更新过此id 因为会存在相同 名称 项目大小类的数据
|
|
|
|
|
+ boolean duplicateId = false;
|
|
|
|
|
+ for (String id : ids) {
|
|
|
|
|
+ if(Objects.equals(projectApplication.getId(),id)){
|
|
|
|
|
+ duplicateId=true;
|
|
|
|
|
+ continue;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ if(duplicateId){
|
|
|
|
|
+ continue;
|
|
|
|
|
+ }
|
|
|
ProjectApplication projectApp = new ProjectApplication();
|
|
ProjectApplication projectApp = new ProjectApplication();
|
|
|
projectApp.setId(Integer.valueOf(projectApplication.getId()));
|
|
projectApp.setId(Integer.valueOf(projectApplication.getId()));
|
|
|
projectApp.setPass("通过");
|
|
projectApp.setPass("通过");
|
|
|
projectApplicationService.updateSelective(projectApp);
|
|
projectApplicationService.updateSelective(projectApp);
|
|
|
|
|
+ ids.add(projectApplication.getId());
|
|
|
flag = false;
|
|
flag = false;
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|