Revision 35989
Added by Antonis Lempesis about 9 years ago
RequestDAO.java | ||
---|---|---|
63 | 63 |
} |
64 | 64 |
}; |
65 | 65 |
|
66 |
public List<Request> getForUser(String personId, Date fromDate, Date toDate, RequestSort requestSortBy, RequestSortOrder order, RequestFilter requestFilter, String term, int from, int to) { |
|
66 |
public List<Request> getForUser(String personId, Date fromDate, Date toDate, RequestSort requestSortBy, RequestSortOrder order, RequestFilter requestFilter, String term, Request.RequestStatus statusFilter, int from, int to) {
|
|
67 | 67 |
List<Object> args = new ArrayList<Object>(); |
68 | 68 |
List<Integer> types = new ArrayList<Integer>(); |
69 | 69 |
|
70 |
String query = getQuery(personId, requestSortBy, order, requestFilter, term, args, types); |
|
70 |
String query = getQuery(personId, requestSortBy, order, requestFilter, term, statusFilter, args, types);
|
|
71 | 71 |
|
72 | 72 |
// return null; |
73 | 73 |
return new JdbcTemplate(dataSource).query(query, args.toArray(), ArrayUtils.toPrimitive(types.toArray(new Integer[0])), requestRowMapper); |
74 | 74 |
} |
75 | 75 |
|
76 | 76 |
public static void main(String[] args) { |
77 |
System.out.println(new RequestDAO().getForUser("dfsdf", new Date(), new Date(), RequestSort.PUBLICATION, RequestSortOrder.ASCENDING, null, "breast", 0, 12)); |
|
77 |
System.out.println(new RequestDAO().getForUser("dfsdf", new Date(), new Date(), RequestSort.PUBLICATION, RequestSortOrder.ASCENDING, null, "breast", Request.RequestStatus.APPROVED, 0, 12));
|
|
78 | 78 |
} |
79 | 79 |
|
80 | 80 |
public List<Request> getForProject(String projectId) { |
... | ... | |
82 | 82 |
Types.VARCHAR}, requestRowMapper); |
83 | 83 |
} |
84 | 84 |
|
85 |
public List<Request> getRequests(Date fromDate, Date toDate, RequestSort requestSortBy, RequestSortOrder order, RequestFilter requestFilter, String term, int from, int to) { |
|
85 |
public List<Request> getRequests(Date fromDate, Date toDate, RequestSort requestSortBy, RequestSortOrder order, RequestFilter requestFilter, String term, Request.RequestStatus statusFilter, int from, int to) {
|
|
86 | 86 |
List<Object> args = new ArrayList<Object>(); |
87 | 87 |
List<Integer> types = new ArrayList<Integer>(); |
88 | 88 |
|
89 |
String query = getQuery(null, requestSortBy, order, requestFilter, term, args, types); |
|
89 |
String query = getQuery(null, requestSortBy, order, requestFilter, term, statusFilter, args, types);
|
|
90 | 90 |
|
91 | 91 |
return new JdbcTemplate(dataSource).query(query, args.toArray(), ArrayUtils.toPrimitive(types.toArray(new Integer[0])), requestRowMapper); |
92 | 92 |
} |
... | ... | |
134 | 134 |
}); |
135 | 135 |
} |
136 | 136 |
|
137 |
private String getQuery(String personId, RequestSort requestSortBy, RequestSortOrder order, RequestFilter requestFilter, String term, List<Object> args, List<Integer> types) { |
|
137 |
private String getQuery(String personId, RequestSort requestSortBy, RequestSortOrder order, RequestFilter requestFilter, String term, Request.RequestStatus statusFilter, List<Object> args, List<Integer> types) {
|
|
138 | 138 |
Map<String, String> joins = new HashMap<String, String>(); |
139 | 139 |
List<String> whereClauses = new ArrayList<String>(); |
140 | 140 |
List<Object> whereArgs = new ArrayList<Object>(); |
Also available in: Unified diff
added search by status in request api