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

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/tzjhgl/ctl/TzjhglCtl.java

@@ -62,6 +62,7 @@ public class TzjhglCtl extends BaseWebCtl {
 
 	/**
 	 * 一览页面
+	 * 
 	 * @param page
 	 * @param model
 	 * @param request
@@ -83,9 +84,9 @@ public class TzjhglCtl extends BaseWebCtl {
 	 */
 	@RequestMapping(value = "/main")
 	@RequiresPermissions("tzjhgl:main")
-	public String main(SimplePageRequest page, final Model model,final HttpServletRequest request, final String xmid, final String szdid, final String xmmc, final String xmfr, final String jhnd, final Double ndjhtz1, final Double ndjhtz2, final String szgqid, final String szgkid, final String xmlbid, final String sfyzjbzid,String menuid) throws JsonProcessingException, UnsupportedEncodingException {
+	public String main(SimplePageRequest page, final Model model, final HttpServletRequest request, final String xmid, final String szdid, final String xmmc, final String xmfr, final String jhnd, final Double ndjhtz1, final Double ndjhtz2, final String szgqid, final String szgkid, final String xmlbid, final String sfyzjbzid, String menuid) throws JsonProcessingException, UnsupportedEncodingException {
 
-		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request,"tzjhgl");
+		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "tzjhgl");
 		Specification<TzjhglEntity> spec = new Specification<TzjhglEntity>() {
 			// 查询条件
 			@Override
@@ -100,83 +101,81 @@ public class TzjhglCtl extends BaseWebCtl {
 				}
 				if (StringUtils.isNotEmpty(xmmc)) {
 					list.add(cb.like(root.get("xmid").get("xmmc").as(String.class), "%" + xmmc + "%"));
-				}else if (isGET(request)) {
-					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "xmmc", "xmid","xmmc");
+				} else if (isGET(request)) {
+					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "xmmc", "xmid", "xmmc");
 				}
 				if (StringUtils.isNotEmpty(xmfr)) {
 					list.add(cb.like(root.get("xmid").get("xmfr").as(String.class), "%" + xmfr + "%"));
-				}else if (isGET(request)) {
-					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "xmfr", "xmid","xmfr");
+				} else if (isGET(request)) {
+					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "xmfr", "xmid", "xmfr");
 				}
 				if (StringUtils.isNotEmpty(jhnd)) {
 					list.add(cb.like(root.get("jhnd").as(String.class), "%" + jhnd + "%"));
-				}else if (isGET(request)) {
-					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null,"jhnd");
+				} else if (isGET(request)) {
+					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null, "jhnd");
 				}
 				if (StringUtils.isNotEmpty(szdid)) {
 					list.add(cb.like(root.get("xmid").get("szd").get("id").as(String.class), "%" + szdid + "%"));
-				}else if (isGET(request)) {
+				} else if (isGET(request)) {
 					Object val = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szdid");
 					list.add(cb.like(root.get("xmid").get("szd").get("id").as(String.class), "%" + val + "%"));
 				}
 				if (StringUtils.isNotEmpty(szgkid)) {
 					list.add(cb.like(root.get("xmid").get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
-				}else if (isGET(request)) {
+				} else if (isGET(request)) {
 					Object val = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgkid");
 					list.add(cb.like(root.get("xmid").get("szgk").get("id").as(String.class), "%" + val + "%"));
 				}
 				if (StringUtils.isNotEmpty(szgqid)) {
 					list.add(cb.like(root.get("xmid").get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
-				}else if (StringUtils.isNotEmpty(SearchCondition.tzjhszgq) && isGET(request)) {
+				} else if (StringUtils.isNotEmpty(SearchCondition.tzjhszgq) && isGET(request)) {
 					Object val = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgqid");
 					list.add(cb.like(root.get("xmid").get("szgq").get("id").as(String.class), "%" + val + "%"));
 				}
 				if (StringUtils.isNotEmpty(xmlbid)) {
 					list.add(cb.like(root.get("xmlb").get("id").as(String.class), "%" + xmlbid + "%"));
-				}else if (isGET(request)) {
+				} else if (isGET(request)) {
 					Object val = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmlbid");
 					list.add(cb.like(root.get("xmlb").get("id").as(String.class), "%" + val + "%"));
 				}
 				if (ndjhtz1 != null) {
 					list.add(cb.greaterThanOrEqualTo(root.get("ndjhtz").as(Double.class), ndjhtz1));
-				}else if (isGET(request)) {
-					Double d=null;
-					String val = (String)CacheSearchCondition.cacheSCmapVal(cacheSCmap, "ndjhtz1");
-					if(StringUtils.isNotEmpty(val)){
-						d= Double.parseDouble(val);
+				} else if (isGET(request)) {
+					Double d = null;
+					String val = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "ndjhtz1");
+					if (StringUtils.isNotEmpty(val)) {
+						d = Double.parseDouble(val);
 						list.add(cb.greaterThanOrEqualTo(root.get("ndjhtz").as(Double.class), d));
 					}
-					
+
 				}
 				if (ndjhtz2 != null) {
 					list.add(cb.lessThanOrEqualTo(root.get("ndjhtz").as(Double.class), ndjhtz2));
-				}else if (isGET(request)) {
+				} else if (isGET(request)) {
 					Double d = null;
-					String val = (String)CacheSearchCondition.cacheSCmapVal(cacheSCmap, "ndjhtz2");	
-					if(StringUtils.isNotEmpty(val)){
-						d= Double.parseDouble(val);
+					String val = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "ndjhtz2");
+					if (StringUtils.isNotEmpty(val)) {
+						d = Double.parseDouble(val);
 						list.add(cb.lessThanOrEqualTo(root.get("ndjhtz").as(Double.class), d));
 					}
-					
+
 				}
 				if (StringUtils.isNotEmpty(sfyzjbzid)) {
 					list.add(cb.like(root.get("sfyzjbz").get("id").as(String.class), "%" + sfyzjbzid + "%"));
-				}else if (isGET(request)) {
-					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "sfyzjbz","sfyzjbzid");
+				} else if (isGET(request)) {
+					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "sfyzjbz", "sfyzjbzid");
 				}
 				if (securityMgr.getCurrUser().getSfjyr().getText().equals("是")) {
 					list.add(cb.like(root.get("createUser").as(String.class), "%" + securityMgr.getCurrUser().getId() + "%"));
 				}
-				
+
 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在港区的数据
 				if (isJyr()) {
-					list.add(cb.like(root.get("xmid").get("jyrid").get("id").as(String.class), "%"
-							+ getSsjyr().getId() + "%"));
+					list.add(cb.like(root.get("xmid").get("jyrid").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
 				} else {
 					In<String> in = cb.in(root.get("xmid").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));
@@ -185,41 +184,38 @@ public class TzjhglCtl extends BaseWebCtl {
 					}
 				}
 				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_COPY));
 				return cb.and(list.toArray(new Predicate[] {}));
 			}
 		};
-		
-		/*String user1 = (String) Utils.getSession().getAttribute("user");
-		String user2 = SecUtils.getCurrUser().getId();
-		if(user2!=null){
-			if(!user2.equals(user1)){
-				SearchCondition.tzjhpage = 1;
-				SearchCondition.tzjhxmmc = "";
-				SearchCondition.tzjhszd = "";
-				SearchCondition.tzjhszgk = "";
-				SearchCondition.tzjhszgq = "";
-				SearchCondition.tzjhxmfr = "";
-				SearchCondition.tzjhssjh = "";
-				SearchCondition.tzjhjhnd = "";
-				SearchCondition.tzsfyzjbz = "";
-				SearchCondition.tzjhndjhtz1 = "";
-				SearchCondition.tzjhndjhtz2 = "";
-				SearchCondition.tzsfyzjbz = "";
-			}
-			
-		}
-		Utils.getSession().setAttribute("user", user2);*/
-		
+
+		/*
+		 * String user1 = (String) Utils.getSession().getAttribute("user");
+		 * String user2 = SecUtils.getCurrUser().getId(); if(user2!=null){
+		 * if(!user2.equals(user1)){ SearchCondition.tzjhpage = 1;
+		 * SearchCondition.tzjhxmmc = ""; SearchCondition.tzjhszd = "";
+		 * SearchCondition.tzjhszgk = ""; SearchCondition.tzjhszgq = "";
+		 * SearchCondition.tzjhxmfr = ""; SearchCondition.tzjhssjh = "";
+		 * SearchCondition.tzjhjhnd = ""; SearchCondition.tzsfyzjbz = "";
+		 * SearchCondition.tzjhndjhtz1 = ""; SearchCondition.tzjhndjhtz2 = "";
+		 * SearchCondition.tzsfyzjbz = ""; }
+		 * 
+		 * } Utils.getSession().setAttribute("user", user2);
+		 */
+
 		if (page.getPage() < 1) {
 			page.setPage(SearchCondition.tzjhpage);
 		}
-//		if (page.getPage() < 1) {
-//			Object tzjhpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "tzjhpage");
-//			if (StringUtils.isEmpty(tzjhpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(tzjhpage))) {
-//				tzjhpage = "1";
-//			}
-//			page.setPage(Integer.valueOf(String.valueOf(tzjhpage)));
-//		}
+		// if (page.getPage() < 1) {
+		// Object tzjhpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap,
+		// "tzjhpage");
+		// if (StringUtils.isEmpty(tzjhpage) ||
+		// !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(tzjhpage)))
+		// {
+		// tzjhpage = "1";
+		// }
+		// page.setPage(Integer.valueOf(String.valueOf(tzjhpage)));
+		// }
 		page.setSort("id");
 		page.setOrder("desc");
 		Page<TzjhglEntity> list = query.findAll(spec, toPageRequest(page), TzjhglEntity.class);
@@ -240,20 +236,23 @@ public class TzjhglCtl extends BaseWebCtl {
 				vo.setSfyzjbzzw(entity.getSfyzjbz() != null ? entity.getSfyzjbz().getText() : "");
 				List<TaskInfoEntity> listtask = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(vo.getXmid(), XmxxglEntity.PROCESS_DEFINITION_KEY);
 				String flag = "";
-				if (listtask.size() != 0 || entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {
-					flag = "1";
-					vo.setFlag(flag);
+
+				if (entity.getXmid() != null) {
+					if (entity.getXmid().getRecordStatus() == 8) {
+						flag = "1";
+					}
 				}
+				vo.setFlag(flag);
 				voList.add(vo);
 			}
 		}
-		if(isPOST(request)){
+		if (isPOST(request)) {
 			SearchCondition.tzjhpage = page.getPage();
-			//cacheSCmap.put("tzjhpage",page.getPage());
+			// cacheSCmap.put("tzjhpage",page.getPage());
 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);
-			//System.out.println(JSONObject.fromObject(cacheSCmap));
+			// System.out.println(JSONObject.fromObject(cacheSCmap));
 		}
-		
+
 		model.addAttribute("xmmc", xmmc);
 		if (StringUtils.isNotEmpty(xmid)) {
 			XmxxglEntity xmxx = xmxxglService.findOne(xmid);
@@ -268,26 +267,21 @@ public class TzjhglCtl extends BaseWebCtl {
 		model.addAttribute("ndjhtz2", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "ndjhtz2"));
 		model.addAttribute("jhnd", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "jhnd"));
 		model.addAttribute("xmlb", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmlbid"));
-		model.addAttribute("sfyzjbz",CacheSearchCondition.cacheSCmapVal(cacheSCmap, "sfyzjbzid"));
+		model.addAttribute("sfyzjbz", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "sfyzjbzid"));
 		model.addAttribute("menuid", menuid);
-		
-		/*if (isPOST(request)) {
-			SearchCondition.tzjhpage = page.getPage();
-			SearchCondition.tzjhxmmc = xmmc;
-			SearchCondition.tzjhszd = szdid;
-			SearchCondition.tzjhszgk = szgkid;
-			SearchCondition.tzjhszgq = szgqid;
-			SearchCondition.tzjhxmfr = xmfr;
-			SearchCondition.tzjhssjh = xmlbid;
-			SearchCondition.tzjhjhnd = jhnd;
-			SearchCondition.tzsfyzjbz = sfyzjbzid;
-			SearchCondition.tzjhndjhtz1 = ndjhtz1!=null?ndjhtz1.toString():"";
-			SearchCondition.tzjhndjhtz2 = ndjhtz2!=null?ndjhtz2.toString():"";
-			SearchCondition.tzsfyzjbz = sfyzjbzid;
-		}
-		*/
-		
-		
+
+		/*
+		 * if (isPOST(request)) { SearchCondition.tzjhpage = page.getPage();
+		 * SearchCondition.tzjhxmmc = xmmc; SearchCondition.tzjhszd = szdid;
+		 * SearchCondition.tzjhszgk = szgkid; SearchCondition.tzjhszgq = szgqid;
+		 * SearchCondition.tzjhxmfr = xmfr; SearchCondition.tzjhssjh = xmlbid;
+		 * SearchCondition.tzjhjhnd = jhnd; SearchCondition.tzsfyzjbz =
+		 * sfyzjbzid; SearchCondition.tzjhndjhtz1 =
+		 * ndjhtz1!=null?ndjhtz1.toString():""; SearchCondition.tzjhndjhtz2 =
+		 * ndjhtz2!=null?ndjhtz2.toString():""; SearchCondition.tzsfyzjbz =
+		 * sfyzjbzid; }
+		 */
+
 		// 翻页共通
 		putPageInfo(model, page, list);
 		return "gkjsgl/tzjhgl/tzjhglmain";
@@ -312,7 +306,7 @@ public class TzjhglCtl extends BaseWebCtl {
 	@RequestMapping(value = "/save")
 	@RequiresPermissions("tzjhgl:add")
 	@ResponseBody
-	public WebJsonResult save(Model model, TzjhglEntity code, String szgk, String szgq, String xmxxglid, String xmlbid,String sfyzjbzid) {
+	public WebJsonResult save(Model model, TzjhglEntity code, String szgk, String szgq, String xmxxglid, String xmlbid, String sfyzjbzid) {
 		WebJsonResult wr = success();
 		if (StringUtils.isEmpty(code.getXmmc())) {
 			wr.setSuccess(false);
@@ -384,14 +378,14 @@ public class TzjhglCtl extends BaseWebCtl {
 					CodeEntity xmlbdx = new CodeEntity();
 					xmlbdx.setId(xmlbid);
 					code.setXmlb(xmlbdx);
-				}else{
+				} else {
 					code.setXmlb(null);
 				}
 				if (!StringUtils.isEmpty(sfyzjbzid)) {
 					CodeEntity sfyzjbzdx = new CodeEntity();
 					sfyzjbzdx.setId(sfyzjbzid);
 					code.setSfyzjbz(sfyzjbzdx);
-				}else{
+				} else {
 					code.setSfyzjbz(null);
 				}
 				tzjhglService.save(code);
@@ -456,55 +450,56 @@ public class TzjhglCtl extends BaseWebCtl {
 	}
 
 	// 初始化项目信息选择页面
-		@RequestMapping(value = "/xmxxxz")
-		@ResponseBody
-		public WebJsonResult xmxxxz(final Integer page,Model model, final String xmcx) throws JsonProcessingException {
-			WebJsonResult wr = new WebJsonResult();
-			Specification<XmxxglEntity> spec = new Specification<XmxxglEntity>() {
-				// 查询条件
-				@Override
-				public Predicate toPredicate(Root<XmxxglEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
-					List<Predicate> list = new ArrayList<Predicate>();
-					if (StringUtils.isNotEmpty(xmcx)) {
-						list.add(cb.like(root.get("xmmc").as(String.class), "%" + xmcx + "%"));
-					}
-					if (securityMgr.getCurrUser().getSfjyr().getText().equals("是")) {
-						list.add(cb.like(root.get("createUser").as(String.class), "%" + securityMgr.getCurrUser().getId() + "%"));
-					}
-					list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
-					return cb.and(list.toArray(new Predicate[] {}));
+	@RequestMapping(value = "/xmxxxz")
+	@ResponseBody
+	public WebJsonResult xmxxxz(final Integer page, Model model, final String xmcx) throws JsonProcessingException {
+		WebJsonResult wr = new WebJsonResult();
+		Specification<XmxxglEntity> spec = new Specification<XmxxglEntity>() {
+			// 查询条件
+			@Override
+			public Predicate toPredicate(Root<XmxxglEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+				List<Predicate> list = new ArrayList<Predicate>();
+				if (StringUtils.isNotEmpty(xmcx)) {
+					list.add(cb.like(root.get("xmmc").as(String.class), "%" + xmcx + "%"));
 				}
-			};
-			SimplePageRequest page2 = new SimplePageRequest();
-			if (page == null) {
-				page2.setPage(1);
-			} else {
-				page2.setPage(page);
-			}
-			page2.setRows(5);
-			Sort newsort = new Sort(Direction.fromString(page2.getOrder()), new String[] { page2.getSort() });
-			// 页码从0开始
-			PageRequest pageable = new PageRequest(page2.getPage() - 1, page2.getRows(), newsort);
-			Page<XmxxglEntity> list = query.findAll(spec, pageable, XmxxglEntity.class);
-			List<XmxxglEntity> list2 = new ArrayList<XmxxglEntity>();
-			for (XmxxglEntity xmxxglEntity : list) {
-				list2.add(xmxxglEntity);
+				if (securityMgr.getCurrUser().getSfjyr().getText().equals("是")) {
+					list.add(cb.like(root.get("createUser").as(String.class), "%" + securityMgr.getCurrUser().getId() + "%"));
+				}
+				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_COPY));
+				return cb.and(list.toArray(new Predicate[] {}));
 			}
-			wr.setAttr("list", list2);
-			
-			wr.setAttr("pagejump", list.getTotalPages() == 0 ? 0 : page2.getPage());
-			wr.setAttr("gongpage", "共 " + list.getTotalPages() + "页");
-			wr.setAttr("nowshow", "当前显示" + (page2.getRows() == 0 ? 0 : (page2.getRows() * (page2.getPage() - 1) + 1)) + "-" + (page2.getPage() * page2.getRows() - (page2.getRows() - list.getContent().size())) + " 条记录");
-			wr.setAttr("gongsize", "共 " + list.getTotalElements() + "条记录");
-			wr.setAttr("page", page2.getPage());
-			wr.setAttr("sort", page2.getSort());
-			wr.setAttr("order", page2.getOrder());
-			wr.setAttr("pagesize", list.getContent().size());
-			wr.setAttr("totalpage", list.getTotalPages());
-			wr.setAttr("totalsize", list.getTotalElements());
-			wr.setAttr("sort", list.getSort());
-			return wr;
+		};
+		SimplePageRequest page2 = new SimplePageRequest();
+		if (page == null) {
+			page2.setPage(1);
+		} else {
+			page2.setPage(page);
+		}
+		page2.setRows(5);
+		Sort newsort = new Sort(Direction.fromString(page2.getOrder()), new String[] { page2.getSort() });
+		// 页码从0开始
+		PageRequest pageable = new PageRequest(page2.getPage() - 1, page2.getRows(), newsort);
+		Page<XmxxglEntity> list = query.findAll(spec, pageable, XmxxglEntity.class);
+		List<XmxxglEntity> list2 = new ArrayList<XmxxglEntity>();
+		for (XmxxglEntity xmxxglEntity : list) {
+			list2.add(xmxxglEntity);
 		}
+		wr.setAttr("list", list2);
+
+		wr.setAttr("pagejump", list.getTotalPages() == 0 ? 0 : page2.getPage());
+		wr.setAttr("gongpage", "共 " + list.getTotalPages() + "页");
+		wr.setAttr("nowshow", "当前显示" + (page2.getRows() == 0 ? 0 : (page2.getRows() * (page2.getPage() - 1) + 1)) + "-" + (page2.getPage() * page2.getRows() - (page2.getRows() - list.getContent().size())) + " 条记录");
+		wr.setAttr("gongsize", "共 " + list.getTotalElements() + "条记录");
+		wr.setAttr("page", page2.getPage());
+		wr.setAttr("sort", page2.getSort());
+		wr.setAttr("order", page2.getOrder());
+		wr.setAttr("pagesize", list.getContent().size());
+		wr.setAttr("totalpage", list.getTotalPages());
+		wr.setAttr("totalsize", list.getTotalElements());
+		wr.setAttr("sort", list.getSort());
+		return wr;
+	}
 
 	@RequestMapping(value = "/selectXmlb")
 	@ResponseBody
@@ -538,7 +533,7 @@ public class TzjhglCtl extends BaseWebCtl {
 			return null;
 		}
 	}
-	
+
 	@RequestMapping(value = "/selectSf")
 	@ResponseBody
 	public List<CodeEntity> selectSf(Model model) {