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

WIP: Resolve "Статистика по активностям" #232

Draft
arefiev1997 wants to merge 11 commits from 93-activites-analytics into dev
pull from: 93-activites-analytics
merge into: romanov73:dev
Conversation 2 Commits 11 Files Changed 19 +14 -14
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2adaf7740a - Show all commits

28
src/main/java/ru/ulstu/user/repository/ActivityRepository.java
View File

@ -3,17 +3,17 @@ package ru.ulstu.user.repository;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param; import org.springframework.data.repository.query.Param;
//import ru.ulstu.user.model.Activity; import ru.ulstu.user.model.Activity;
//
//import java.util.Date; import java.util.Date;
//import java.util.List; import java.util.List;
//
//public interface ActivityRepository extends JpaRepository<Activity, Integer> { public interface ActivityRepository extends JpaRepository<Activity, Integer> {
//
// @Query("SELECT a FROM Activity a WHERE (:userId IS NULL OR a.user.id = :userId) " + @Query("SELECT a FROM Activity a WHERE (:userId IS NULL OR a.user.id = :userId) " +
// "AND (CAST(:dateFrom AS date) IS NULL OR :dateFrom < a.date) " + "AND (CAST(:dateFrom AS date) IS NULL OR :dateFrom < a.date) " +
// "AND (CAST(:dateTo AS date) IS NULL OR :dateTo > a.date)") "AND (CAST(:dateTo AS date) IS NULL OR :dateTo > a.date)")
// List<Activity> getByUserAndDateInterval(@Param("userId") Integer userId, List<Activity> getByUserAndDateInterval(@Param("userId") Integer userId,
// @Param("dateFrom") Date dateFrom, @Param("dateFrom") Date dateFrom,
// @Param("dateTo") Date dateTo); @Param("dateTo") Date dateTo);
//} }