Skip to content

T
traffic-front
Commit 7fa60cff authored by gary's avatar gary
Browse files
Options

1、fix

parent 40eb5a1a
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 0 deletions
atms-api/src/main/java/pwc/taxtech/atms/service/impl/DataImportService.java
View file @ 7fa60cff
...@@ -382,6 +382,9 @@ public class DataImportService extends BaseService { ...@@ -382,6 +382,9 @@ public class DataImportService extends BaseService {
if (addDataImportLog(dataImportLogs) < 1) { if (addDataImportLog(dataImportLogs) < 1) {
return OperationResultDto.error(ErrorMessage.ImportFailed); return OperationResultDto.error(ErrorMessage.ImportFailed);
} }
if(!dataImportLogs.stream().filter(dil -> !dil.getImportResult()).collect(Collectors.toList()).isEmpty()){
return OperationResultDto.error();
}
return OperationResultDto.success(); return OperationResultDto.success();
} catch (ServiceException e) { } catch (ServiceException e) {
throw e; throw e;
...@@ -553,6 +556,9 @@ public class DataImportService extends BaseService { ...@@ -553,6 +556,9 @@ public class DataImportService extends BaseService {
if (addDataImportLog(dataImportLogs) < 1) { if (addDataImportLog(dataImportLogs) < 1) {
return OperationResultDto.error(ErrorMessage.SystemError); return OperationResultDto.error(ErrorMessage.SystemError);
} }
if(!dataImportLogs.stream().filter(dil -> !dil.getImportResult()).collect(Collectors.toList()).isEmpty()){
return OperationResultDto.error();
}
return OperationResultDto.success(); return OperationResultDto.success();
} catch (ServiceException e) { } catch (ServiceException e) {
throw e; throw e;
...@@ -698,6 +704,9 @@ public class DataImportService extends BaseService { ...@@ -698,6 +704,9 @@ public class DataImportService extends BaseService {
if (addDataImportLog(dataImportLogs) < 1) { if (addDataImportLog(dataImportLogs) < 1) {
return OperationResultDto.error(ErrorMessage.SystemError); return OperationResultDto.error(ErrorMessage.SystemError);
} }
if(!dataImportLogs.stream().filter(dil -> !dil.getImportResult()).collect(Collectors.toList()).isEmpty()){
return OperationResultDto.error();
}
return OperationResultDto.success(); return OperationResultDto.success();
} catch (ServiceException e) { } catch (ServiceException e) {
throw e; throw e;
...@@ -912,6 +921,9 @@ public class DataImportService extends BaseService { ...@@ -912,6 +921,9 @@ public class DataImportService extends BaseService {
if (addDataImportLog(dataImportLogs) < 1) { if (addDataImportLog(dataImportLogs) < 1) {
return OperationResultDto.error(ErrorMessage.SystemError); return OperationResultDto.error(ErrorMessage.SystemError);
} }
if(!dataImportLogs.stream().filter(dil -> !dil.getImportResult()).collect(Collectors.toList()).isEmpty()){
return OperationResultDto.error();
}
return OperationResultDto.success(); return OperationResultDto.success();
} catch (ServiceException e) { } catch (ServiceException e) {
throw e; throw e;
...@@ -1385,6 +1397,9 @@ public class DataImportService extends BaseService { ...@@ -1385,6 +1397,9 @@ public class DataImportService extends BaseService {
if (addDataImportLog(dataImportLogs) < 1) { if (addDataImportLog(dataImportLogs) < 1) {
return OperationResultDto.error(ErrorMessage.SystemError); return OperationResultDto.error(ErrorMessage.SystemError);
} }
if(!dataImportLogs.stream().filter(dil -> !dil.getImportResult()).collect(Collectors.toList()).isEmpty()){
return OperationResultDto.error();
}
return OperationResultDto.success(); return OperationResultDto.success();
} catch (ServiceException e) { } catch (ServiceException e) {
throw e; throw e;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment