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

gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/ctl/DcsbCtl.java

@@ -173,39 +173,49 @@ public class DcsbCtl extends BaseWebCtl {
 
 				if (null != zysjq && !"".equals(zysjq)) {
 					list.add(cb.greaterThanOrEqualTo(root.get("zysjq").as(Date.class), zysjq));
-					/*if (StringUtils.isNotEmpty(new SimpleDateFormat("yyyy-MM-dd").format(zysjq))) {
-					} else if (isGET(request)) {
-						String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "zysjq");
-						if (StringUtils.isNotEmpty(new SimpleDateFormat("yyyy-MM-dd").format(v))) {
-							list.add(cb.equal(root.get("zysjq").as(Date.class), v));
-						}
-					}*/
+					/*
+					 * if (StringUtils.isNotEmpty(new
+					 * SimpleDateFormat("yyyy-MM-dd").format(zysjq))) { } else
+					 * if (isGET(request)) { String v = (String)
+					 * CacheSearchCondition.cacheSCmapVal(cacheSCmap, "zysjq");
+					 * if (StringUtils.isNotEmpty(new
+					 * SimpleDateFormat("yyyy-MM-dd").format(v))) {
+					 * list.add(cb.equal(root.get("zysjq").as(Date.class), v));
+					 * } }
+					 */
 				} else {
 					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "zysjq");
-					try {
-						Date d = new SimpleDateFormat("yyyy-MM-dd").parse(v);
-						list.add(cb.greaterThanOrEqualTo(root.get("zysjq").as(Date.class), d));
-					} catch (ParseException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
+					if (!StringUtils.isEmpty(v)) {
+						try {
+							Date d = new SimpleDateFormat("yyyy-MM-dd").parse(v);
+							list.add(cb.greaterThanOrEqualTo(root.get("zysjq").as(Date.class), d));
+						} catch (ParseException e) {
+							// TODO Auto-generated catch block
+							e.printStackTrace();
+						}
 					}
 				}
 				if (null != zysjz && !"".equals(zysjz)) {
 					list.add(cb.lessThanOrEqualTo(root.get("zysjz").as(Date.class), zysjz));
-					/*if (StringUtils.isNotEmpty(new SimpleDateFormat("yyyy-MM-dd").format(zysjz))) {
-					} else if (isGET(request)) {
-						String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "zysjz");
-						if (StringUtils.isNotEmpty(v)) {
-							list.add(cb.lessThanOrEqualTo(root.get("zysjz").as(Date.class), new SimpleDateFormat("yyyy-MM-dd").parse(v)));
-						}
-					}*/
+					/*
+					 * if (StringUtils.isNotEmpty(new
+					 * SimpleDateFormat("yyyy-MM-dd").format(zysjz))) { } else
+					 * if (isGET(request)) { String v = (String)
+					 * CacheSearchCondition.cacheSCmapVal(cacheSCmap, "zysjz");
+					 * if (StringUtils.isNotEmpty(v)) {
+					 * list.add(cb.lessThanOrEqualTo
+					 * (root.get("zysjz").as(Date.class), new
+					 * SimpleDateFormat("yyyy-MM-dd").parse(v))); } }
+					 */
 				} else {
 					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "zysjz");
-					try {
-						Date d = new SimpleDateFormat("yyyy-MM-dd").parse(v);
-						list.add(cb.lessThanOrEqualTo(root.get("zysjz").as(Date.class), d));
-					} catch (ParseException e) {
-						e.printStackTrace();
+					if (!StringUtils.isEmpty(v)) {
+						try {
+							Date d = new SimpleDateFormat("yyyy-MM-dd").parse(v);
+							list.add(cb.lessThanOrEqualTo(root.get("zysjz").as(Date.class), d));
+						} catch (ParseException e) {
+							e.printStackTrace();
+						}
 					}
 				}
 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
@@ -330,22 +340,23 @@ public class DcsbCtl extends BaseWebCtl {
 		List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_JCG);
 		return list;
 	}
-	
-	//企业性质
+
+	// 企业性质
 	@RequestMapping(value = "/selectQyxz")
 	@ResponseBody
 	public List<CodeEntity> selectQyxz(Model model) {
 		List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_QYXZ);
 		return list;
 	}
-	//服务类型
+
+	// 服务类型
 	@RequestMapping(value = "/selectFwlx")
 	@ResponseBody
 	public List<CodeEntity> selectFwlx(Model model) {
 		List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_FWLX);
 		return list;
 	}
-	
+
 	// 审批状态
 	@RequestMapping(value = "/selectShzt")
 	@ResponseBody
@@ -391,27 +402,27 @@ public class DcsbCtl extends BaseWebCtl {
 			model.addAttribute("shsj", dateTimeFormat.format(today));
 			entity.setShr(user.getName());
 		}
-		if ( StringUtils.isNotEmpty(entity.getMt())){
+		if (StringUtils.isNotEmpty(entity.getMt())) {
 			MtEntity mt = mtService.findOne(entity.getMt());
 			vo.setMtmc(mt.getMtmc());
 		}
-		if ( StringUtils.isNotEmpty(entity.getBw())){
+		if (StringUtils.isNotEmpty(entity.getBw())) {
 			BwEntity bw = bwService.findOne(entity.getBw());
 			vo.setBwmc(bw.getBwmc());
 		}
-		if ( StringUtils.isNotEmpty(entity.getJcg())){
+		if (StringUtils.isNotEmpty(entity.getJcg())) {
 			List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_JCG);
-			for (CodeEntity code: list){
-				if ( entity.getJcg().equals(code.getId())){
+			for (CodeEntity code : list) {
+				if (entity.getJcg().equals(code.getId())) {
 					vo.setJcgText(code.getText());
 					break;
 				}
 			}
 		}
-		if ( StringUtils.isNotEmpty(entity.getNwm())){
+		if (StringUtils.isNotEmpty(entity.getNwm())) {
 			List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_NWM);
-			for (CodeEntity code: list){
-				if ( entity.getNwm().equals(code.getId())){
+			for (CodeEntity code : list) {
+				if (entity.getNwm().equals(code.getId())) {
 					vo.setNwmText(code.getText());
 					break;
 				}
@@ -863,8 +874,8 @@ public class DcsbCtl extends BaseWebCtl {
 			// 子类一并删除
 			dcsbService.logicDelete(id);
 
-			//DcsbEntity entity = dcsbService.findOne(id);
-			//dcsbService.changeAudit(null, entity, true);
+			// DcsbEntity entity = dcsbService.findOne(id);
+			// dcsbService.changeAudit(null, entity, true);
 
 		} catch (Exception e) {
 			wr.setSuccess(false);