git-svn-id: https://192.168.57.71/svn/jsgkj@1784 931142cf-59ea-a443-aa0e-51397b428577

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkzx/ctl/XkzzxCtl.java

@@ -378,9 +378,12 @@ public class XkzzxCtl extends BaseWebCtl {
 				public Predicate toPredicate(Root<XkzxxEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 					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));
+					//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));
+					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));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};