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

try to fix grants kias

Browse Source
This commit is contained in:
Anton Romanov 2020-04-25 22:46:35 +04:00
parent e20fb468f9
commit 54b992a7f3
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -197,6 +197,7 @@ public class GrantService extends BaseService {
private boolean saveFromKias(GrantDto grantDto) throws IOException { private boolean saveFromKias(GrantDto grantDto) throws IOException {
grantDto.setName(grantDto.getTitle()); grantDto.setName(grantDto.getTitle());
String title = checkUniqueName(grantDto, grantDto.getId()); //проверка уникальности имени String title = checkUniqueName(grantDto, grantDto.getId()); //проверка уникальности имени
System.out.println(title);
if (title != null) { if (title != null) {
Grant grantFromDB = grantRepository.findFirstByTitle(title); //грант с таким же названием из бд Grant grantFromDB = grantRepository.findFirstByTitle(title); //грант с таким же названием из бд
if (checkSameDeadline(grantDto, grantFromDB.getId())) { //если дедайны тоже совпадают if (checkSameDeadline(grantDto, grantFromDB.getId())) { //если дедайны тоже совпадают
@ -225,7 +226,9 @@ public class GrantService extends BaseService {
private boolean checkSameDeadline(GrantDto grantDto, Integer id) { private boolean checkSameDeadline(GrantDto grantDto, Integer id) {
Date date = DateUtils.clearTime(grantDto.getDeadlines().get(0).getDate()); //дата с сайта киас Date date = DateUtils.clearTime(grantDto.getDeadlines().get(0).getDate()); //дата с сайта киас
System.out.println(date);
Date foundGrantDate = DateUtils.clearTime(deadlineService.findByGrantIdAndDate(id, date)); Date foundGrantDate = DateUtils.clearTime(deadlineService.findByGrantIdAndDate(id, date));
System.out.println(foundGrantDate);
return foundGrantDate != null && foundGrantDate.compareTo(date) == 0; return foundGrantDate != null && foundGrantDate.compareTo(date) == 0;
} }