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

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/ctl/XmxxglCtl.java

@@ -117,7 +117,7 @@ public class XmxxglCtl extends BaseWebCtl {
 	 */
 	@RequestMapping(value = "/main")
 	@RequiresPermissions("xmxxgl:main")
-	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String xmmc, final String szgkid, final String szgqid, String menuid, final String xmhzjbid, final String xmfr, final String szdid, final String sfyzjbzid, final String xmbm) throws JsonProcessingException {
+	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String xmmc, final String szgkid, final String szgqid, String menuid, final String xmhzjbid, final String jyrmc, final String szdid, final String sfyzjbzid, final String xmbm) throws JsonProcessingException {
 
 		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "xmxxgl");
 		// final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -138,10 +138,15 @@ public class XmxxglCtl extends BaseWebCtl {
 				} else if (isGET(request)) {
 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null, "xmbm");
 				}
-				if (StringUtils.isNotEmpty(xmfr)) {
-					list.add(cb.like(root.get("xmfr").as(String.class), "%" + xmfr + "%"));
-				} else if (isGET(request)) {
-					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null, "xmfr");
+//				if (StringUtils.isNotEmpty(xmfr)) {
+//					list.add(cb.like(root.get("xmfr").as(String.class), "%" + xmfr + "%"));
+//				} else if (isGET(request)) {
+//					
+//				}
+				if (StringUtils.isNotEmpty(jyrmc)) {
+					list.add(cb.like(root.get("jyrid").get("gkjyr").as(String.class), "%" + jyrmc + "%"));
+				}else if(isGET(request)){
+					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null, "jyrmc");
 				}
 				if (StringUtils.isNotEmpty(xmhzjbid)) {
 					list.add(cb.like(root.get("xmhzjb").get("id").as(String.class), "%" + xmhzjbid + "%"));
@@ -234,6 +239,8 @@ public class XmxxglCtl extends BaseWebCtl {
 				vo.setAxspjbzw(entity.getAxspjb() != null ? entity.getAxspjb().getText() : "");
 				vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
 				vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+				//新增所属经营人
+				vo.setSsjyr(entity.getJyrid()!=null? entity.getJyrid().getGkjyr():"");
 				if (entity.getJyrid() != null) {
 					vo.setSzddzw(entity.getJyrid().getSzd() != null ? entity.getJyrid().getSzd().getText() : "");
 					vo.setSzd(entity.getJyrid().getSzd() != null ? entity.getJyrid().getSzd().getId() : "");
@@ -287,7 +294,7 @@ public class XmxxglCtl extends BaseWebCtl {
 		model.addAttribute("list", voList);
 		model.addAttribute("xmmc", xmmc);
 		model.addAttribute("xmbm", xmbm);
-		model.addAttribute("xmfr", xmfr);
+		model.addAttribute("jyrmc", jyrmc);
 		model.addAttribute("szd", szdid);
 		model.addAttribute("szgk", szgkid);
 		model.addAttribute("szgq", szgqid);