许可证有效 无效 查询条件修改

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

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

@@ -267,16 +267,24 @@ public class XkzxxCtl extends BaseWebCtl {
 						list.add(cb.like(root.get("gkjyxkzh").as(String.class), "%" + v + "%"));
 					}
 				}
+				Date now = new Date();
 				if (StringUtils.isNotEmpty(sfyx)) {
-					list.add(cb.equal(root.get("sfyx").as(String.class), sfyx));
+					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)));
+					}
 				} else if (isGET(request)) {
 					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "sfyx");
 					if (StringUtils.isNotEmpty(v)) {
 						list.add(cb.equal(root.get("sfyx").as(String.class), v));
 					} else {
-						if (StringUtils.isEmpty(sfyx)) {
-							list.add(cb.equal(root.get("sfyx").as(String.class), "1"));
-						}
+//						if (StringUtils.isEmpty(sfyx)) {
+//							//list.add(cb.equal(root.get("sfyx").as(String.class), "1"));
+//						}
 					}
 				}
 				if (yxq1 != null) {
@@ -309,8 +317,6 @@ public class XkzxxCtl extends BaseWebCtl {
 						list.add(cb.lessThanOrEqualTo(root.get("yxqz").as(Date.class), yxq2Date));
 					}
 				}
-
-				Date now = new Date();
 				if (StringUtils.isNotEmpty(xkzsfdq)) {
 					if ((xkzsfdq).equals("6103")) {
 						list.add(cb.lessThanOrEqualTo(root.get("yxqz").as(Date.class), now));
@@ -318,6 +324,7 @@ public class XkzxxCtl extends BaseWebCtl {
 						list.add(cb.greaterThan(root.get("yxqz").as(Date.class), now));
 					} else {
 						list.add(cb.lessThanOrEqualTo(root.get("yxqz").as(Date.class), DateTime.addDays(now, 30)));
+						list.add(cb.greaterThan(root.get("yxqz").as(Date.class), now));
 					}
 
 				} else if (StringUtils.isNotEmpty((String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xkzsfdq")) && isGET(request)) {
@@ -327,6 +334,7 @@ public class XkzxxCtl extends BaseWebCtl {
 						list.add(cb.greaterThan(root.get("yxqz").as(Date.class), now));
 					} else {
 						list.add(cb.lessThanOrEqualTo(root.get("yxqz").as(Date.class), DateTime.addDays(now, 30)));
+						list.add(cb.greaterThan(root.get("yxqz").as(Date.class), now));
 					}
 				}
 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在港区的数据