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

gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hxhbtj/ctl/HxhbtjCtl.java

@@ -5,6 +5,7 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
@@ -21,10 +22,13 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import cache.CacheSearchCondition;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.xt.jygl.common.BaseWebCtl;
 import com.xt.jygl.common.Constants;
 import com.xt.jygl.common.GlobalData;
+import com.xt.jygl.common.SearchCondition;
 import com.xt.jygl.ggfwxxgl.hxgl.service.HxglService;
 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
 import com.xt.jygl.gkjcxx.gk.service.GkService;
@@ -59,6 +63,7 @@ public class HxhbtjCtl extends BaseWebCtl {
 	@RequestMapping(value = "/main")
 	// @RequiresPermissions("hxhbtj:main")
 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String rq, final String dq, final String menuid) throws JsonProcessingException {
+		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request,"hxhbtj");
 		// 查询条件
 		Specification<HxhbtjEntity> spec = new Specification<HxhbtjEntity>() {
 			@Override
@@ -67,10 +72,20 @@ public class HxhbtjCtl extends BaseWebCtl {
 				// 所在港口
 				if (StringUtils.isNotEmpty(dq)) {
 					list.add(cb.like(root.get("dq").as(String.class), "%" + dq + "%"));
+				} else if (isGET(request)) {
+					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "dq");
+					if (StringUtils.isNotEmpty(v)) {
+						list.add(cb.like(root.get("dq").as(String.class), "%" + v + "%"));
+					}
 				}
 				// 日期
 				if (rq != null) {
 					list.add(cb.like(root.get("rq").as(String.class), "%" + rq + "%"));
+				} else if (isGET(request)) {
+					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "rq");
+					if (StringUtils.isNotEmpty(v)) {
+						list.add(cb.like(root.get("rq").as(String.class), "%" + v + "%"));
+					}
 				}
 
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
@@ -79,6 +94,11 @@ public class HxhbtjCtl extends BaseWebCtl {
 			}
 		};
 
+		if (page.getPage() < 1) {
+			page.setPage(SearchCondition.hxhbtjpage);
+		}
+		page.setSort("id");
+		page.setOrder("desc");
 		Page<HxhbtjEntity> list = query.findAll(spec, toPageRequest(page), HxhbtjEntity.class);
 		List<HxhbtjVo> voList = new ArrayList<HxhbtjVo>();
 		for (HxhbtjEntity entity : list) {
@@ -106,12 +126,15 @@ public class HxhbtjCtl extends BaseWebCtl {
 			List<CodeEntity> codelist = securityMgr.codeService().findByBz(szd);
 			model.addAttribute("dqlist", codelist);
 		}
+		if (isPOST(request)) {
+			SearchCondition.hxhbtjpage = page.getPage();
+			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);
+		}
 
 		model.addAttribute("list", voList);
 		model.addAttribute("menuid", menuid);
-		model.addAttribute("dq", dq);
-		// model.addAttribute("szgkid", szgkid);
-		model.addAttribute("rq", rq);
+		model.addAttribute("dq", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "dq"));
+		model.addAttribute("rq", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "rq"));
 
 		// 翻页共通
 		putPageInfo(model, page, list);