romanov73/ng-tracker
1
0
Fork 0
Code Issues 18 Pull Requests 4 Projects Releases Wiki Activity

fix checkstyle

Browse Source
This commit is contained in:
Anton Romanov 2020-04-25 20:39:44 +04:00
parent 5520f19357
commit 3dd6210f42
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/ru/ulstu/grant/service/GrantService.java
View File

@ -358,7 +358,7 @@ public class GrantService extends BaseService {
@Transactional @Transactional
public Integer update(Grant newGrant) { public Integer update(Grant newGrant) {
Grant oldGrant = grantRepository.getOne(newGrant.getId()); Grant oldGrant = grantRepository.getOne(newGrant.getId());
Grant.GrantStatus oldStatus = oldGrant.getStatus(); //Grant.GrantStatus oldStatus = oldGrant.getStatus();
Set<User> oldAuthors = new HashSet<>(oldGrant.getAuthors()); Set<User> oldAuthors = new HashSet<>(oldGrant.getAuthors());
newGrant = grantRepository.save(newGrant); newGrant = grantRepository.save(newGrant);
for (User author : newGrant.getAuthors()) { for (User author : newGrant.getAuthors()) {
@ -367,9 +367,9 @@ public class GrantService extends BaseService {
} }
} }
if (newGrant.getStatus() != oldStatus) { // if (newGrant.getStatus() != oldStatus) {
// grantNotificationService.statusChangeNotification(newPaper, oldStatus); // grantNotificationService.statusChangeNotification(newPaper, oldStatus);
} // }
return newGrant.getId(); return newGrant.getId();
} }

2
src/main/java/ru/ulstu/grant/service/KiasService.java
View File

@ -32,7 +32,7 @@ public class KiasService {
public List<GrantDto> getNewGrantsDto() throws ParseException, IOException { public List<GrantDto> getNewGrantsDto() throws ParseException, IOException {
Integer leaderId = userService.findOneByLoginIgnoreCase("admin").getId(); Integer leaderId = userService.findOneByLoginIgnoreCase("admin").getId();
List<GrantDto> grants = new ArrayList<>(); List<GrantDto> grants = new ArrayList<>();
try (final WebClient webClient = new WebClient()) { try (WebClient webClient = new WebClient()) {
webClient.setJavaScriptTimeout(60 * 1000); webClient.setJavaScriptTimeout(60 * 1000);
webClient.getOptions().setThrowExceptionOnScriptError(false); webClient.getOptions().setThrowExceptionOnScriptError(false);
for (Integer year : generateGrantYears()) { for (Integer year : generateGrantYears()) {