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

gkjsjy/trunk/WebContent/WEB-INF/pages/index/indexmain.jsp

@@ -134,7 +134,7 @@
 				</div>
 			<!-- 省级 -->
 			<div id="province" style="display:none;">
-				<img alt=""  usemap="#provincemap" style="position:relative;height:100%; top: 0;left: 0;overflow: hidden;"  src="${app }/static/biz/image/index/map.jpg">
+				<img alt=""  usemap="#provincemap" style="position:relative;width:100%; top: 0;left: 0;overflow: hidden;"  src="${app }/static/biz/image/index/map.jpg">
 				<map name="provincemap" id="provincemap">
 					<!-- <area id="czgk" shape="circle" coords="381,188,11" onclick="index.main.getData('E8FFA9E619AA4A1BB560876281FBC27C','','czgk')"  href="#" > -->
 					<area id="cznhgk" shape="circle" coords="722,575,11" onclick="index.main.getData('6806736F9463483B97DEAAD549A8DAC4','','cznhgk')"  href="#" >

gkjsjy/trunk/src/com/xt/jygl/common/BaseWebCtl.java

@@ -190,7 +190,7 @@ public class BaseWebCtl extends BaseCtl {
 		if (page.getRows() < 10) {
 			page.setRows(10);
 		}
-		Sort newsort = new Sort(Direction.fromString(page.getOrder()), new String[] { page.getSort() });
+		Sort newsort = new Sort(Direction.fromString(page.getOrder()), new String[] { "updateDateTime", page.getSort() });
 		// 页码从0开始
 		PageRequest pageable = new PageRequest(page.getPage() - 1, page.getRows(), newsort);
 		return pageable;
@@ -435,13 +435,13 @@ public class BaseWebCtl extends BaseCtl {
 		}
 	}
 
-	public boolean getTbStatus(String uStr ,String szd) {
+	public boolean getTbStatus(String uStr, String szd) {
 		boolean flag = false;
 		try {
-			String str="";
+			String str = "";
 			// 判断省市区别
 			if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
-				str = GlobalData.SJYH_URL +GlobalData.DSJC + "_";
+				str = GlobalData.SJYH_URL + GlobalData.DSJC + "_";
 			} else {
 				str = GlobalData.SJYH_URL + szd + "_";
 			}
@@ -479,17 +479,18 @@ public class BaseWebCtl extends BaseCtl {
 		f.setPath(GlobalData.FTP_UPLOAD_PATH);
 		return f;
 	}
-	
+
 	/**
 	 * 校验用户信息
+	 * 
 	 * @param userName
 	 * @param pwd
 	 * @return
 	 */
-	public boolean checkUser(){
+	public boolean checkUser() {
 		String userName = CxfwsUtils.userNameFromHeaderInfo(wscontexts);
 		String pwd = CxfwsUtils.passWordFromHeaderInfo(wscontexts);
-		if ( StringUtils.isNotEmpty(userName) && StringUtils.isNotEmpty(pwd)){
+		if (StringUtils.isNotEmpty(userName) && StringUtils.isNotEmpty(pwd)) {
 			UserEntity user = securityMgr.userService().findByUname(userName);
 			if (user != null) {
 				if (pwd.equals(user.getPassword())) {

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrjbxx/ctl/GkjyrCtl.java

@@ -226,27 +226,6 @@ public class GkjyrCtl extends BaseWebCtl {
 						CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "sfwhqy", "sfcswhzy");
 					}
 				}
-				// 是否有许可证
-				if (StringUtils.isNotEmpty(sfcyxkz)) {
-					if (!sfcyxkz.equals("all")) {
-						if (!sfcyxkz.equals("201")) {
-							list.add(cb.isNull(root.get("gkjyxkzh").as(String.class)));
-						} else {
-							list.add(cb.isNotNull(root.get("gkjyxkzh").as(String.class)));
-						}
-
-					}
-				} else if (isGET(request)) {
-
-					String sfcyxkzval = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "sfcyxkz");
-					if (!"all".equals(sfcyxkzval) && StringUtils.isNotEmpty(sfcyxkzval)) {
-						if (!"201".equals(sfcyxkzval)) {
-							list.add(cb.isNull(root.get("gkjyxkzh").as(String.class)));
-						} else {
-							list.add(cb.isNotNull(root.get("gkjyxkzh").as(String.class)));
-						}
-					}
-				}
 
 				Subquery<BwEntity> subquery2 = query.subquery(BwEntity.class);
 				Root<BwEntity> dpRoot2 = subquery2.from(BwEntity.class);
@@ -333,18 +312,14 @@ public class GkjyrCtl extends BaseWebCtl {
 					String xkzstartDateval = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xkzstartDate");
 					Date xkzstartDate = null;
 					if (StringUtils.isNotEmpty(xkzstartDateval) && isGET(request)) {
-
 						try {
 							xkzstartDate = sdf.parse(xkzstartDateval);
 						} catch (ParseException e) {
 							e.printStackTrace();
 						}
-
 						subQueryPredicates.add(cb.greaterThanOrEqualTo(dpRoot.get("yxqz").as(Date.class), xkzstartDate));
 						xkzflag = true;
-
 					}
-
 				}
 
 				if (xkzendDate != null) {
@@ -354,18 +329,47 @@ public class GkjyrCtl extends BaseWebCtl {
 					String xkzendDateval = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xkzendDate");
 					Date xkzendDate = null;
 					if (StringUtils.isNotEmpty(xkzendDateval) && isGET(request)) {
-
 						try {
 							xkzendDate = sdf.parse(xkzendDateval);
 						} catch (ParseException e) {
 							e.printStackTrace();
 						}
-
 						subQueryPredicates.add(cb.lessThanOrEqualTo(dpRoot.get("yxqz").as(Date.class), xkzendDate));
 						xkzflag = true;
-
 					}
-
+				}
+				// 是否有许可证
+				if (StringUtils.isNotEmpty(sfcyxkz)) {
+					if (!sfcyxkz.equals("all")) {
+						if (!sfcyxkz.equals("201")) {
+							subQueryPredicates.add(cb.equal(dpRoot.get("gkjyr").as(String.class), root.get("id").as(String.class)));
+							subQueryPredicates.add(cb.equal(dpRoot.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
+							subQueryPredicates.add(cb.equal(dpRoot.get("sfyx").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
+							xkzflag = true;
+						} else {
+							// subQueryPredicates.add(cb.or(cb.notEqual(dpRoot.get("gkjyr").as(String.class),
+							// root.get("id").as(String.class)),
+							// cb.and(cb.equal(dpRoot.get("gkjyr").as(String.class),
+							// root.get("id").as(String.class))),
+							// cb.notEqual(dpRoot.get("recordStatus").as(Integer.class),
+							// BaseEntity.RECORD_STATE_VALID)));
+							subQueryPredicates.add(cb.not(cb.and(cb.equal(dpRoot.get("gkjyr").as(String.class), root.get("id").as(String.class)), cb.equal(dpRoot.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_VALID), cb.equal(dpRoot.get("sfyx").as(Integer.class), BaseEntity.RECORD_STATE_VALID))));
+							xkzflag = true;
+						}
+					}
+				} else if (isGET(request)) {
+					String sfcyxkzval = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "sfcyxkz");
+					if (!"all".equals(sfcyxkzval) && StringUtils.isNotEmpty(sfcyxkzval)) {
+						if (!"201".equals(sfcyxkzval)) {
+							subQueryPredicates.add(cb.equal(dpRoot.get("gkjyr").as(String.class), root.get("id").as(String.class)));
+							subQueryPredicates.add(cb.equal(dpRoot.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
+							subQueryPredicates.add(cb.equal(dpRoot.get("sfyx").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
+							xkzflag = true;
+						} else {
+							subQueryPredicates.add(cb.not(cb.and(cb.equal(dpRoot.get("gkjyr").as(String.class), root.get("id").as(String.class)), cb.equal(dpRoot.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_VALID), cb.equal(dpRoot.get("sfyx").as(Integer.class), BaseEntity.RECORD_STATE_VALID))));
+							xkzflag = true;
+						}
+					}
 				}
 
 				// 许可证是否将到期
@@ -424,7 +428,6 @@ public class GkjyrCtl extends BaseWebCtl {
 				return cb.and(list.toArray(new Predicate[] {}));
 			}
 		};
-		
 
 		if (page.getPage() < 1) {
 			page.setPage(SearchCondition.jyrpage);
@@ -455,7 +458,7 @@ public class GkjyrCtl extends BaseWebCtl {
 						} else {
 							vo.setSfred("2");
 						}
-					}else{
+					} else {
 						vo.setXkzyxq(null);
 						vo.setXkzyxqfmt(null);
 						vo.setGkjyxkzh(null);
@@ -467,10 +470,10 @@ public class GkjyrCtl extends BaseWebCtl {
 		}
 
 		if (isPOST(request)) {
-			SearchCondition.jyrpage=page.getPage();
-			//cacheSCmap.put("jyrpage", page.getPage());
+			SearchCondition.jyrpage = page.getPage();
+			// cacheSCmap.put("jyrpage", page.getPage());
 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);
-			//System.out.println(JSONObject.fromObject(cacheSCmap));
+			// System.out.println(JSONObject.fromObject(cacheSCmap));
 		}
 		System.out.println(isPOST(request));
 
@@ -491,7 +494,6 @@ public class GkjyrCtl extends BaseWebCtl {
 		model.addAttribute("fzendDate", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "fzendDate"));
 		model.addAttribute("xkzstartDate", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xkzstartDate"));
 		model.addAttribute("xkzendDate", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xkzendDate"));
-	
 
 		// 翻页共通
 		putPageInfo(model, page, list);
@@ -798,16 +800,16 @@ public class GkjyrCtl extends BaseWebCtl {
 		gkjyrVo.setCgsl(cgEntities.size() + "");
 		// 储罐总容量
 		gkjyrVo.setCgzrl(cgzrl + "");
-		
-		//危货附证
-		if(StringUtils.isNotEmpty(gkjyr.getGkwxhwzyfzbh())){
+
+		// 危货附证
+		if (StringUtils.isNotEmpty(gkjyr.getGkwxhwzyfzbh())) {
 			List<XkzfzEntity> list = xkzfzService.findByJyrid(gkjyr.getId());
 			String wxhwzyfz = "";
-			if(list!= null && list.size()>0){
-				for(XkzfzEntity entity : list){
-					wxhwzyfz  = wxhwzyfz + entity.getFzsqh()+",";
+			if (list != null && list.size() > 0) {
+				for (XkzfzEntity entity : list) {
+					wxhwzyfz = wxhwzyfz + entity.getFzsqh() + ",";
 				}
-				wxhwzyfz = wxhwzyfz.substring(0, wxhwzyfz.length()-1);
+				wxhwzyfz = wxhwzyfz.substring(0, wxhwzyfz.length() - 1);
 			}
 			gkjyrVo.setGkwxhwzyfzbh(wxhwzyfz);
 		}
@@ -984,18 +986,18 @@ public class GkjyrCtl extends BaseWebCtl {
 		gkjyrVo.setMtjgxszw(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getText() : "");
 		gkjyrVo.setQyxz(null != gkjyr.getQyxz() ? gkjyr.getQyxz().getId() : "");
 
-		if(StringUtils.isNotEmpty(gkjyr.getGkwxhwzyfzbh())){
+		if (StringUtils.isNotEmpty(gkjyr.getGkwxhwzyfzbh())) {
 			List<XkzfzEntity> list = xkzfzService.findByJyrid(gkjyr.getId());
 			String wxhwzyfz = "";
-			if(list!= null && list.size()>0){
-				for(XkzfzEntity entity : list){
-					wxhwzyfz  = wxhwzyfz + entity.getFzsqh()+",";
+			if (list != null && list.size() > 0) {
+				for (XkzfzEntity entity : list) {
+					wxhwzyfz = wxhwzyfz + entity.getFzsqh() + ",";
 				}
-				wxhwzyfz = wxhwzyfz.substring(0, wxhwzyfz.length()-1);
+				wxhwzyfz = wxhwzyfz.substring(0, wxhwzyfz.length() - 1);
 			}
 			gkjyrVo.setGkwxhwzyfzbh(wxhwzyfz);
 		}
-		
+
 		if (StringUtils.isEmpty(gkjyrVo.getZyid())) {
 			SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyyMMddHHmmss");
 			String zyid = dateTimeFormat.format(new Date());
@@ -1190,15 +1192,15 @@ public class GkjyrCtl extends BaseWebCtl {
 		gkjyrVo.setCgsl(cgEntities.size() + "");
 		// 储罐总容量
 		gkjyrVo.setCgzrl(cgzrl + "");
-		//危货附证
-		if(StringUtils.isNotEmpty(gkjyr.getGkwxhwzyfzbh())){
+		// 危货附证
+		if (StringUtils.isNotEmpty(gkjyr.getGkwxhwzyfzbh())) {
 			List<XkzfzEntity> list = xkzfzService.findByJyrid(gkjyr.getId());
 			String wxhwzyfz = "";
-			if(list!= null && list.size()>0){
-				for(XkzfzEntity entity : list){
-					wxhwzyfz  = wxhwzyfz + entity.getFzsqh()+",";
+			if (list != null && list.size() > 0) {
+				for (XkzfzEntity entity : list) {
+					wxhwzyfz = wxhwzyfz + entity.getFzsqh() + ",";
 				}
-				wxhwzyfz = wxhwzyfz.substring(0, wxhwzyfz.length()-1);
+				wxhwzyfz = wxhwzyfz.substring(0, wxhwzyfz.length() - 1);
 			}
 			gkjyrVo.setGkwxhwzyfzbh(wxhwzyfz);
 		}
@@ -1350,20 +1352,20 @@ public class GkjyrCtl extends BaseWebCtl {
 
 		gkjyrVo.setMtjgxs(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getId() : "");
 		gkjyrVo.setMtjgxszw(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getText() : "");
-		
-		//危货附证
-		if(StringUtils.isNotEmpty(gkjyr.getGkwxhwzyfzbh())){
+
+		// 危货附证
+		if (StringUtils.isNotEmpty(gkjyr.getGkwxhwzyfzbh())) {
 			List<XkzfzEntity> list = xkzfzService.findByJyrid(gkjyr.getId());
 			String wxhwzyfz = "";
-			if(list!= null && list.size()>0){
-				for(XkzfzEntity entity : list){
-					wxhwzyfz  = wxhwzyfz + entity.getFzsqh()+",";
+			if (list != null && list.size() > 0) {
+				for (XkzfzEntity entity : list) {
+					wxhwzyfz = wxhwzyfz + entity.getFzsqh() + ",";
 				}
-				wxhwzyfz = wxhwzyfz.substring(0, wxhwzyfz.length()-1);
+				wxhwzyfz = wxhwzyfz.substring(0, wxhwzyfz.length() - 1);
 			}
 			gkjyrVo.setGkwxhwzyfzbh(wxhwzyfz);
 		}
-		
+
 		model.addAttribute("gkjyrxx", gkjyrVo);
 
 		// 许可证信息