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

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzfz/ctl/XkzfzCtl.java

@@ -135,11 +135,15 @@ public class XkzfzCtl extends BaseWebCtl {
 						list.add(cb.like(root.get("wxhwpm").as(String.class), "%" + v + "%"));
 					}
 				}
+				Date now =new Date();
 				if (StringUtils.isNotEmpty(fzsfyx)) {
 					if (("是").equals(fzsfyx)) {
+						list.add(cb.greaterThan(root.get("yxqjssj").as(Date.class), now));
 						list.add(cb.equal(root.get("recordStatus").as(String.class), "1"));
 					} else {
-						list.add(cb.notEqual(root.get("recordStatus").as(String.class), "1"));
+						Predicate p1 =cb.lessThan(root.get("yxqjssj").as(Date.class), now);
+						Predicate p2 = cb.notEqual(root.get("recordStatus").as(String.class), BaseEntity.RECORD_STATE_VALID); 
+						list.add(cb.and(cb.or(p1,p2)));
 					}
 				} else if (isGET(request)) {
 					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "fzsfyx");
@@ -151,7 +155,6 @@ public class XkzfzCtl extends BaseWebCtl {
 						}
 					}
 				}
-				Date now = new Date();
 				if (StringUtils.isNotEmpty(fzsfdq)) {
 					if ((fzsfdq).equals("6103")) {
 						list.add(cb.lessThanOrEqualTo(root.get("yxqjssj").as(Date.class), now));
@@ -159,6 +162,7 @@ public class XkzfzCtl extends BaseWebCtl {
 						list.add(cb.greaterThan(root.get("yxqjssj").as(Date.class), now));
 					} else {
 						list.add(cb.lessThanOrEqualTo(root.get("yxqjssj").as(Date.class), DateTime.addDays(now, 30)));
+						list.add(cb.greaterThan(root.get("yxqjssj").as(Date.class), now));
 					}
 
 				} else if (isGET(request)) {