|
|
@@ -2399,6 +2399,7 @@ public class ProjectDeclarationService extends BaseService<ProjectDeclaration> {
|
|
|
//throw new Exception("第"+(index+1)+"行"+thead+"不能为空");
|
|
|
}
|
|
|
|
|
|
+ //导入通过功能
|
|
|
private List<ProjectApplicationImportDto> updateApplication(List<ProjectApplicationImportDto> projectApplicationImportDtoList) {
|
|
|
|
|
|
// Example example = new Example(ProjectApplication.class);
|
|
|
@@ -2414,8 +2415,7 @@ public class ProjectDeclarationService extends BaseService<ProjectDeclaration> {
|
|
|
boolean flag = true;
|
|
|
for (ProjectApplicationImportDto projectApplication : projectApplicationList) {
|
|
|
if (
|
|
|
- projectApplication.getPass() == null
|
|
|
- && projectApplication.getProjectYear() != null
|
|
|
+ projectApplication.getProjectYear() != null
|
|
|
&& projectApplication.getCompanyName() != null
|
|
|
&& projectApplication.getSuperTypeName() != null
|
|
|
&& projectApplication.getTypeName() != null
|
|
|
@@ -2448,6 +2448,11 @@ public class ProjectDeclarationService extends BaseService<ProjectDeclaration> {
|
|
|
if (duplicateId) {
|
|
|
continue;
|
|
|
}
|
|
|
+ //是否曾经更新过
|
|
|
+ if (projectApplication.getPass() != null) {
|
|
|
+ flag = false;
|
|
|
+ continue;
|
|
|
+ }
|
|
|
ProjectApplication projectApp = new ProjectApplication();
|
|
|
projectApp.setId(Integer.valueOf(projectApplication.getId()));
|
|
|
projectApp.setPass("通过");
|
huZhiHao