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

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

@@ -1,5 +1,6 @@
 package com.xt.jygl.gkjygl.cghzyxxgl.dcsb.ctl;
 
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -170,27 +171,42 @@ public class DcsbCtl extends BaseWebCtl {
 					}
 				}
 
-				if (null != zysjq) {
-					if (StringUtils.isNotEmpty(new SimpleDateFormat("yyyy-MM-dd").format(zysjq))) {
-						list.add(cb.equal(root.get("zysjq").as(Date.class), zysjq));
+				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));
 						}
+					}*/
+				} 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 (null != zysjz) {
-					if (StringUtils.isNotEmpty(new SimpleDateFormat("yyyy-MM-dd").format(zysjz))) {
-						list.add(cb.equal(root.get("zysjz").as(Date.class), zysjz));
+				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(new SimpleDateFormat("yyyy-MM-dd").format(v))) {
-							list.add(cb.equal(root.get("zysjz").as(Date.class), v));
+						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 (isJyr()) {