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

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhbg/ctl/LhbgCtl.java

@@ -5,6 +5,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
@@ -25,6 +26,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 
+import cache.CacheSearchCondition;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.xt.jygl.accessory.entity.AccessoryEntity;
 import com.xt.jygl.accessory.service.AccessoryService;
@@ -123,7 +126,7 @@ public class LhbgCtl extends BaseWebCtl {
 			model.addAttribute("jyr", jyr);
 		}
 		model.addAttribute("user", user);
-
+		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "lhbg");
 		// 查询条件
 		Specification<LhbgEntity> spec = new Specification<LhbgEntity>() {
 			@Override
@@ -131,21 +134,51 @@ public class LhbgCtl extends BaseWebCtl {
 				List<Predicate> list = new ArrayList<Predicate>();
 				if (StringUtils.isNotEmpty(szdid)) {
 					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
+				} else if (isGET(request)) {
+					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szdid");
+					if (StringUtils.isNotEmpty(v)) {
+						list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + v + "%"));
+					}
 				}
 				if (StringUtils.isNotEmpty(szgkid)) {
 					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
+				} else if (isGET(request)) {
+					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgkid");
+					if (StringUtils.isNotEmpty(v)) {
+						list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + v + "%"));
+					}
 				}
 				if (StringUtils.isNotEmpty(szgqid)) {
 					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
+				} else if (isGET(request)) {
+					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgqid");
+					if (StringUtils.isNotEmpty(v)) {
+						list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + v + "%"));
+					}
 				}
 				if (StringUtils.isNotEmpty(gkjyr)) {
 					list.add(cb.like(root.get("jyrmc").as(String.class), "%" + gkjyr + "%"));
+				} else if (isGET(request)) {
+					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "gkjyr");
+					if (StringUtils.isNotEmpty(v)) {
+						list.add(cb.like(root.get("jyrmc").as(String.class), "%" + v + "%"));
+					}
 				}
 				if (StringUtils.isNotEmpty(fddbr)) {
 					list.add(cb.like(root.get("fddbr").as(String.class), "%" + fddbr + "%"));
+				} else if (isGET(request)) {
+					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "fddbr");
+					if (StringUtils.isNotEmpty(v)) {
+						list.add(cb.like(root.get("fddbr").as(String.class), "%" + v + "%"));
+					}
 				}
 				if (StringUtils.isNotEmpty(bgdd)) {
 					list.add(cb.like(root.get("bgdd").as(String.class), "%" + bgdd + "%"));
+				} else if (isGET(request)) {
+					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "bgdd");
+					if (StringUtils.isNotEmpty(v)) {
+						list.add(cb.like(root.get("zcdz").as(String.class), "%" + v + "%"));
+					}
 				}
 
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
@@ -205,11 +238,12 @@ public class LhbgCtl extends BaseWebCtl {
 		}
 		if (isPOST(request)) {
 			SearchCondition.lhbgpage = page.getPage();
+			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);
 		}
 		model.addAttribute("lczt", lczt);
-		model.addAttribute("gkjyr", gkjyr);
-		model.addAttribute("fddbr", fddbr);
-		model.addAttribute("bgdd", bgdd);
+		model.addAttribute("gkjyr", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "gkjyr"));
+		model.addAttribute("fddbr", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "fddbr"));
+		model.addAttribute("bgdd", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "bgdd"));
 		model.addAttribute("list", voList);
 		model.addAttribute("menuid", menuid);
 		// 翻页共通

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhsq/ctl/LhsqCtl.java

@@ -5,6 +5,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
@@ -25,6 +26,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 
+import cache.CacheSearchCondition;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.xt.jygl.accessory.entity.AccessoryEntity;
 import com.xt.jygl.accessory.service.AccessoryService;
@@ -105,7 +108,7 @@ public class LhsqCtl extends BaseWebCtl {
 			model.addAttribute("jyr", jyr);
 		}
 		model.addAttribute("user", user);
-
+		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "lhsq");
 		// 查询条件
 		Specification<LhsqEntity> spec = new Specification<LhsqEntity>() {
 			@Override
@@ -113,21 +116,52 @@ public class LhsqCtl extends BaseWebCtl {
 				List<Predicate> list = new ArrayList<Predicate>();
 				if (StringUtils.isNotEmpty(szdid)) {
 					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
+				} else if (isGET(request)) {
+					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szdid");
+					if (StringUtils.isNotEmpty(v)) {
+						list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + v + "%"));
+					}
 				}
 				if (StringUtils.isNotEmpty(szgkid)) {
 					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
+				} else if (isGET(request)) {
+					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgkid");
+					if (StringUtils.isNotEmpty(v)) {
+						list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + v + "%"));
+					}
 				}
 				if (StringUtils.isNotEmpty(szgqid)) {
 					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
+				} else if (isGET(request)) {
+					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgqid");
+					if (StringUtils.isNotEmpty(v)) {
+						list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + v + "%"));
+					}
 				}
 				if (StringUtils.isNotEmpty(gkjyr)) {
 					list.add(cb.like(root.get("jyrmc").as(String.class), "%" + gkjyr + "%"));
+				} else if (isGET(request)) {
+					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "gkjyr");
+					if (StringUtils.isNotEmpty(v)) {
+						list.add(cb.like(root.get("jyrmc").as(String.class), "%" + v + "%"));
+					}
 				}
+
 				if (StringUtils.isNotEmpty(fddbr)) {
 					list.add(cb.like(root.get("fddbr").as(String.class), "%" + fddbr + "%"));
+				} else if (isGET(request)) {
+					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "fddbr");
+					if (StringUtils.isNotEmpty(v)) {
+						list.add(cb.like(root.get("fddbr").as(String.class), "%" + v + "%"));
+					}
 				}
 				if (StringUtils.isNotEmpty(bgdd)) {
 					list.add(cb.like(root.get("bgdd").as(String.class), "%" + bgdd + "%"));
+				} else if (isGET(request)) {
+					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "bgdd");
+					if (StringUtils.isNotEmpty(v)) {
+						list.add(cb.like(root.get("bgdd").as(String.class), "%" + v + "%"));
+					}
 				}
 				if (isJyr()) {
 					list.add(cb.like(root.get("jyrid").as(String.class), "%" + securityMgr.getCurrUser().getSsjyr().getId() + "%"));
@@ -186,11 +220,12 @@ public class LhsqCtl extends BaseWebCtl {
 		}
 		if (isPOST(request)) {
 			SearchCondition.lhsqpage = page.getPage();
+			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);
 		}
 		model.addAttribute("lczt", lczt);
-		model.addAttribute("gkjyr", gkjyr);
-		model.addAttribute("fddbr", fddbr);
-		model.addAttribute("bgdd", bgdd);
+		model.addAttribute("gkjyr",  CacheSearchCondition.cacheSCmapVal(cacheSCmap, "gkjyr"));
+		model.addAttribute("fddbr",  CacheSearchCondition.cacheSCmapVal(cacheSCmap, "fddbr"));
+		model.addAttribute("bgdd",  CacheSearchCondition.cacheSCmapVal(cacheSCmap, "bgdd"));
 		model.addAttribute("list", voList);
 		model.addAttribute("menuid", menuid);
 		// 翻页共通

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhyx/ctl/LhyxCtl.java

@@ -5,6 +5,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
@@ -25,6 +26,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 
+import cache.CacheSearchCondition;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.xt.jygl.accessory.entity.AccessoryEntity;
 import com.xt.jygl.accessory.service.AccessoryService;
@@ -115,7 +118,7 @@ public class LhyxCtl extends BaseWebCtl {
 			model.addAttribute("jyr", jyr);
 		}
 		model.addAttribute("user", user);
-
+		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "lhyx");
 		// 查询条件
 		Specification<LhyxEntity> spec = new Specification<LhyxEntity>() {
 			@Override
@@ -123,21 +126,51 @@ public class LhyxCtl extends BaseWebCtl {
 				List<Predicate> list = new ArrayList<Predicate>();
 				if (StringUtils.isNotEmpty(szdid)) {
 					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
+				} else if (isGET(request)) {
+					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szdid");
+					if (StringUtils.isNotEmpty(v)) {
+						list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + v + "%"));
+					}
 				}
 				if (StringUtils.isNotEmpty(szgkid)) {
 					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
+				} else if (isGET(request)) {
+					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgkid");
+					if (StringUtils.isNotEmpty(v)) {
+						list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + v + "%"));
+					}
 				}
 				if (StringUtils.isNotEmpty(szgqid)) {
 					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
+				} else if (isGET(request)) {
+					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgqid");
+					if (StringUtils.isNotEmpty(v)) {
+						list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + v + "%"));
+					}
 				}
 				if (StringUtils.isNotEmpty(gkjyr)) {
 					list.add(cb.like(root.get("jyrmc").as(String.class), "%" + gkjyr + "%"));
+				} else if (isGET(request)) {
+					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "gkjyr");
+					if (StringUtils.isNotEmpty(v)) {
+						list.add(cb.like(root.get("jyrmc").as(String.class), "%" + v + "%"));
+					}
 				}
 				if (StringUtils.isNotEmpty(fddbr)) {
 					list.add(cb.like(root.get("fddbr").as(String.class), "%" + fddbr + "%"));
+				} else if (isGET(request)) {
+					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "fddbr");
+					if (StringUtils.isNotEmpty(v)) {
+						list.add(cb.like(root.get("fddbr").as(String.class), "%" + v + "%"));
+					}
 				}
 				if (StringUtils.isNotEmpty(bgdd)) {
 					list.add(cb.like(root.get("zcdz").as(String.class), "%" + bgdd + "%"));
+				} else if (isGET(request)) {
+					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "bgdd");
+					if (StringUtils.isNotEmpty(v)) {
+						list.add(cb.like(root.get("zcdz").as(String.class), "%" + v + "%"));
+					}
 				}
 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
 				if (isJyr()) {
@@ -196,11 +229,12 @@ public class LhyxCtl extends BaseWebCtl {
 		}
 		if (isPOST(request)) {
 			SearchCondition.lhyxpage = page.getPage();
+			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);
 		}
 		model.addAttribute("lczt", lczt);
-		model.addAttribute("gkjyr", gkjyr);
-		model.addAttribute("fddbr", fddbr);
-		model.addAttribute("bgdd", bgdd);
+		model.addAttribute("gkjyr", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "gkjyr"));
+		model.addAttribute("fddbr", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "fddbr"));
+		model.addAttribute("bgdd", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "bgdd"));
 		model.addAttribute("list", voList);
 		model.addAttribute("menuid", menuid);
 		// 翻页共通