fixes bug #10258 - Auditoria alterações
git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@78931 d1611594-4594-4d17-8e1d-87c2c4800839master
parent
e4e6e831aa
commit
d6405f79f2
|
@ -44,6 +44,7 @@ public class AuditControl {
|
|||
List<Object> lsClazz = new ArrayList<Object>();
|
||||
List<String> lsFieldName = new ArrayList<String>();
|
||||
|
||||
if (object != null){
|
||||
for (Field field : object.getClass().getDeclaredFields()) {
|
||||
if ((!field.isAnnotationPresent(Column.class) && !field.isAnnotationPresent(Id.class) &&
|
||||
!field.isAnnotationPresent(ManyToOne.class)) || field.getType().getSimpleName().equalsIgnoreCase("byte[]")) {
|
||||
|
@ -89,6 +90,7 @@ public class AuditControl {
|
|||
|
||||
json.append(field.get(object) == null ? "null" : field.get(object).toString());
|
||||
}
|
||||
}
|
||||
|
||||
for (int i = 0; i < lsClazz.size(); i++) {
|
||||
json.append(",");
|
||||
|
@ -134,6 +136,7 @@ public class AuditControl {
|
|||
List<Object> lsClazz = new ArrayList<Object>();
|
||||
List<String> lsNameFd = new ArrayList<String>();
|
||||
|
||||
if (clazz != null){
|
||||
for (Field field : clazz.getClass().getDeclaredFields()) {
|
||||
if (!field.isAnnotationPresent(Column.class) && !field.isAnnotationPresent(Id.class) &&
|
||||
!field.isAnnotationPresent(ManyToOne.class)) {
|
||||
|
@ -177,7 +180,7 @@ public class AuditControl {
|
|||
} else {
|
||||
ret += ql.concat(tab.concat(fim).concat(",").concat(ql).concat(tab));
|
||||
}
|
||||
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
@ -74,7 +74,7 @@ public class AuditLogHibernateDAO extends GenericHibernateDAO<AuditLog, Long>
|
|||
}
|
||||
|
||||
if (log.getDataInicio() != null && log.getDataFim() != null) {
|
||||
c.add(Restrictions.between("createDate", log.getDataInicio(), log.getDataFim()));
|
||||
c.add(Restrictions.between("createdDate", log.getDataInicio(), log.getDataFim()));
|
||||
}
|
||||
|
||||
return c.list();
|
||||
|
|
Loading…
Reference in New Issue