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

gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/gkjcssjsfx/ctl/GkjcssjsfxCtl.java

@@ -17,13 +17,14 @@ import com.xt.jygl.common.BaseWebCtl;
 import com.xt.jygl.common.GlobalData;
 import com.xt.jygl.gkjsgl.tzjhgl.service.TzjhglService;
 import com.xt.jygl.gkyxtjyfx.gkjcssjsfx.vo.GkjcssjsfxVo;
+import com.xtframe.util.DateTime;
 
 @Controller
 @RequestMapping(value = "/gkjcssjsfx")
 public class GkjcssjsfxCtl extends BaseWebCtl {
 	@Autowired
 	private TzjhglService tzjhglService;
-
+	
 	/**
 	 * 一览页面
 	 * @param model
@@ -47,7 +48,7 @@ public class GkjcssjsfxCtl extends BaseWebCtl {
 		List<GkjcssjsfxVo> list = new ArrayList<GkjcssjsfxVo>();
 		String flag = "";
 		if ("900".equals(GlobalData.CITY_CODE)) {
-			List<Object> tzjhgllist = tzjhglService.tongjiproValue(StringUtils.isEmpty(xmlxid) ? "" : xmlxid, StringUtils.isEmpty(tzlxid) ? "" : tzlxid,StringUtils.isEmpty(startDate) ? "" : startDate,StringUtils.isEmpty(endDate) ? "" : endDate);
+			List<Object> tzjhgllist = tzjhglService.tongjiproValue(StringUtils.isEmpty(xmlxid) ? "" : xmlxid, StringUtils.isEmpty(tzlxid) ? "" : tzlxid,StringUtils.isEmpty(startDate) ? DateTime.minDate : startDate,StringUtils.isEmpty(endDate) ? DateTime.maxDate : endDate);
 			for (Object entity : tzjhgllist) {
 				Object[] e = (Object[]) entity;
 				GkjcssjsfxVo vo = new GkjcssjsfxVo();
@@ -57,7 +58,7 @@ public class GkjcssjsfxCtl extends BaseWebCtl {
 			}
 			flag = "0";
 		} else {
-			List<Object> tzjhgllist = tzjhglService.tongjicityValue(StringUtils.isEmpty(xmlxid) ? "" : xmlxid, StringUtils.isEmpty(tzlxid) ? "" : tzlxid,StringUtils.isEmpty(startDate) ? "" : startDate,StringUtils.isEmpty(endDate) ? "" : endDate);
+			List<Object> tzjhgllist = tzjhglService.tongjicityValue(StringUtils.isEmpty(xmlxid) ? "" : xmlxid, StringUtils.isEmpty(tzlxid) ? "" : tzlxid,StringUtils.isEmpty(startDate) ? DateTime.minDate : startDate,StringUtils.isEmpty(endDate) ? DateTime.maxDate : endDate);
 			for (Object entity : tzjhgllist) {
 				Object[] e = (Object[]) entity;
 				GkjcssjsfxVo vo = new GkjcssjsfxVo();