|
@@ -381,7 +381,8 @@ public class XkzzxCtl extends BaseWebCtl {
|
|
|
// list.add(cb.notEqual(root.get("recordStatus").as(Integer.class),
|
|
|
// BaseEntity.RECORD_STATE_DELETE));
|
|
|
list.add(cb.equal(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
|
|
|
- list.add(cb.equal(root.get("sfyx").as(Integer.class),BaseEntity.RECORD_STATE_VALID));
|
|
|
+ // list.add(cb.equal(root.get("sfyx").as(Integer.class),
|
|
|
+ // BaseEntity.RECORD_STATE_VALID));
|
|
|
Date date = new Date();
|
|
|
list.add(cb.greaterThanOrEqualTo(root.get("yxqz").as(Date.class), date));
|
|
|
list.add(cb.lessThanOrEqualTo(root.get("yxqq").as(Date.class), date));
|
|
@@ -422,11 +423,8 @@ public class XkzzxCtl extends BaseWebCtl {
|
|
|
public Predicate toPredicate(Root<XkzfzEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
|
|
|
List<Predicate> list = new ArrayList<Predicate>();
|
|
|
list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + jyrid + "%"));
|
|
|
- //list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
|
|
|
- list.add(cb.equal(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
|
|
|
- Date date = new Date();
|
|
|
- list.add(cb.greaterThanOrEqualTo(root.get("yxqjssj").as(Date.class), date));
|
|
|
- list.add(cb.lessThanOrEqualTo(root.get("yxqkssj").as(Date.class), date));
|
|
|
+ list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
|
|
|
+ list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
|
|
|
return cb.and(list.toArray(new Predicate[] {}));
|
|
|
}
|
|
|
};
|
|
@@ -1115,11 +1113,7 @@ public class XkzzxCtl extends BaseWebCtl {
|
|
|
List<Predicate> list = new ArrayList<Predicate>();
|
|
|
list.add(cb.like(root.get("gkjyr").as(String.class), "%" + jyrid + "%"));
|
|
|
list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
|
|
|
- //list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
|
|
|
- list.add(cb.equal(root.get("sfyx").as(Integer.class),BaseEntity.RECORD_STATE_VALID));
|
|
|
- Date date = new Date();
|
|
|
- list.add(cb.greaterThanOrEqualTo(root.get("yxqz").as(Date.class), date));
|
|
|
- list.add(cb.lessThanOrEqualTo(root.get("yxqq").as(Date.class), date));
|
|
|
+ list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
|
|
|
return cb.and(list.toArray(new Predicate[] {}));
|
|
|
}
|
|
|
};
|
|
@@ -1159,9 +1153,6 @@ public class XkzzxCtl extends BaseWebCtl {
|
|
|
list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + jyrid + "%"));
|
|
|
list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
|
|
|
list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
|
|
|
- Date date = new Date();
|
|
|
- list.add(cb.greaterThanOrEqualTo(root.get("yxqjssj").as(Date.class), date));
|
|
|
- list.add(cb.lessThanOrEqualTo(root.get("yxqkssj").as(Date.class), date));
|
|
|
return cb.and(list.toArray(new Predicate[] {}));
|
|
|
}
|
|
|
};
|
|
@@ -1330,11 +1321,7 @@ public class XkzzxCtl extends BaseWebCtl {
|
|
|
List<Predicate> list = new ArrayList<Predicate>();
|
|
|
list.add(cb.like(root.get("gkjyr").as(String.class), "%" + jyrid + "%"));
|
|
|
list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
|
|
|
- //list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
|
|
|
- list.add(cb.equal(root.get("sfyx").as(Integer.class),BaseEntity.RECORD_STATE_VALID));
|
|
|
- Date date = new Date();
|
|
|
- list.add(cb.greaterThanOrEqualTo(root.get("yxqz").as(Date.class), date));
|
|
|
- list.add(cb.lessThanOrEqualTo(root.get("yxqq").as(Date.class), date));
|
|
|
+ list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
|
|
|
return cb.and(list.toArray(new Predicate[] {}));
|
|
|
}
|
|
|
};
|
|
@@ -1374,9 +1361,6 @@ public class XkzzxCtl extends BaseWebCtl {
|
|
|
list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + jyrid + "%"));
|
|
|
list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
|
|
|
list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
|
|
|
- Date date = new Date();
|
|
|
- list.add(cb.greaterThanOrEqualTo(root.get("yxqjssj").as(Date.class), date));
|
|
|
- list.add(cb.lessThanOrEqualTo(root.get("yxqkssj").as(Date.class), date));
|
|
|
return cb.and(list.toArray(new Predicate[] {}));
|
|
|
}
|
|
|
};
|