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

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrjbxx/ctl/GkjyrCtl.java

@@ -8,8 +8,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaBuilder.In;
 import javax.persistence.criteria.CriteriaQuery;
@@ -389,33 +387,39 @@ public class GkjyrCtl extends BaseWebCtl {
 				if (StringUtils.isNotEmpty(jyrxkzsfdq)) {
 					if ((jyrxkzsfdq).equals("6103")) {
 						subQueryPredicates.add(cb.lessThanOrEqualTo(dpRoot.get("yxqz").as(Date.class), now));
+						subQueryPredicates.add(cb.notEqual(dpRoot.get("sfyx").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
 						xkzflag = true;
 					} else if ((jyrxkzsfdq).equals("6101")) {
 						subQueryPredicates.add(cb.greaterThan(dpRoot.get("yxqz").as(Date.class), now));
+						subQueryPredicates.add(cb.equal(dpRoot.get("sfyx").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
 						xkzflag = true;
 					} else {
 						subQueryPredicates.add(cb.lessThanOrEqualTo(dpRoot.get("yxqz").as(Date.class), DateTime.addDays(now, 30)));
 						subQueryPredicates.add(cb.greaterThan(dpRoot.get("yxqz").as(Date.class), now));
+						subQueryPredicates.add(cb.equal(dpRoot.get("sfyx").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
 						xkzflag = true;
 					}
 				} else {
 					String jyrxkzsfdqval = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "jyrxkzsfdq");
 					if (StringUtils.isNotEmpty(jyrxkzsfdqval) && isGET(request)) {
 						if (jyrxkzsfdqval.equals("6103")) {
+							subQueryPredicates.add(cb.notEqual(dpRoot.get("sfyx").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
 							subQueryPredicates.add(cb.lessThanOrEqualTo(dpRoot.get("yxqz").as(Date.class), now));
 							xkzflag = true;
 						} else if (jyrxkzsfdqval.equals("6101")) {
+							subQueryPredicates.add(cb.equal(dpRoot.get("sfyx").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
 							subQueryPredicates.add(cb.greaterThan(dpRoot.get("yxqz").as(Date.class), now));
 							xkzflag = true;
 						} else {
+							subQueryPredicates.add(cb.equal(dpRoot.get("sfyx").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
 							subQueryPredicates.add(cb.lessThanOrEqualTo(dpRoot.get("yxqz").as(Date.class), DateTime.addDays(now, 30)));
+							subQueryPredicates.add(cb.greaterThan(dpRoot.get("yxqz").as(Date.class), now));
 							xkzflag = true;
 						}
 					}
 				}
 
 				if (xkzflag) {
-					subQueryPredicates.add(cb.equal(dpRoot.get("sfyx").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
 					subquery.where(subQueryPredicates.toArray(new Predicate[] {}));
 					list.add(cb.exists(subquery));
 				}
@@ -514,6 +518,10 @@ public class GkjyrCtl extends BaseWebCtl {
 		return "gkjygl/gkjyr/jyrjbxx/gkjyrmain";
 	}
 
+	public static void main(String[] args) {
+		System.out.println(new Date(null));
+	}
+	
 	/**
 	 * 新增页面的跳转
 	 *