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

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/ry/ctl/RyCtl.java

@@ -79,7 +79,7 @@ public class RyCtl extends BaseWebCtl {
 	@RequestMapping(value = "/main")
 	@RequiresPermissions("ryjtzxx:main")
 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String xm, final String szgkid, final String szgqid, final String jyr, final String szdid, final String menuid, final String rylxid) throws JsonProcessingException {
-		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request,"ryjtzxx");
+		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "ryjtzxx");
 		final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		// 查詢條件
 		Specification<RyEntity> spec = new Specification<RyEntity>() {
@@ -89,78 +89,89 @@ public class RyCtl extends BaseWebCtl {
 				List<Predicate> list = new ArrayList<Predicate>();
 				if (StringUtils.isNotEmpty(xm)) {
 					list.add(cb.like(root.get("xm").as(String.class), "%" + xm + "%"));
-				} else if(isGET(request)){
-					String v=(String)CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xm");
-					if(StringUtils.isNotEmpty(v)){
+				} else if (isGET(request)) {
+					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xm");
+					if (StringUtils.isNotEmpty(v)) {
 						list.add(cb.like(root.get("xm").as(String.class), "%" + v + "%"));
 					}
-				} 
-//				else if (StringUtils.isNotEmpty(SearchCondition.xm) && isGET(request)) {
-//					list.add(cb.like(root.get("xm").as(String.class), "%" + SearchCondition.xm + "%"));
-//				}
+				}
+				// else if (StringUtils.isNotEmpty(SearchCondition.xm) &&
+				// isGET(request)) {
+				// list.add(cb.like(root.get("xm").as(String.class), "%" +
+				// SearchCondition.xm + "%"));
+				// }
 				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)){
+				} 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 + "%"));
 					}
 				}
-//				else if (StringUtils.isNotEmpty(SearchCondition.ryszd) && isGET(request)) {
-//					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + SearchCondition.ryszd + "%"));
-//				}
+				// else if (StringUtils.isNotEmpty(SearchCondition.ryszd) &&
+				// isGET(request)) {
+				// list.add(cb.like(root.get("szd").get("id").as(String.class),
+				// "%" + SearchCondition.ryszd + "%"));
+				// }
 				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)){
+				} 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 + "%"));
 					}
 				}
-//				else if (StringUtils.isNotEmpty(SearchCondition.ryszgk) && isGET(request)) {
-//					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + SearchCondition.ryszgk + "%"));
-//				}
+				// else if (StringUtils.isNotEmpty(SearchCondition.ryszgk) &&
+				// isGET(request)) {
+				// list.add(cb.like(root.get("szgk").get("id").as(String.class),
+				// "%" + SearchCondition.ryszgk + "%"));
+				// }
 				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)){
+				} 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 + "%"));
 					}
 				}
-//				else if (StringUtils.isNotEmpty(SearchCondition.ryszgq) && isGET(request)) {
-//					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + SearchCondition.ryszgq + "%"));
-//				}
+				// else if (StringUtils.isNotEmpty(SearchCondition.ryszgq) &&
+				// isGET(request)) {
+				// list.add(cb.like(root.get("szgq").get("id").as(String.class),
+				// "%" + SearchCondition.ryszgq + "%"));
+				// }
 				if (StringUtils.isNotEmpty(jyr)) {
 					list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + jyr + "%"));
-				} else if(isGET(request)){
-					String v=(String)CacheSearchCondition.cacheSCmapVal(cacheSCmap, "jyr");
-					if(StringUtils.isNotEmpty(v)){
+				} else if (isGET(request)) {
+					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "jyr");
+					if (StringUtils.isNotEmpty(v)) {
 						list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + v + "%"));
 					}
 				}
-//				else if (StringUtils.isNotEmpty(SearchCondition.ryssjyr) && isGET(request)) {
-//					list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + SearchCondition.ryssjyr + "%"));
-//				}
+				// else if (StringUtils.isNotEmpty(SearchCondition.ryssjyr) &&
+				// isGET(request)) {
+				// list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class),
+				// "%" + SearchCondition.ryssjyr + "%"));
+				// }
 				if (StringUtils.isNotEmpty(rylxid)) {
 					list.add(cb.like(root.get("rylx").get("id").as(String.class), "%" + rylxid + "%"));
-				} else if(isGET(request)){
-					String v=(String)CacheSearchCondition.cacheSCmapVal(cacheSCmap, "rylxid");
-					if(StringUtils.isNotEmpty(v)){
+				} else if (isGET(request)) {
+					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "rylxid");
+					if (StringUtils.isNotEmpty(v)) {
 						list.add(cb.like(root.get("rylx").get("id").as(String.class), "%" + v + "%"));
 					}
-				} 
-//				else if (StringUtils.isNotEmpty(SearchCondition.rylx) && isGET(request)) {
-//					list.add(cb.like(root.get("rylx").get("id").as(String.class), "%" + SearchCondition.rylx + "%"));
-//				}
+				}
+				// else if (StringUtils.isNotEmpty(SearchCondition.rylx) &&
+				// isGET(request)) {
+				// list.add(cb.like(root.get("rylx").get("id").as(String.class),
+				// "%" + SearchCondition.rylx + "%"));
+				// }
 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
 				if (isJyr()) {
 					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
 				} else {
 					In<String> in = cb.in(root.get("szgq").get("id").as(String.class));
 					@SuppressWarnings("unchecked")
-					List<String> gqlist = (List<String>) Utils.getSession()
-							.getAttribute("gqList");
+					List<String> gqlist = (List<String>) Utils.getSession().getAttribute("gqList");
 					if (gqlist != null && gqlist.size() > 0) {
 						for (int i = 0; i < gqlist.size(); i++) {
 							in.value(gqlist.get(i));
@@ -168,7 +179,7 @@ public class RyCtl extends BaseWebCtl {
 						list.add(in);
 					}
 				}
-				//状态为0,9,10,11不显示
+				// 状态为0,9,10,11不显示
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_BGFLAG));
@@ -177,12 +188,11 @@ public class RyCtl extends BaseWebCtl {
 			}
 		};
 
-		
-		//判断登录用户是否和上次登录用户相同，若不同则清空查询条件
+		// 判断登录用户是否和上次登录用户相同，若不同则清空查询条件
 		String user1 = (String) Utils.getSession().getAttribute("user");
 		String user2 = SecUtils.getCurrUser().getId();
-		if(user2!=null){
-			if(!user2.equals(user1)){
+		if (user2 != null) {
+			if (!user2.equals(user1)) {
 				SearchCondition.rypage = 1;
 				SearchCondition.xm = "";
 				SearchCondition.ryssjyr = "";
@@ -192,13 +202,13 @@ public class RyCtl extends BaseWebCtl {
 				SearchCondition.rylx = "";
 
 			}
-			
+
 		}
 		Utils.getSession().setAttribute("user", user2);
-		
-//		if (page.getPage() < 1) {
-//			page.setPage(SearchCondition.rypage);
-//		}
+
+		// if (page.getPage() < 1) {
+		// page.setPage(SearchCondition.rypage);
+		// }
 		if (page.getPage() < 1) {
 			Object rypage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "rypage");
 			if (StringUtils.isEmpty(rypage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(rypage))) {
@@ -247,37 +257,36 @@ public class RyCtl extends BaseWebCtl {
 		 * JSONArray.fromObject(szdlist,config).toString());
 		 */
 
-//		if (isPOST(request)) {
-//			model.addAttribute("xm", xm);
-//			model.addAttribute("jyr", jyr);
-//			model.addAttribute("szd", szdid);
-//			model.addAttribute("szgk", szgkid);
-//			model.addAttribute("szgq", szgqid);
-//			model.addAttribute("rylxid", rylxid);
-//
-//			SearchCondition.rypage = page.getPage();
-//			SearchCondition.xm = xm;
-//			SearchCondition.ryssjyr = jyr;
-//			SearchCondition.ryszd = szdid;
-//			SearchCondition.ryszgk = szgkid;
-//			SearchCondition.ryszgq = szgqid;
-//			SearchCondition.rylx = rylxid;
-//
-//		} else {
-//			model.addAttribute("xm", SearchCondition.xm);
-//			model.addAttribute("jyr", SearchCondition.ryssjyr);
-//			model.addAttribute("szd", SearchCondition.ryszd);
-//			model.addAttribute("szgk", SearchCondition.ryszgk);
-//			model.addAttribute("szgq", SearchCondition.ryszgq);
-//			model.addAttribute("rylxid", SearchCondition.rylx);
-//		}
+		// if (isPOST(request)) {
+		// model.addAttribute("xm", xm);
+		// model.addAttribute("jyr", jyr);
+		// model.addAttribute("szd", szdid);
+		// model.addAttribute("szgk", szgkid);
+		// model.addAttribute("szgq", szgqid);
+		// model.addAttribute("rylxid", rylxid);
+		//
+		// SearchCondition.rypage = page.getPage();
+		// SearchCondition.xm = xm;
+		// SearchCondition.ryssjyr = jyr;
+		// SearchCondition.ryszd = szdid;
+		// SearchCondition.ryszgk = szgkid;
+		// SearchCondition.ryszgq = szgqid;
+		// SearchCondition.rylx = rylxid;
+		//
+		// } else {
+		// model.addAttribute("xm", SearchCondition.xm);
+		// model.addAttribute("jyr", SearchCondition.ryssjyr);
+		// model.addAttribute("szd", SearchCondition.ryszd);
+		// model.addAttribute("szgk", SearchCondition.ryszgk);
+		// model.addAttribute("szgq", SearchCondition.ryszgq);
+		// model.addAttribute("rylxid", SearchCondition.rylx);
+		// }
 
 		model.addAttribute("list", voList);
 		List<CodeEntity> rylxlist = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_RYLX);
 		model.addAttribute("rylxlist", JSONArray.fromObject(rylxlist, config).toString());
 		model.addAttribute("menuid", menuid);
-		
-		
+
 		if (isPOST(request)) {
 			cacheSCmap.put("rypage", page.getPage());
 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);
@@ -370,7 +379,7 @@ public class RyCtl extends BaseWebCtl {
 	@RequestMapping(value = "/save")
 	@RequiresPermissions("ryjtzxx:add")
 	@ResponseBody
-	public WebJsonResult save(Model model,String path, RyEntity code, String[] zsids, String szdid, String szgkid, String szgqid, String xbid, String ssjyrid, String rylxid, String zjlxid) {
+	public WebJsonResult save(Model model, String path, RyEntity code, String[] zsids, String szdid, String szgkid, String szgqid, String xbid, String ssjyrid, String rylxid, String zjlxid) {
 		WebJsonResult wr = success();
 		if (StringUtils.isEmpty(szdid)) {
 			wr.setSuccess(false);
@@ -560,19 +569,18 @@ public class RyCtl extends BaseWebCtl {
 		model.addAttribute("record", vo);
 
 		List<RyzsEntity> ryzslist = ryService.findZs(entity);
-		//List<RyzsEntity> zslist = ryzsService.findZs();
+		// List<RyzsEntity> zslist = ryzsService.findZs();
 		if (ryzslist.size() == 0) {
 			ryzslist = ryzsService.findZsBysfzh(entity.getSfzh());
-			/*for (RyzsEntity zs : zslist) {
-				if(entity.getSfzh() != null){
-					if (entity.getSfzh().equals(zs.getSfzh())) {
-						ryzslist.add(zs);
-					}
-					
-				}
-				
-
-			}*/
+			/*
+			 * for (RyzsEntity zs : zslist) { if(entity.getSfzh() != null){ if
+			 * (entity.getSfzh().equals(zs.getSfzh())) { ryzslist.add(zs); }
+			 * 
+			 * }
+			 * 
+			 * 
+			 * }
+			 */
 			/* ryzslist = ryzsService.findZsBysfzh(entity.getSfzh()); */
 		}
 		List<RyzsVo> voList = new ArrayList<RyzsVo>();
@@ -642,19 +650,18 @@ public class RyCtl extends BaseWebCtl {
 		 */
 
 		List<RyzsEntity> ryzslist = ryService.findZs(entity);
-		/*List<RyzsEntity> zslist = ryzsService.findZs();*/
+		/* List<RyzsEntity> zslist = ryzsService.findZs(); */
 		if (ryzslist.size() == 0) {
 			ryzslist = ryzsService.findZsBysfzh(entity.getSfzh());
-			/*for (RyzsEntity zs : zslist) {
-				if(entity.getSfzh() != null){
-					if (entity.getSfzh().equals(zs.getSfzh())) {
-						ryzslist.add(zs);
-					}
-					
-				}
-				
-
-			}*/
+			/*
+			 * for (RyzsEntity zs : zslist) { if(entity.getSfzh() != null){ if
+			 * (entity.getSfzh().equals(zs.getSfzh())) { ryzslist.add(zs); }
+			 * 
+			 * }
+			 * 
+			 * 
+			 * }
+			 */
 			/* ryzslist = ryzsService.findZsBysfzh(entity.getSfzh()); */
 		}
 		List<RyzsVo> voList = new ArrayList<RyzsVo>();
@@ -709,18 +716,18 @@ public class RyCtl extends BaseWebCtl {
 		List<CodeEntity> zjlxlist = securityMgr.codeService().findValidCodesByGroupCode("RYZJLX");
 		model.addAttribute("zjlxlist", JSONArray.fromObject(zjlxlist, config).toString());
 		model.addAttribute("menuid", menuid);
-		
-		if(SecUtils.getCurrUser() != null){
+
+		if (SecUtils.getCurrUser() != null) {
 			List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCodeAndCity(Constants.GROUP_CODE_SZD, GlobalData.CITY_CODE);
-			model.addAttribute("sz",list.size()==1?list.get(0).getId():"");
-			if(list.size()==1){
+			model.addAttribute("sz", list.size() == 1 ? list.get(0).getId() : "");
+			if (list.size() == 1) {
 				List<GkEntity> gklist = gkService.findBySzd(list.get(0).getId());
-				model.addAttribute("gk",gklist.size()==1?gklist.get(0).getId():"");
+				model.addAttribute("gk", gklist.size() == 1 ? gklist.get(0).getId() : "");
 			}
 		}
 		return "gkjygl/gkjyr/ry/ryadd";
 	}
-	
+
 	@RequestMapping(value = "/exportExcelAll")
 	public String exportExcelAll(HttpServletResponse response, final String xm, final String szgkid, final String szgqid, final String jyr, final String szdid, final String rylxid) {
 		// 查詢條件
@@ -753,8 +760,7 @@ public class RyCtl extends BaseWebCtl {
 				} else {
 					In<String> in = cb.in(root.get("szgq").get("id").as(String.class));
 					@SuppressWarnings("unchecked")
-					List<String> gqlist = (List<String>) Utils.getSession()
-							.getAttribute("gqList");
+					List<String> gqlist = (List<String>) Utils.getSession().getAttribute("gqList");
 					if (gqlist != null && gqlist.size() > 0) {
 						for (int i = 0; i < gqlist.size(); i++) {
 							in.value(gqlist.get(i));
@@ -762,7 +768,7 @@ public class RyCtl extends BaseWebCtl {
 						list.add(in);
 					}
 				}
-				//状态为0,9,10,11不显示
+				// 状态为0,9,10,11不显示
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_BGFLAG));
@@ -772,7 +778,7 @@ public class RyCtl extends BaseWebCtl {
 		};
 		List<RyEntity> list = query.findAll(spec, RyEntity.class);
 		List<RyVo> voList = entityToVo(list);
-		
+
 		response.setContentType("application/binary;charset=iso-8859-1");
 		try {
 			ServletOutputStream outputStream = response.getOutputStream();
@@ -784,10 +790,10 @@ public class RyCtl extends BaseWebCtl {
 		}
 		return null;
 	}
-	
+
 	public List<RyVo> entityToVo(List<RyEntity> list) {
 		List<RyVo> voList = new ArrayList<RyVo>();
-		
+
 		for (RyEntity entity : list) {
 			RyVo vo = new RyVo();
 			if (null != entity) {
@@ -813,7 +819,7 @@ public class RyCtl extends BaseWebCtl {
 				}
 
 				List<RyzsEntity> ryzslist = ryService.findZs(entity);
-				if (ryzslist.size() == 0) {
+				if (ryzslist.size() == 0 && entity.getSfzh() != null && !"".equals(entity.getSfzh())) {
 					ryzslist = ryzsService.findZsBysfzh(entity.getSfzh());
 				}
 				List<RyzsVo> ryvoList = new ArrayList<RyzsVo>();
@@ -834,7 +840,7 @@ public class RyCtl extends BaseWebCtl {
 						ryvoList.add(zsvo);
 					}
 				}
-				
+
 				voList.add(vo);
 			}
 		}