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

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/cghzyxxgl/dcsb/dcsbmain.jsp

@@ -62,18 +62,35 @@
 							<td class="right">当前状态：&nbsp;</td>
 							<td><span id="shztsel"></span></td>
 							
-							<td class="right">作业时间：&nbsp;</td>
+							<td class="right">作业时间起：&nbsp;</td>
 							<td>
 								<table style="width:90%;">
 									<tr>
 										<td>
-											<input style="width:100%;" id="d4311" type="text" class="Wdate" name="zysjq" value="${fn:substring(zysjq,0,10)}" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd',maxDate: '#F{$dp.$D(\'d4312\',{d:0})}'})">
+											<input style="width:100%;" id="d4311" type="text" class="Wdate" name="zysjq_start" value="${fn:substring(zysjq_start,0,10)}" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd',maxDate: '#F{$dp.$D(\'d4312\',{d:0})}'})">
 										</td>
 										<td>
 											<span>~</span>
 										</td>
 										<td>
-											<input style="width:100%;" id="d4312" type="text" class="Wdate" name="zysjz" value="${fn:substring(zysjz,0,10)}" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd',minDate: '#F{$dp.$D(\'d4311\',{d:0})}'})">	                
+											<input style="width:100%;" id="d4312" type="text" class="Wdate" name="zysjq_end" value="${fn:substring(zysjq_end,0,10)}" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd',minDate: '#F{$dp.$D(\'d4311\',{d:0})}'})">	                
+										</td>
+									</tr>
+								</table>
+							</td>
+							
+							<td class="right">作业时间止：&nbsp;</td>
+							<td>
+								<table style="width:90%;">
+									<tr>
+										<td>
+											<input style="width:100%;" id="d4313" type="text" class="Wdate" name="zysjz_start" value="${fn:substring(zysjz_start,0,10)}" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd',maxDate: '#F{$dp.$D(\'d4314\',{d:0})}'})">
+										</td>
+										<td>
+											<span>~</span>
+										</td>
+										<td>
+											<input style="width:100%;" id="d4314" type="text" class="Wdate" name="zysjz_end" value="${fn:substring(zysjz_end,0,10)}" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd',minDate: '#F{$dp.$D(\'d4313\',{d:0})}'})">	                
 										</td>
 									</tr>
 								</table>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/cghzyxxgl/dcsbybb/dcsbybbmain.jsp

@@ -66,7 +66,7 @@
 							<td class="right">货物种类第一大类：&nbsp;</td>
 							<td><span id="hwzldydl"></span></td>
 
-							<td class="right">作业时间起：&nbsp;</td>
+							<td class="right">作业时间：&nbsp;</td>
 							<td>
 								<table style="width:90%;">
 									<tr>

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

@@ -103,7 +103,7 @@ public class DcsbCtl extends BaseWebCtl {
 	 */
 	@RequestMapping(value = "/main")
 	// @RequiresPermissions("dcsb:main")
-	public String main(SimplePageRequest page, Model model, final String gkjyr, final String szdid, final String szgkid, final String szgqid, final String zypmc, final String bh, final String hwzl, final String shzt, final String menuid, final Date zysjq, final String dydlid, final Date zysjz, final HttpServletRequest request) throws JsonProcessingException {
+	public String main(SimplePageRequest page, Model model, final String gkjyr, final String szdid, final String szgkid, final String szgqid, final String zypmc, final String bh, final String hwzl, final String shzt, final String menuid, final Date zysjq_start,final Date zysjq_end, final String dydlid, final Date zysjz_start, final Date zysjz_end,final HttpServletRequest request) throws JsonProcessingException {
 		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "dcsb");
 		// 查询条件
 		Specification<DcsbEntity> spec = new Specification<DcsbEntity>() {
@@ -171,8 +171,8 @@ public class DcsbCtl extends BaseWebCtl {
 					}
 				}
 
-				if (null != zysjq && !"".equals(zysjq)) {
-					list.add(cb.greaterThanOrEqualTo(root.get("zysjq").as(Date.class), zysjq));
+				if (null != zysjq_start && !"".equals(zysjq_start)) {
+					list.add(cb.greaterThanOrEqualTo(root.get("zysjq").as(Date.class), zysjq_start));
 					/*
 					 * if (StringUtils.isNotEmpty(new
 					 * SimpleDateFormat("yyyy-MM-dd").format(zysjq))) { } else
@@ -184,7 +184,7 @@ public class DcsbCtl extends BaseWebCtl {
 					 * } }
 					 */
 				} else {
-					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "zysjq");
+					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "zysjq_start");
 					if (!StringUtils.isEmpty(v)) {
 						try {
 							Date d = new SimpleDateFormat("yyyy-MM-dd").parse(v);
@@ -195,8 +195,8 @@ public class DcsbCtl extends BaseWebCtl {
 						}
 					}
 				}
-				if (null != zysjz && !"".equals(zysjz)) {
-					list.add(cb.lessThanOrEqualTo(root.get("zysjz").as(Date.class), zysjz));
+				if (null != zysjq_end && !"".equals(zysjq_end)) {
+					list.add(cb.lessThanOrEqualTo(root.get("zysjq").as(Date.class), zysjq_end));
 					/*
 					 * if (StringUtils.isNotEmpty(new
 					 * SimpleDateFormat("yyyy-MM-dd").format(zysjz))) { } else
@@ -208,7 +208,55 @@ public class DcsbCtl extends BaseWebCtl {
 					 * SimpleDateFormat("yyyy-MM-dd").parse(v))); } }
 					 */
 				} else {
-					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "zysjz");
+					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "zysjq_end");
+					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();
+						}
+					}
+				}
+				
+				if (null != zysjz_start && !"".equals(zysjz_start)) {
+					list.add(cb.greaterThanOrEqualTo(root.get("zysjz").as(Date.class), zysjz_start));
+					/*
+					 * 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, "zysjz_start");
+					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_end && !"".equals(zysjz_end)) {
+					list.add(cb.lessThanOrEqualTo(root.get("zysjz").as(Date.class), zysjz_end));
+					/*
+					 * 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_end");
 					if (!StringUtils.isEmpty(v)) {
 						try {
 							Date d = new SimpleDateFormat("yyyy-MM-dd").parse(v);
@@ -309,8 +357,10 @@ public class DcsbCtl extends BaseWebCtl {
 		model.addAttribute("bh", bh);
 		model.addAttribute("hwzl", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "dydlid"));
 		model.addAttribute("shzt", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "shzt"));
-		model.addAttribute("zysjq", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "zysjq"));
-		model.addAttribute("zysjz", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "zysjz"));
+		model.addAttribute("zysjq_start", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "zysjq_start"));
+		model.addAttribute("zysjq_end", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "zysjq_end"));
+		model.addAttribute("zysjz_start", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "zysjz_start"));
+		model.addAttribute("zysjz_end", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "zysjz_end"));
 
 		// 翻页共通
 		putPageInfo(model, page, list);