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

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzxx/ctl/XkzxxCtl.java

@@ -1023,13 +1023,24 @@ public class XkzxxCtl extends BaseWebCtl {
 				if (StringUtils.isNotEmpty(gkjyxkzh)) {
 					list.add(cb.like(root.get("gkjyxkzh").as(String.class), "%" + gkjyxkzh + "%"));
 				}
+//				if (StringUtils.isNotEmpty(sfyx)) {
+//					// if ("1".equals(sfyx)) {
+//					list.add(cb.equal(root.get("sfyx").as(String.class), sfyx));
+//					// } else {
+//					// list.add(cb.notEqual(root.get("sfyx").as(String.class),
+//					// "2"));
+//					// }
+//				}
+				Date now = new Date();
 				if (StringUtils.isNotEmpty(sfyx)) {
-					// if ("1".equals(sfyx)) {
-					list.add(cb.equal(root.get("sfyx").as(String.class), sfyx));
-					// } else {
-					// list.add(cb.notEqual(root.get("sfyx").as(String.class),
-					// "2"));
-					// }
+					if ("1".equals(sfyx)){
+						list.add(cb.greaterThan(root.get("yxqz").as(Date.class), now));
+						list.add(cb.equal(root.get("sfyx").as(String.class), BaseEntity.RECORD_STATE_VALID));
+					} else if ("2".equals(sfyx)){
+						Predicate p1 =cb.lessThan(root.get("yxqz").as(Date.class), now);
+						Predicate p2 = cb.notEqual(root.get("sfyx").as(String.class), BaseEntity.RECORD_STATE_VALID); 
+						list.add(cb.and(cb.or(p1,p2)));
+					}
 				}
 				if (yxq1 != null) {
 					list.add(cb.greaterThanOrEqualTo(root.get("yxqz").as(Date.class), yxq1));
@@ -1037,7 +1048,6 @@ public class XkzxxCtl extends BaseWebCtl {
 				if (yxq2 != null) {
 					list.add(cb.lessThanOrEqualTo(root.get("yxqz").as(Date.class), yxq2));
 				}
-				Date now = new Date();
 				if (StringUtils.isNotEmpty(xkzsfdq)) {
 					if ((xkzsfdq).equals("6103")) {
 						list.add(cb.lessThanOrEqualTo(root.get("yxqz").as(Date.class), now));