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

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

@@ -197,11 +197,12 @@ public class GkjyrCtl extends BaseWebCtl {
 				} else if (isGET(request)) {
 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "szgq", "szgqid");
 				}
-				if (StringUtils.isNotEmpty(gkjyxkzh)) {
+				/*if (StringUtils.isNotEmpty(gkjyxkzh)) {
 					list.add(cb.like(root.get("gkjyxkzh").as(String.class), "%" + gkjyxkzh + "%"));
 				} else if (isGET(request)) {
 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null, "gkjyxkzh");
-				}
+				}*/
+				
 				if (StringUtils.isNotEmpty(fddbr)) {
 					list.add(cb.like(root.get("fddbr").as(String.class), "%" + fddbr + "%"));
 				} else if (isGET(request)) {
@@ -307,7 +308,7 @@ public class GkjyrCtl extends BaseWebCtl {
 				List<Predicate> subQueryPredicates1 = new ArrayList<Predicate>();
 				// 是否有许可证
 				if (StringUtils.isNotEmpty(sfcyxkz)) {
-					if (!sfcyxkz.equals("all")) {
+					if (!"all".equals(sfcyxkz)) {
 						if ("201".equals(sfcyxkz)) {
 							subQueryPredicates1.add(cb.equal(dpRoot1.get("gkjyr").as(String.class), root.get("id").as(String.class)));
 							subQueryPredicates1.add(cb.equal(dpRoot1.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
@@ -348,6 +349,17 @@ public class GkjyrCtl extends BaseWebCtl {
 				Date now = new Date();
 				subQueryPredicates.add(cb.equal(dpRoot.get("gkjyr").as(String.class), root.get("id").as(String.class)));
 				subQueryPredicates.add(cb.equal(dpRoot.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
+				if (StringUtils.isNotEmpty(gkjyxkzh)){
+					subQueryPredicates.add(cb.like(dpRoot.get("gkjyxkzh").as(String.class), "%"+gkjyxkzh+"%"));
+					xkzflag = true;
+				} else {
+					String gkjyxkzhTemp = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "gkjyxkzh");
+					if ( StringUtils.isNotEmpty(gkjyxkzhTemp)){
+						subQueryPredicates.add(cb.like(dpRoot.get("gkjyxkzh").as(String.class), "%"+gkjyxkzhTemp+"%"));
+						xkzflag = true;
+					}
+				}
+				
 				// 许可证有效期
 				if (xkzstartDate != null) {
 					subQueryPredicates.add(cb.greaterThanOrEqualTo(dpRoot.get("yxqz").as(Date.class), xkzstartDate));
@@ -517,10 +529,6 @@ public class GkjyrCtl extends BaseWebCtl {
 		putPageInfo(model, page, list);
 		return "gkjygl/gkjyr/jyrjbxx/gkjyrmain";
 	}
-
-	public static void main(String[] args) {
-		System.out.println(new Date(null));
-	}
 	
 	/**
 	 * 新增页面的跳转