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

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

@@ -25,7 +25,7 @@
 	
 	function exportExcelAll(data1,data2,data3,data4,data5,data6,data7,data8,data9,data10,data11){
 		
-		location.href=$.app+"/dcsb/exportExcelAll?szdid="+data1+"&szgkid="+data2+"&szgqid="+data3+"&gkjyr="+data4+"&zypmc="+data5+"&hwzl="+data6+"&shzt="+data7+"&zysjz_start="+data8+"&zysjz_end="+data9+"&zysjq_start="+data8+"&zysjq_end="+data9;
+		location.href=$.app+"/dcsb/exportExcelAll?szdid="+data1+"&szgkid="+data2+"&szgqid="+data3+"&gkjyr="+data4+"&zypmc="+data5+"&hwzl="+data6+"&shzt="+data7+"&zysjz_start="+data8+"&zysjz_end="+data9+"&zysjq_start="+data10+"&zysjq_end="+data11;
 		$.alert({
    		    title: '提示',
 		    content: '导出数据中，请耐心等待！',
@@ -119,7 +119,7 @@
 									class="glyphicon glyphicon-plus"></i> 新增
 							</a>
 							<a class="btn btn-default btn-sm" href="#"
-								onclick="exportExcelAll('${szd}','${szgk}','${szgq}','${gkjyr}','${zypmc}','${hwzl}','${shzt}','${zysjz_start}','${zysjz_end}','${zysjq_start},'${zysjq_end }')"> <i
+								onclick="exportExcelAll('${szd}','${szgk}','${szgq}','${gkjyr}','${zypmc}','${hwzl}','${shzt}','${zysjz_start}','${zysjz_end}','${zysjq_start}','${zysjq_end}')"> <i
 									class="glyphicon glyphicon-download-alt"></i> 导出
 							</a>
 							</td>

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

@@ -481,7 +481,7 @@ public class DcsbCtl extends BaseWebCtl {
 					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));
+							list.add(cb.lessThanOrEqualTo(root.get("zysjq").as(Date.class), d));
 						} catch (ParseException e) {
 							e.printStackTrace();
 						}
@@ -505,7 +505,7 @@ public class DcsbCtl extends BaseWebCtl {
 					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));
+							list.add(cb.greaterThanOrEqualTo(root.get("zysjz").as(Date.class), d));
 						} catch (ParseException e) {
 							// TODO Auto-generated catch block
 							e.printStackTrace();
@@ -573,6 +573,7 @@ public class DcsbCtl extends BaseWebCtl {
 		}
 		Utils.getSession().setAttribute("userpre", user2);
 
+	
 		List<DcsbEntity> list = query.findAll(spec,DcsbEntity.class);
 				List<DcsbVo> voList = new ArrayList<DcsbVo>();
 				for (DcsbEntity entity : list) {