mirror of
https://github.com/sismics/docs.git
synced 2025-12-13 17:56:20 +00:00
Search on creation date (server), edit creation date (client)
This commit is contained in:
@@ -41,7 +41,6 @@ public class DocumentDao {
|
||||
|
||||
// Create the document
|
||||
EntityManager em = ThreadLocalContext.get().getEntityManager();
|
||||
document.setCreateDate(new Date());
|
||||
em.persist(document);
|
||||
|
||||
return document.getId();
|
||||
@@ -121,11 +120,18 @@ public class DocumentDao {
|
||||
criteriaList.add("d.DOC_IDUSER_C = :userId");
|
||||
parameterMap.put("userId", criteria.getUserId());
|
||||
}
|
||||
|
||||
if (criteria.getSearch() != null) {
|
||||
criteriaList.add("(d.DOC_TITLE_C LIKE :search OR d.DOC_DESCRIPTION_C LIKE :search)");
|
||||
parameterMap.put("search", "%" + criteria.getSearch() + "%");
|
||||
}
|
||||
if (criteria.getCreateDateMin() != null) {
|
||||
criteriaList.add("d.DOC_CREATEDATE_D >= :createDateMin");
|
||||
parameterMap.put("createDateMin", criteria.getCreateDateMin());
|
||||
}
|
||||
if (criteria.getCreateDateMax() != null) {
|
||||
criteriaList.add("d.DOC_CREATEDATE_D <= :createDateMax");
|
||||
parameterMap.put("createDateMax", criteria.getCreateDateMax());
|
||||
}
|
||||
|
||||
criteriaList.add("d.DOC_DELETEDATE_D is null");
|
||||
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package com.sismics.docs.core.dao.jpa.criteria;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
|
||||
/**
|
||||
* Document criteria.
|
||||
@@ -17,6 +19,16 @@ public class DocumentCriteria {
|
||||
*/
|
||||
private String search;
|
||||
|
||||
/**
|
||||
* Minimum creation date.
|
||||
*/
|
||||
private Date createDateMin;
|
||||
|
||||
/**
|
||||
* Maximum creation date.
|
||||
*/
|
||||
private Date createDateMax;
|
||||
|
||||
/**
|
||||
* Getter of userId.
|
||||
*
|
||||
@@ -52,4 +64,40 @@ public class DocumentCriteria {
|
||||
public void setSearch(String search) {
|
||||
this.search = search;
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter of createDateMin.
|
||||
*
|
||||
* @return the createDateMin
|
||||
*/
|
||||
public Date getCreateDateMin() {
|
||||
return createDateMin;
|
||||
}
|
||||
|
||||
/**
|
||||
* Setter of createDateMin.
|
||||
*
|
||||
* @param createDateMin createDateMin
|
||||
*/
|
||||
public void setCreateDateMin(Date createDateMin) {
|
||||
this.createDateMin = createDateMin;
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter of createDateMax.
|
||||
*
|
||||
* @return the createDateMax
|
||||
*/
|
||||
public Date getCreateDateMax() {
|
||||
return createDateMax;
|
||||
}
|
||||
|
||||
/**
|
||||
* Setter of createDateMax.
|
||||
*
|
||||
* @param createDateMax createDateMax
|
||||
*/
|
||||
public void setCreateDateMax(Date createDateMax) {
|
||||
this.createDateMax = createDateMax;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user